diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-10-04 12:19:26 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-12-06 10:25:23 +0100 |
| commit | 2507b5dd674834be7261772996f47ae3b95cca69 (patch) | |
| tree | 4263cfa4c0fc59ef0386a301113514a435f0f482 /libavcodec | |
| parent | 3f5c99fcbb2c366d7bdef8500c19f43a33bdb6b9 (diff) | |
| download | ffmpeg-2507b5dd674834be7261772996f47ae3b95cca69.tar.gz | |
mpegvideo_enc: export vbv_delay in side data
Deprecate AVCodecContext.vbv_delay
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 13 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 21 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dacbcd3733..64328c80ea 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2914,13 +2914,18 @@ typedef struct AVCodecContext { int error_rate; #endif +#if FF_API_VBV_DELAY /** * VBV delay coded in the last frame (in periods of a 27 MHz clock). * Used for compliant TS muxing. * - encoding: Set by libavcodec. * - decoding: unused. + * @deprecated this value is now exported as a part of + * AV_PKT_DATA_CPB_PROPERTIES packet side data */ + attribute_deprecated uint64_t vbv_delay; +#endif #if FF_API_SIDEDATA_ONLY_PKT /** diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9336051430..4e97f4d3ab 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1769,6 +1769,9 @@ vbv_retry: s->out_format == FMT_MPEG1 && 90000LL * (avctx->rc_buffer_size - 1) <= s->avctx->rc_max_rate * 0xFFFFLL) { + AVCPBProperties *props; + size_t props_size; + int vbv_delay, min_delay; double inbits = s->avctx->rc_max_rate * av_q2d(s->avctx->time_base); @@ -1795,7 +1798,17 @@ vbv_retry: s->vbv_delay_ptr[1] = vbv_delay >> 5; s->vbv_delay_ptr[2] &= 0x07; s->vbv_delay_ptr[2] |= vbv_delay << 3; + + props = av_cpb_properties_alloc(&props_size); + if (!props) + return AVERROR(ENOMEM); + props->vbv_delay = vbv_delay * 300; + +#if FF_API_VBV_DELAY +FF_DISABLE_DEPRECATION_WARNINGS avctx->vbv_delay = vbv_delay * 300; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } s->total_bits += s->frame_bits; avctx->frame_bits = s->frame_bits; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0e42e6cbe4..afa76001eb 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -180,5 +180,8 @@ #ifndef FF_API_RTP_CALLBACK #define FF_API_RTP_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_VBV_DELAY +#define FF_API_VBV_DELAY (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |