diff options
| author | Alfred E. Heggestad <aeh@db.org> | 2015-06-27 10:13:09 +0200 |
|---|---|---|
| committer | Alfred E. Heggestad <aeh@db.org> | 2015-06-27 10:13:09 +0200 |
| commit | 4172027f214d50348e3fc029e068e8bb4a140deb (patch) | |
| tree | 14a9ef65adda898cfefd059d3fdcacbca7d87daf /modules/vpx | |
| parent | f8873153be5480ca6b79741e7cbdf667080e562d (diff) | |
vidcodec: move packet-handler to encode_update
Diffstat (limited to 'modules/vpx')
| -rw-r--r-- | modules/vpx/encode.c | 14 | ||||
| -rw-r--r-- | modules/vpx/vp8.h | 6 |
2 files changed, 12 insertions, 8 deletions
diff --git a/modules/vpx/encode.c b/modules/vpx/encode.c index 82f6656..0106c0a 100644 --- a/modules/vpx/encode.c +++ b/modules/vpx/encode.c @@ -27,6 +27,8 @@ struct videnc_state { unsigned pktsize; bool ctxup; uint16_t picid; + videnc_packet_h *pkth; + void *arg; }; @@ -40,7 +42,8 @@ static void destructor(void *arg) int vp8_encode_update(struct videnc_state **vesp, const struct vidcodec *vc, - struct videnc_param *prm, const char *fmtp) + struct videnc_param *prm, const char *fmtp, + videnc_packet_h *pkth, void *arg) { const struct vp8_vidcodec *vp8 = (struct vp8_vidcodec *)vc; struct videnc_state *ves; @@ -74,6 +77,8 @@ int vp8_encode_update(struct videnc_state **vesp, const struct vidcodec *vc, ves->bitrate = prm->bitrate; ves->pktsize = prm->pktsize; ves->fps = prm->fps; + ves->pkth = pkth; + ves->arg = arg; max_fs = vp8_max_fs(fmtp); if (max_fs > 0) @@ -173,8 +178,7 @@ static inline int packetize(bool marker, const uint8_t *buf, size_t len, int vp8_encode(struct videnc_state *ves, bool update, - const struct vidframe *frame, - videnc_packet_h *pkth, void *arg) + const struct vidframe *frame) { vpx_enc_frame_flags_t flags = 0; vpx_codec_iter_t iter = NULL; @@ -182,7 +186,7 @@ int vp8_encode(struct videnc_state *ves, bool update, vpx_image_t img; int err, i; - if (!ves || !frame || !pkth || frame->fmt != VID_FMT_YUV420P) + if (!ves || !frame || frame->fmt != VID_FMT_YUV420P) return EINVAL; if (!ves->ctxup || !vidsz_cmp(&ves->size, &frame->size)) { @@ -244,7 +248,7 @@ int vp8_encode(struct videnc_state *ves, bool update, pkt->data.frame.buf, pkt->data.frame.sz, ves->pktsize, !keyframe, partid, ves->picid, - pkth, arg); + ves->pkth, ves->arg); if (err) return err; } diff --git a/modules/vpx/vp8.h b/modules/vpx/vp8.h index fb704c5..934e3ee 100644 --- a/modules/vpx/vp8.h +++ b/modules/vpx/vp8.h @@ -11,10 +11,10 @@ struct vp8_vidcodec { /* Encode */ int vp8_encode_update(struct videnc_state **vesp, const struct vidcodec *vc, - struct videnc_param *prm, const char *fmtp); + struct videnc_param *prm, const char *fmtp, + videnc_packet_h *pkth, void *arg); int vp8_encode(struct videnc_state *ves, bool update, - const struct vidframe *frame, - videnc_packet_h *pkth, void *arg); + const struct vidframe *frame); /* Decode */ |