From patchwork Sat Jan 2 12:57:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 24765 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C33F544A8EF for ; Sat, 2 Jan 2021 15:05:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98E9768A73D; Sat, 2 Jan 2021 15:05:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D309E689B91 for ; Sat, 2 Jan 2021 15:05:33 +0200 (EET) Received: by mail-lf1-f43.google.com with SMTP id a12so53281231lfl.6 for ; Sat, 02 Jan 2021 05:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZcSFm+U0cFk5txv6ZzEpaeGx0uSB/G6BForRMOja494=; b=XnsvefJC2wlMH6apsgIdoU4BiTU+g1t0Oc4kT8Qm+zRqq2msvHbkJPZ6CiQlJnu4yP pTBvo25rAgu1cEyuiXiytm7w1eRi6/hixJUwKKkxwRLZlnhOjH0SD9oKcVnENkNkiH0u NvNrWdYy7HTwOnHt8aTChmIgEcs9p5zoTdm2yHG+Y/05WUL92APyfZLnWUHySiQ/ELYL vMCb5QjXOXIgMxYwKKd7Xw66m81vEQOVhHc2Kr06oB0kN7utCwJ7PlZkvjNAy7RfZ6f1 HDq18CJrL5JWlOnmcM89NqDLod+Iy0L+4pog6FI5CdwRlSSJtwEG1Om6HzIyWJDLIeU4 UTrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZcSFm+U0cFk5txv6ZzEpaeGx0uSB/G6BForRMOja494=; b=EL6X1/oHFOmqA81FD7la6aiaQUxsVA9ahn88ENTvDQ6t7wXriHVgAxYXSOlqsQSR8X dHD7plbXEC9xMb13J8NhqACDQ9PVk+M4qtAUjc9P+PkJIycKvux3dKamUCAjbPko9klq Jk3EIYdXckY37zUgs4di5aPlU0UOEPivVCGHhThxCddeQNzB9NojNe/tddy8wQBtjB3h mUZyg2YERevFOANtE57pC7etKzpm9jKbINIUsIL/xfjjsOJli/hnHQvHzi1YgMII+QfS aZAYK+kavnsHvaatMClqUX7Rr5SGfqQH0rDmoyhfOew9Sukv91vU/s0AIjlFDR3txLs4 CMUg== X-Gm-Message-State: AOAM531y8FsMuMKqEF4ujIxXow9960+1F9nqxKaBr9BCqPHAfJMHWGIr wJPPtm/UA9JNkba6B93ppLmfA+kvFuA= X-Google-Smtp-Source: ABdhPJz2V5a551o86xcvVXv3aIZlPZJKIFIDOdB0L/+HMNpTwsFQjxi/9LJ2Q1RJC3Z04Y+38C3Hxw== X-Received: by 2002:a05:6512:61:: with SMTP id i1mr26427596lfo.343.1609592281552; Sat, 02 Jan 2021 04:58:01 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id t1sm8119393ljg.44.2021.01.02.04.58.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Jan 2021 04:58:00 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Jan 2021 14:57:58 +0200 Message-Id: <20210102125758.28047-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/videotoolbox: make FFmpeg-to-VT mapping error more informative X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Now logs the actual failed-to-map pixel format as well as range. --- libavcodec/videotoolbox.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 8773de3393..49e726a75f 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1088,7 +1088,13 @@ static int videotoolbox_common_init(AVCodecContext *avctx) vtctx->vt_ctx->cv_pix_fmt_type = av_map_videotoolbox_format_from_pixfmt2(hw_frames->sw_format, full_range); if (!vtctx->vt_ctx->cv_pix_fmt_type) { - av_log(avctx, AV_LOG_ERROR, "Unknown sw_format.\n"); + const AVPixFmtDescriptor *attempted_format = + av_pix_fmt_desc_get(hw_frames->sw_format); + av_log(avctx, AV_LOG_ERROR, + "Failed to map underlying FFmpeg pixel format %s (%s range) to " + "a VideoToolbox format!\n", + attempted_format ? attempted_format->name : "", + av_color_range_name(avctx->color_range)); err = AVERROR(EINVAL); goto fail; }