diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-07-12 14:37:15 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-11-28 10:34:10 +0100 |
| commit | 061d7aaa1eaee02833f408d7c9d8361cf1a96ad9 (patch) | |
| tree | 8ad17b2a684f918b8f8f8838839589c1ccfbbc31 | |
| parent | 2d8bd30f93af8c19ef058b5990b6d28567998024 (diff) | |
lavc/libtheoraenc: handle frame durations and AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE
| -rw-r--r-- | libavcodec/libtheoraenc.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index da16c6372e..9b8404ce31 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -347,6 +347,19 @@ static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt, // HACK: assumes no encoder delay, this is true until libtheora becomes // multithreaded (which will be disabled unless explicitly requested) pkt->pts = pkt->dts = frame->pts; + pkt->duration = frame->duration; + + if (avc_context->flags & AV_CODEC_FLAG_COPY_OPAQUE) { + pkt->opaque = frame->opaque; + if (frame->opaque_ref) { + pkt->opaque_ref = av_buffer_ref(frame->opaque_ref); + if (!pkt->opaque_ref) + return AVERROR(ENOMEM); + } + } + + avc_context->reordered_opaque = frame->reordered_opaque; + if (!(o_packet.granulepos & h->keyframe_mask)) pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; @@ -373,7 +386,9 @@ const FFCodec ff_libtheora_encoder = { .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_THEORA, .p.capabilities = AV_CODEC_CAP_DR1 | - AV_CODEC_CAP_DELAY /* for statsfile summary */, + /* for statsfile summary */ + AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(TheoraContext), .init = encode_init, |