diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:38:04 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:42:32 +0000 |
| commit | b986a4625d0e67710f155a9816dbab186a98020e (patch) | |
| tree | 118c89f94a652571276175a55de0f4b21e00faea /libavcodec/mpegvideo_enc.c | |
| parent | c79252897096b89376bcf17a5bca6cdf8d21b6a0 (diff) | |
| parent | 1482aff2048511b821ff9feac19426113cc641a2 (diff) | |
| download | ffmpeg-b986a4625d0e67710f155a9816dbab186a98020e.tar.gz | |
Merge commit '1482aff2048511b821ff9feac19426113cc641a2'
* commit '1482aff2048511b821ff9feac19426113cc641a2':
lavc: Move noise_reduction to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f7a0ee96b4..2914ae2c65 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -884,6 +884,13 @@ FF_ENABLE_DEPRECATION_WARNINGS return -1; } +#if FF_API_PRIVATE_OPT + FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->noise_reduction) + s->noise_reduction = avctx->noise_reduction; + FF_ENABLE_DEPRECATION_WARNINGS +#endif + avctx->has_b_frames = !s->low_delay; s->encoding = 1; @@ -922,7 +929,8 @@ FF_ENABLE_DEPRECATION_WARNINGS FF_ALLOCZ_OR_GOTO(s->avctx, s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture *), fail); - if (s->avctx->noise_reduction) { + + if (s->noise_reduction) { FF_ALLOCZ_OR_GOTO(s->avctx, s->dct_offset, 2 * 64 * sizeof(uint16_t), fail); } @@ -1731,7 +1739,7 @@ static void update_noise_reduction(MpegEncContext *s) } for (i = 0; i < 64; i++) { - s->dct_offset[intra][i] = (s->avctx->noise_reduction * + s->dct_offset[intra][i] = (s->noise_reduction * s->dct_count[intra] + s->dct_error_sum[intra][i] / 2) / (s->dct_error_sum[intra][i] + 1); @@ -1804,7 +1812,7 @@ static int frame_start(MpegEncContext *s) } if (s->dct_error_sum) { - av_assert2(s->avctx->noise_reduction && s->encoding); + av_assert2(s->noise_reduction && s->encoding); update_noise_reduction(s); } @@ -3576,7 +3584,7 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) MERGE(current_picture.encoding_error[1]); MERGE(current_picture.encoding_error[2]); - if(dst->avctx->noise_reduction){ + if (dst->noise_reduction){ for(i=0; i<64; i++){ MERGE(dct_error_sum[0][i]); MERGE(dct_error_sum[1][i]); |