RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264: Always invoke the get_format() callback 

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Rémi Denis-Courmont 2014-09-25 11:59:57 +03:00 committed by Luca Barbato
parent 1c80c9d7ef
commit ce42316321
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libavcodec/h264_slice.c
View File

@ -975,45 +975,54 @@ static int clone_slice(H264Context *dst, H264Context *src)
static enum AVPixelFormat get_pixel_format(H264Context *h) static enum AVPixelFormat get_pixel_format(H264Context *h)
{ {
enum AVPixelFormat pix_fmts[2];
const enum AVPixelFormat *choices = pix_fmts;
pix_fmts[1] = AV_PIX_FMT_NONE;
switch (h->sps.bit_depth_luma) { switch (h->sps.bit_depth_luma) {
case 9: case 9:
if (CHROMA444(h)) { if (CHROMA444(h)) {
if (h->avctx->colorspace == AVCOL_SPC_RGB) { if (h->avctx->colorspace == AVCOL_SPC_RGB) {
return AV_PIX_FMT_GBRP9; pix_fmts[0] = AV_PIX_FMT_GBRP9;
} else } else
return AV_PIX_FMT_YUV444P9; pix_fmts[0] = AV_PIX_FMT_YUV444P9;
} else if (CHROMA422(h)) } else if (CHROMA422(h))
return AV_PIX_FMT_YUV422P9; pix_fmts[0] = AV_PIX_FMT_YUV422P9;
else else
return AV_PIX_FMT_YUV420P9; pix_fmts[0] = AV_PIX_FMT_YUV420P9;
break; break;
case 10: case 10:
if (CHROMA444(h)) { if (CHROMA444(h)) {
if (h->avctx->colorspace == AVCOL_SPC_RGB) { if (h->avctx->colorspace == AVCOL_SPC_RGB) {
return AV_PIX_FMT_GBRP10; pix_fmts[0] = AV_PIX_FMT_GBRP10;
} else } else
return AV_PIX_FMT_YUV444P10; pix_fmts[0] = AV_PIX_FMT_YUV444P10;
} else if (CHROMA422(h)) } else if (CHROMA422(h))
return AV_PIX_FMT_YUV422P10; pix_fmts[0] = AV_PIX_FMT_YUV422P10;
else else
return AV_PIX_FMT_YUV420P10; pix_fmts[0] = AV_PIX_FMT_YUV420P10;
break; break;
case 8: case 8:
if (CHROMA444(h)) { if (CHROMA444(h)) {
if (h->avctx->colorspace == AVCOL_SPC_RGB) { if (h->avctx->colorspace == AVCOL_SPC_RGB)
return AV_PIX_FMT_GBRP; pix_fmts[0] = AV_PIX_FMT_GBRP;
} else else if (h->avctx->color_range == AVCOL_RANGE_JPEG)
return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ444P pix_fmts[0] = AV_PIX_FMT_YUVJ444P;
: AV_PIX_FMT_YUV444P; else
pix_fmts[0] = AV_PIX_FMT_YUV444P;
} else if (CHROMA422(h)) { } else if (CHROMA422(h)) {
return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P if (h->avctx->color_range == AVCOL_RANGE_JPEG)
: AV_PIX_FMT_YUV422P; pix_fmts[0] = AV_PIX_FMT_YUVJ422P;
else
pix_fmts[0] = AV_PIX_FMT_YUV422P;
} else { } else {
return ff_get_format(h->avctx, h->avctx->codec->pix_fmts ? if (h->avctx->codec->pix_fmts)
h->avctx->codec->pix_fmts : choices = h->avctx->codec->pix_fmts;
h->avctx->color_range == AVCOL_RANGE_JPEG ? else if (h->avctx->color_range == AVCOL_RANGE_JPEG)
h264_hwaccel_pixfmt_list_jpeg_420 : choices = h264_hwaccel_pixfmt_list_jpeg_420;
h264_hwaccel_pixfmt_list_420); else
choices = h264_hwaccel_pixfmt_list_420;
} }
break; break;
default: default:
@ -1021,6 +1030,8 @@ static enum AVPixelFormat get_pixel_format(H264Context *h)
"Unsupported bit depth %d\n", h->sps.bit_depth_luma); "Unsupported bit depth %d\n", h->sps.bit_depth_luma);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
return ff_get_format(h->avctx, choices);
} }
/* export coded and cropped frame dimensions to AVCodecContext */ /* export coded and cropped frame dimensions to AVCodecContext */