virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc/videotoolboxenc: detect alpha more generically

Browse Source 
Fixes support for alpha in hardware input frames
This commit is contained in:
rcombs
2021-12-16 17:24:59 -06:00
parent 2acb13cb93
commit e55db79612
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/videotoolboxenc.c
View File

@@ -406,14 +406,14 @@ static int count_nalus(size_t length_code_size,
return 0; return 0;
} }
static CMVideoCodecType get_cm_codec_type(enum AVCodecID id, static CMVideoCodecType get_cm_codec_type(AVCodecContext *avctx,
enum AVPixelFormat fmt,
double alpha_quality) double alpha_quality)
{ {
switch (id) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt == AV_PIX_FMT_VIDEOTOOLBOX ? avctx->sw_pix_fmt : avctx->pix_fmt);
switch (avctx->codec_id) {
case AV_CODEC_ID_H264: return kCMVideoCodecType_H264; case AV_CODEC_ID_H264: return kCMVideoCodecType_H264;
case AV_CODEC_ID_HEVC: case AV_CODEC_ID_HEVC:
if (fmt == AV_PIX_FMT_BGRA && alpha_quality > 0.0) { if (desc && (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpha_quality > 0.0) {
return kCMVideoCodecType_HEVCWithAlpha; return kCMVideoCodecType_HEVCWithAlpha;
} }
return kCMVideoCodecType_HEVC; return kCMVideoCodecType_HEVC;
@@ -1376,7 +1376,7 @@ static int vtenc_configure_encoder(AVCodecContext *avctx)
CFNumberRef gamma_level = NULL; CFNumberRef gamma_level = NULL;
int status; int status;
codec_type = get_cm_codec_type(avctx->codec_id, avctx->pix_fmt, vtctx->alpha_quality); codec_type = get_cm_codec_type(avctx, vtctx->alpha_quality);
if (!codec_type) { if (!codec_type) {
av_log(avctx, AV_LOG_ERROR, "Error: no mapping for AVCodecID %d\n", avctx->codec_id); av_log(avctx, AV_LOG_ERROR, "Error: no mapping for AVCodecID %d\n", avctx->codec_id);
return AVERROR(EINVAL); return AVERROR(EINVAL);