diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2021-08-17 22:57:36 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2021-08-18 12:09:37 +0300 |
| commit | 7ca71b79f2b3256a0eef1a099b857ac9e4017e36 (patch) | |
| tree | 2cbbf8f23e2124ffc4c3eb1145d63475bbf5c459 /libavcodec | |
| parent | ed47a4a842952055bb62f468a66a3714bc61972c (diff) | |
| download | ffmpeg-7ca71b79f2b3256a0eef1a099b857ac9e4017e36.tar.gz | |
avcodec/libx264: leave full range flag unchanged if unknown
By default the x264 full range flag is set to -1. By not setting
it to something else, we can let libx264 handle the RGB case.
Additionally, change the preference order to user-specified range
first, and then any fall-back logic left for the YUVJ pix_fmts.
Fixes the capture part of #9374
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 9afaf19547..d48e142e41 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -857,10 +857,12 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.i_slice_count = avctx->slices; - x4->params.vui.b_fullrange = avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ444P || - avctx->color_range == AVCOL_RANGE_JPEG; + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) + x4->params.vui.b_fullrange = avctx->color_range == AVCOL_RANGE_JPEG; + else if (avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || + avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || + avctx->pix_fmt == AV_PIX_FMT_YUVJ444P) + x4->params.vui.b_fullrange = 1; if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED) x4->params.vui.i_colmatrix = avctx->colorspace; |