diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-08-23 12:40:50 +0000 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-10-13 19:09:01 +0000 |
commit | 2df0c32ea12ddfa72ba88309812bfb13b674130f (patch) | |
tree | 50677fbc787646c10931f8ba95e32883173f7bfb /libavcodec/utils.c | |
parent | c80a816142699dea9cf9fa66689a7838a487ed7e (diff) | |
download | ffmpeg-2df0c32ea12ddfa72ba88309812bfb13b674130f.tar.gz |
lavc: use a separate field for exporting audio encoder padding
Currently, the amount of padding inserted at the beginning by some audio
encoders, is exported through AVCodecContext.delay. However
- the term 'delay' is heavily overloaded and can have multiple different
meanings even in the case of audio encoding.
- this field has entirely different meanings, depending on whether the
codec context is used for encoding or decoding (and has yet another
different meaning for video), preventing generic handling of the codec
context.
Therefore, add a new field -- AVCodecContext.initial_padding. It could
conceivably be used for decoding as well at a later point.
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 89f249f093..b28a659f0a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1240,6 +1240,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } } +#if FF_API_AUDIOENC_DELAY + if (av_codec_is_encoder(avctx->codec)) + avctx->delay = avctx->initial_padding; +#endif + if (av_codec_is_decoder(avctx->codec)) { /* validate channel layout from the decoder */ if (avctx->channel_layout) { @@ -1447,6 +1452,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, end: av_frame_free(&padded_frame); +#if FF_API_AUDIOENC_DELAY + avctx->delay = avctx->initial_padding; +#endif + return ret; } |