virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/videotoolboxenc: vastly simplify get_cv_pixel_info

Browse Source 
No longer requires per-format switch cases.

The frame==0 path was unused (and would've crashed anyway).
This commit is contained in:
rcombs
2021-12-16 17:29:29 -06:00
parent c8323350f4
commit 30539394bb
1 changed files with 15 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
libavcodec/videotoolboxenc.c
View File

@@ -2032,6 +2032,7 @@ static int get_cv_pixel_info(
size_t *strides, size_t *strides,
size_t *contiguous_buf_size) size_t *contiguous_buf_size)
{ {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
VTEncContext *vtctx = avctx->priv_data; VTEncContext *vtctx = avctx->priv_data;
int av_format = frame->format; int av_format = frame->format;
int av_color_range = frame->color_range; int av_color_range = frame->color_range;
@@ -2039,6 +2040,9 @@ static int get_cv_pixel_info(
int range_guessed; int range_guessed;
int status; int status;
if (!desc)
return AVERROR(EINVAL);
status = get_cv_pixel_format(avctx, av_format, av_color_range, color, &range_guessed); status = get_cv_pixel_format(avctx, av_format, av_color_range, color, &range_guessed);
if (status) { if (status) {
av_log(avctx, av_log(avctx,
@@ -2063,63 +2067,18 @@ static int get_cv_pixel_info(
} }
} }
switch (av_format) { *plane_count = av_pix_fmt_count_planes(avctx->pix_fmt);
case AV_PIX_FMT_NV12:
*plane_count = 2;
widths [0] = avctx->width; for (i = 0; i < desc->nb_components; i++) {
heights[0] = avctx->height; int p = desc->comp[i].plane;
strides[0] = frame ? frame->linesize[0] : avctx->width; bool hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA);
bool isAlpha = hasAlpha && (p + 1 == *plane_count);
widths [1] = (avctx->width + 1) / 2; bool isChroma = (p != 0) && !isAlpha;
heights[1] = (avctx->height + 1) / 2; int shiftw = isChroma ? desc->log2_chroma_w : 0;
strides[1] = frame ? frame->linesize[1] : (avctx->width + 1) & -2; int shifth = isChroma ? desc->log2_chroma_h : 0;
break; widths[p] = (avctx->width + ((1 << shiftw) >> 1)) >> shiftw;
heights[p] = (avctx->height + ((1 << shifth) >> 1)) >> shifth;
case AV_PIX_FMT_YUV420P: strides[p] = frame->linesize[p];
*plane_count = 3;
widths [0] = avctx->width;
heights[0] = avctx->height;
strides[0] = frame ? frame->linesize[0] : avctx->width;
widths [1] = (avctx->width + 1) / 2;
heights[1] = (avctx->height + 1) / 2;
strides[1] = frame ? frame->linesize[1] : (avctx->width + 1) / 2;
widths [2] = (avctx->width + 1) / 2;
heights[2] = (avctx->height + 1) / 2;
strides[2] = frame ? frame->linesize[2] : (avctx->width + 1) / 2;
break;
case AV_PIX_FMT_BGRA:
*plane_count = 1;
widths [0] = avctx->width;
heights[0] = avctx->height;
strides[0] = frame ? frame->linesize[0] : avctx->width * 4;
break;
case AV_PIX_FMT_P010LE:
*plane_count = 2;
widths[0] = avctx->width;
heights[0] = avctx->height;
strides[0] = frame ? frame->linesize[0] : (avctx->width * 2 + 63) & -64;
widths[1] = (avctx->width + 1) / 2;
heights[1] = (avctx->height + 1) / 2;
strides[1] = frame ? frame->linesize[1] : ((avctx->width + 1) / 2 + 63) & -64;
break;
default:
av_log(
avctx,
AV_LOG_ERROR,
"Could not get frame format info for color %d range %d.\n",
av_format,
av_color_range);
return AVERROR(EINVAL);
} }
*contiguous_buf_size = 0; *contiguous_buf_size = 0;