From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 45B8D42232 for ; Fri, 17 Dec 2021 00:12:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F097668AFD9; Fri, 17 Dec 2021 02:12:29 +0200 (EET) Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C325768A852 for ; Fri, 17 Dec 2021 02:12:21 +0200 (EET) Received: by mail-io1-f43.google.com with SMTP id k21so741127ioh.4 for ; Thu, 16 Dec 2021 16:12:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=iY9j1tUgehu/kcTw6agrlWCMz2/XTxqD90C/Ko67Zoo=; b=ZeoDuBtsWnfpcZg2rC/E1izIXasqK2N0+uotSvq9A4D/jjck/9PmYGI4py2kzgna70 f/gKQdQhKFnJL6q/UECYvfr9RI+gTeMSuB2qjtS3GGGyrUEvsf1vDPoEy841IHEDluaG 7F7urksdiGIshm7ZRF2bMWb8mBFgjWM2xTuiwjGO3leiN8z/aUVOXaZildi7t7OJlpTa aSDTQxgQcMMJA5C/kUbkD0bSfQRnddx3oEbRFt+8TqGcNtx/kpGTKZ8+5dFyWMs+SbtZ ZPaTWFuEcRDJTKKtCJsE/vhBmfBz/MOm8sjbtnsfBCkJK6rrZlKY/ByGHbDRSfZ8Yy/9 dmJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iY9j1tUgehu/kcTw6agrlWCMz2/XTxqD90C/Ko67Zoo=; b=DgdmjV3e5vyJdnPwJ/m5rBPJIzioDbz1KW+gccANfDz4GbDMC6eYwvgahZCXFyT5dh 8EQELnah23dWBD/DKVfsjXQdPIUDr/l4i+IfMiW5kYub+5n5uPSo5VjhnK9Rv/6aGqSV W+OvVF9NIir8D6pLlT7/FzNvilJzFoVkNZV0g6WdoEIHHye9VJAie9hlLY6T8/osYTAd cJAjwcm9jmhDSlOgWbwzHcbrEm0wwrXFRSrRz33sD/IBC4HSH4x2TZsZg0khvhj/dpuw cj+5pamJVYDFAYZxjYWmFcLNHE3T4ieWkUVKIjQerdJZCjz3wBmIzKHLzPB/uDNVdZtE TcMg== X-Gm-Message-State: AOAM530RdsMh5rS87SzuhoVPeXtWNFx3oAvKOQlo2Z0itOcC2VC7dgtZ dMHewqpOoTpO8vxojmHo0co4ow9BDfyj1rY= X-Google-Smtp-Source: ABdhPJwtqZxQ1B8rPc8EYc2bCCQh7ZKYWbOB+I0ZwqnDaeMGWqfsATMLrMTOHxXT8UCsQHW9VlbJ9w== X-Received: by 2002:a05:6638:10ea:: with SMTP id g10mr258139jae.117.1639699939819; Thu, 16 Dec 2021 16:12:19 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:1163:bda5:7473:fab3]) by smtp.gmail.com with ESMTPSA id z13sm1571257iln.43.2021.12.16.16.12.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Dec 2021 16:12:19 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Dec 2021 18:12:06 -0600 Message-Id: <20211217001215.75135-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211217001215.75135-1-rcombs@rcombs.me> References: <20211217001215.75135-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] lavc/videotoolboxenc: use common routine for pixfmt conversion 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavcodec/videotoolboxenc.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index ebaa3ebdc8..1e7c164a97 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -29,6 +29,7 @@ #include "libavutil/avstring.h" #include "libavcodec/avcodec.h" #include "libavutil/pixdesc.h" +#include "libavutil/hwcontext_videotoolbox.h" #include "internal.h" #include #include "atsc_a53.h" @@ -797,25 +798,9 @@ static int get_cv_pixel_format(AVCodecContext* avctx, range != AVCOL_RANGE_JPEG; //MPEG range is used when no range is set - if (fmt == AV_PIX_FMT_NV12) { - *av_pixel_format = range == AVCOL_RANGE_JPEG ? - kCVPixelFormatType_420YpCbCr8BiPlanarFullRange : - kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange; - } else if (fmt == AV_PIX_FMT_YUV420P) { - *av_pixel_format = range == AVCOL_RANGE_JPEG ? - kCVPixelFormatType_420YpCbCr8PlanarFullRange : - kCVPixelFormatType_420YpCbCr8Planar; - } else if (fmt == AV_PIX_FMT_BGRA) { - *av_pixel_format = kCVPixelFormatType_32BGRA; - } else if (fmt == AV_PIX_FMT_P010LE) { - *av_pixel_format = range == AVCOL_RANGE_JPEG ? - kCVPixelFormatType_420YpCbCr10BiPlanarFullRange : - kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange; - } else { - return AVERROR(EINVAL); - } + *av_pixel_format = av_map_videotoolbox_format_from_pixfmt2(fmt, range == AVCOL_RANGE_JPEG); - return 0; + return *av_pixel_format ? 0 : AVERROR(EINVAL); } static void add_color_attr(AVCodecContext *avctx, CFMutableDictionaryRef dict) { -- 2.33.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".