RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 20:07:04 +00:00
Code Issues Projects Releases Wiki Activity

x264: Support version 153

Browse Source 
It has native simultaneus 8 and 10 bit support.

(cherry picked from commit c6558e8840)
This commit is contained in:
Luca Barbato 2017-12-26 12:32:42 +01:00 committed by James Almer
parent 54897d7466
commit 96e8400553
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/libx264.c
View File

@ -279,7 +279,11 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
x264_picture_init( &x4->pic ); x264_picture_init( &x4->pic );
x4->pic.img.i_csp = x4->params.i_csp; x4->pic.img.i_csp = x4->params.i_csp;
#if X264_BUILD >= 153
if (x4->params.i_bitdepth > 8)
#else
if (x264_bit_depth > 8) if (x264_bit_depth > 8)
#endif
x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH; x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt); x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);
@ -490,6 +494,9 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.p_log_private = avctx; x4->params.p_log_private = avctx;
x4->params.i_log_level = X264_LOG_DEBUG; x4->params.i_log_level = X264_LOG_DEBUG;
x4->params.i_csp = convert_pix_fmt(avctx->pix_fmt); x4->params.i_csp = convert_pix_fmt(avctx->pix_fmt);
#if X264_BUILD >= 153
x4->params.i_bitdepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
#endif
PARSE_X264_OPT("weightp", wpredp); PARSE_X264_OPT("weightp", wpredp);
@ -878,6 +885,24 @@ static const enum AVPixelFormat pix_fmts_10bit[] = {
AV_PIX_FMT_NV20, AV_PIX_FMT_NV20,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
static const enum AVPixelFormat pix_fmts_all[] = {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUVJ420P,
AV_PIX_FMT_YUV422P,
AV_PIX_FMT_YUVJ422P,
AV_PIX_FMT_YUV444P,
AV_PIX_FMT_YUVJ444P,
AV_PIX_FMT_NV12,
AV_PIX_FMT_NV16,
#ifdef X264_CSP_NV21
AV_PIX_FMT_NV21,
#endif
AV_PIX_FMT_YUV420P10,
AV_PIX_FMT_YUV422P10,
AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_NV20,
AV_PIX_FMT_NONE
};
#if CONFIG_LIBX264RGB_ENCODER #if CONFIG_LIBX264RGB_ENCODER
static const enum AVPixelFormat pix_fmts_8bit_rgb[] = { static const enum AVPixelFormat pix_fmts_8bit_rgb[] = {
AV_PIX_FMT_BGR0, AV_PIX_FMT_BGR0,
@ -889,12 +914,16 @@ static const enum AVPixelFormat pix_fmts_8bit_rgb[] = {
static av_cold void X264_init_static(AVCodec *codec) static av_cold void X264_init_static(AVCodec *codec)
{ {
#if X264_BUILD < 153
if (x264_bit_depth == 8) if (x264_bit_depth == 8)
codec->pix_fmts = pix_fmts_8bit; codec->pix_fmts = pix_fmts_8bit;
else if (x264_bit_depth == 9) else if (x264_bit_depth == 9)
codec->pix_fmts = pix_fmts_9bit; codec->pix_fmts = pix_fmts_9bit;
else if (x264_bit_depth == 10) else if (x264_bit_depth == 10)
codec->pix_fmts = pix_fmts_10bit; codec->pix_fmts = pix_fmts_10bit;
#else
codec->pix_fmts = pix_fmts_all;
#endif
} }
#define OFFSET(x) offsetof(X264Context, x) #define OFFSET(x) offsetof(X264Context, x)