diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:21:21 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 15:22:19 +0000 |
| commit | 7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1 (patch) | |
| tree | 55ab3a10f5d4333bfa6d4b628c404abe3d42922c /libavcodec/libxavs.c | |
| parent | 13be46c08e59141408f1a7afd4737826afa87f11 (diff) | |
| parent | 5764d38173661c29d954711dd5abfddf709e9ba4 (diff) | |
| download | ffmpeg-streaming-7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1.zip ffmpeg-streaming-7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1.tar.gz | |
Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4'
* commit '5764d38173661c29d954711dd5abfddf709e9ba4':
lavc: Move chromaoffset to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libxavs.c')
| -rw-r--r-- | libavcodec/libxavs.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 767beb1..544d2a8 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -57,6 +57,7 @@ typedef struct XavsContext { int mbtree; int mixed_refs; int b_frame_strategy; + int chroma_offset; int64_t *pts_buffer; int out_frame_count; @@ -377,7 +378,15 @@ FF_ENABLE_DEPRECATION_WARNINGS /* what is the RC method we are now using? Default NO */ x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); x4->params.rc.f_pb_factor = avctx->b_quant_factor; - x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; + +#if FF_API_PRIVATE_OPT +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->chromaoffset) + x4->chroma_offset = avctx->chromaoffset; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + x4->params.analyse.i_chroma_qp_offset = x4->chroma_offset; x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR; x4->params.i_log_level = XAVS_LOG_DEBUG; @@ -446,6 +455,7 @@ static const AVOption options[] = { { "esa", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XAVS_ME_ESA }, INT_MIN, INT_MAX, VE, "motion-est" }, { "tesa", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XAVS_ME_TESA }, INT_MIN, INT_MAX, VE, "motion-est" }, { "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, VE}, + { "chromaoffset", "QP difference between chroma and luma", OFFSET(chroma_offset), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, VE}, { NULL }, }; |
