From patchwork Tue Jan 3 10:18:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39835 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp7960695pzb; Tue, 3 Jan 2023 02:18:51 -0800 (PST) X-Google-Smtp-Source: AMrXdXuSDIAeViUyeWXOxeqomVDyO0tiCf3g0ZgKMfKDJpxWSuM7WMG0SRvjotsj3YmPRq9BgMoE X-Received: by 2002:a17:907:d68e:b0:7bd:43e9:d3ab with SMTP id wf14-20020a170907d68e00b007bd43e9d3abmr38238982ejc.52.1672741130944; Tue, 03 Jan 2023 02:18:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672741130; cv=none; d=google.com; s=arc-20160816; b=f3FroEAfz2NPpPo6fhmVun3tVpQX2J5YKJN3ckd1YzK0golSrrDuxB6jlS489dRxCW YgQTQg+ipDnUG2/lDhbQhskJQnq6BV4v8afKdfEd0TJ6NgSjqhvGccWuG5hprdXecvHe toiee+oA/PB1Vbw9HZvQTdNzfOI+ALpGqw1t7g0zF4nLwCqq+Q/mwTu42AnYW3Y3JXYC gg9aDBqUUA4xyqT96z/2Lfza7BvBfrV1DzpY2fcNgWSU1ka3N5k8R4i/ZXE6TG7jpcYA gBc2hZBm4a1fKxl6MiIrzVA7Yo8ELMg6B9h280kW7mZUx5oiQOb/KdIL08akaWC7x3W8 HSVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=Z/duABRmEU5foo+eGu3YQS0xslFAmL9pZGQpB5PPORA=; b=eNw2R4yigQRRZZUXKvqW6ysUmrUixe7SlqzY9HEpUR5gbSg04oeNNRCaWYEx7WG1Wh CtZ4cvqqTGxPAr2U5Efvw7MApi7PKhZmHAbOGC9m1LxJ0d7kbgoSkVatYNVShaLCwuE2 ujeGwsAA1JyxkE0W10Grb94YMB3A5Igy0LOXwQGDDZ5atlrQO2SuDRGbXVmDVJnrukPW /suyTB2GtQzbaJIqU/n5UmBnFyrqaNps2QSkUF0COqsCD9TGX5IEam25ymby3ey8fjpE Vjn/jU/FK1mBpsWckIFo9SBE6HFyLr0usV0YXZ6cWh/zJUZ0fjXZpwUjFSDJkBNyLWMC NT4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=pLUAiaXN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a13-20020a170906684d00b00788a4c018b5si20680216ejs.806.2023.01.03.02.18.50; Tue, 03 Jan 2023 02:18:50 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=pLUAiaXN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DCCD68BD14; Tue, 3 Jan 2023 12:18:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3A4F68B73D for ; Tue, 3 Jan 2023 12:18:40 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1672741115; bh=NzKbvnDM6tiGvJhj8I0wZ2VcPKzfry3R+vjYMs0S/Xk=; h=From:To:Cc:Subject:Date; b=pLUAiaXNxNwiv+HzlvcmS4sQSGiUxLylU9P7uJLe2+U/Hr8zDT+slywin6Xc7JGe0 pGIJ3hBeLO5D780Gye1ycD/QlyLOamiXoCgOOKRll5rMvGyIfPbJ3FAI9tYTshGs01 E4mJnt7TqIkTll7HUuquVJLMAzdon0czPU2KhKFo= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.64]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 4A2A8682; Tue, 03 Jan 2023 18:18:34 +0800 X-QQ-mid: xmsmtpt1672741114tpxrws4j2 Message-ID: X-QQ-XMAILINFO: NryjvM7YTpGPlHjzdw1P3r0V873owiBliGSTu4dOWK8tQIQrKSlsC+iVroY/V2 pTS9v8f1naYNU+Iana4cpPp6GaL1Uwztkk1K8vRia/i+1pkGWATXHesJOM9+UUfYEHSs38Hn07YG Kk9rA39wB0zmqOQiB9VpyWl7R29AAWRVS6300OlSE/6kw1JPpoUG3owIOyrIztuG5U4wIYftyXXP 5JsEThKBUTejQZSFmDRLUmTosfWYL2MHnizAxsvwLU5zqCH3PtUq34V/7a0vxgvcFH30cbU18WZ+ Upddb53iEAnDMwkeMImITWIvtNMypsVPjENMlxc0q8RfE9hRBUQwM27UgHhmVjD49/32/rLsCzq8 rsDQX5dwrAeH3d4Neq2DHQ0P9GtGS/Az2IZvhsDq2/sqyoDMcjadT9MlrLXQEeZoSanwzn+GjHIB NGooOCrswOMFLWxhVFEObyC21BKugzND5AMzFdzudE6PLdn0K805sBy2QN0F/cMDMRMTMwVfr+/e B+wUGp9JfHG9CxFqm//aetuE1tbhN8maIOquBJQWRN1evDhRaKSnndHp7kMj2FQcrpTeLka1aNXh nKctDFaFNIDbUjQFA8C4EgclGCk1d2VwJ8eVWmoNn6bWRmJyeMu9Am76kQRsrihbWH1TTLoPbzB9 imQmMu6L2uKqjEwvNWOwFZQtsmXgLvNqzwpdvUhSD/UjvU3NX+SUDGaLTeJzbCErtUnQ1YtXUiYf ef6bnXjelAGM1heL4Anp4icjBT6Ywo5EtzzwCwfNm5dh1Gj9FGwa+czXQsRTgIrbQ2+HGH5V9H5Q bHqzk7QGuKlhVHlfHpahJTmo/NTGTUQ3SfNZ3/sXUp+b86m3iwyn0OMWMGwMKt4cGj77uwajSwi1 DJ6fjUUVjXng7vwwliyx2zGnX5Xf2rsXAfDtauD6L/S+nwpLfhUHnsozCDuhpiKdn4qbqJVZL0s2 s/UA7AZNw5JIpy7EfqsggPN3UfjxfT2trjDgTyvL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jan 2023 18:18:30 +0800 X-OQ-MSGID: <20230103101832.98747-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/videotoolboxenc: log when get_cv_pixel_format failed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: P6xi0IosmMDa From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/videotoolboxenc.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index aec98ade4f..27db4e0d5e 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -847,13 +847,22 @@ static int get_cv_pixel_format(AVCodecContext* avctx, int* av_pixel_format, int* range_guessed) { + const char *range_name; if (range_guessed) *range_guessed = range != AVCOL_RANGE_MPEG && range != AVCOL_RANGE_JPEG; //MPEG range is used when no range is set *av_pixel_format = av_map_videotoolbox_format_from_pixfmt2(fmt, range == AVCOL_RANGE_JPEG); + if (*av_pixel_format) + return 0; + + 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 *av_pixel_format ? 0 : AVERROR(EINVAL); + return AVERROR(EINVAL); } static void add_color_attr(AVCodecContext *avctx, CFMutableDictionaryRef dict) { @@ -2146,18 +2155,8 @@ static int get_cv_pixel_info( return AVERROR(EINVAL); status = get_cv_pixel_format(avctx, av_format, av_color_range, color, &range_guessed); - 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"); - + if (status) return AVERROR(EINVAL); - } if (range_guessed) { if (!vtctx->warned_color_range) {