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

avcodec/videotoolboxenc: log when get_cv_pixel_format failed

Browse Source 
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2023-01-03 18:18:30 +08:00
parent 52eb2396d7
commit 5ab429d8df
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/videotoolboxenc.c
View File

@@ -847,13 +847,22 @@ static int get_cv_pixel_format(AVCodecContext* avctx,
int* av_pixel_format, int* av_pixel_format,
int* range_guessed) int* range_guessed)
{ {
const char *range_name;
if (range_guessed) *range_guessed = range != AVCOL_RANGE_MPEG && if (range_guessed) *range_guessed = range != AVCOL_RANGE_MPEG &&
range != AVCOL_RANGE_JPEG; range != AVCOL_RANGE_JPEG;
//MPEG range is used when no range is set //MPEG range is used when no range is set
*av_pixel_format = av_map_videotoolbox_format_from_pixfmt2(fmt, range == AVCOL_RANGE_JPEG); *av_pixel_format = av_map_videotoolbox_format_from_pixfmt2(fmt, range == AVCOL_RANGE_JPEG);
if (*av_pixel_format)
return 0;
return *av_pixel_format ? 0 : AVERROR(EINVAL); range_name = av_color_range_name(range);
av_log(avctx, AV_LOG_ERROR,
"Could not get pixel format for color format '%s' range '%s'.\n",
av_get_pix_fmt_name(fmt),
range_name ? range_name : "Unknown");
return AVERROR(EINVAL);
} }
static void add_color_attr(AVCodecContext *avctx, CFMutableDictionaryRef dict) { static void add_color_attr(AVCodecContext *avctx, CFMutableDictionaryRef dict) {
@@ -2146,18 +2155,8 @@ static int get_cv_pixel_info(
return AVERROR(EINVAL); 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_ERROR,
"Could not get pixel format for color format '%s' range '%s'.\n",
av_get_pix_fmt_name(av_format),
av_color_range > AVCOL_RANGE_UNSPECIFIED &&
av_color_range < AVCOL_RANGE_NB ?
av_color_range_name(av_color_range) :
"Unknown");
return AVERROR(EINVAL); return AVERROR(EINVAL);
}
if (range_guessed) { if (range_guessed) {
if (!vtctx->warned_color_range) { if (!vtctx->warned_color_range) {