From patchwork Fri Dec 29 13:22:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 45385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp4771123pzh; Fri, 29 Dec 2023 05:23:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IFy5v8nO9JAH5BCWq2D7tDZvEIySCmZx91WVGRJggBYICX8iIIf6VmUwYB6l6hIF94xTE2B X-Received: by 2002:a50:d588:0:b0:553:7cc5:2e8c with SMTP id v8-20020a50d588000000b005537cc52e8cmr9592352edi.17.1703856202788; Fri, 29 Dec 2023 05:23:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703856202; cv=none; d=google.com; s=arc-20160816; b=U5Ezx213eMocYLUz61rsYfC4fVg0Iv0oEBY82lXQ4hFl45u3XA8A/X+ZwrWwAU+riJ YZzVIKoxwbfHgJRaS1M+L2t/HVXpHO3lIwojMSLzW4h/eMfRy/qgT4DwfNaohTcSEpfH JDmGHEbLIK0Ypv7cY2q4/JEqKuxanbP+RKJAmfpLhoHJW28PkB/dn+w7xq+X+VjqZ+NB XZsKDP5V7XqulGxYxZwBge8ncrsGox2x7POevb7TurFUFt6XCdgUsvyoeo8nisVPFdje R1VhMuASBj2U0dR5OHqXhJ6smXL0Tbhs1hnEw30492Ni7KKtRFeVoI8M0yQUCXe1qHdE xphA== 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=fr89rsPiq/BkvIjQHd0WHML8pN6WBRQvAv/ln4iifM8=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=fonJl/UporisZWbxxkwQ/f6B6+DbqXY9TfwUqOy4Receg1yB+sAjr7MPzNBK2YD6FG qfU0LN4J4LOJznxB7fFn2RdNHv+wrMabzWYqPyyTclI7Z7zuk4/Vgdl8J5EE42pHhehQ rxEJ/FVFdRbibBbh9aYMs163bAs8I1WHrqJDwqVHgXtkJpDUDZn5tJOVA1XWOQBiNpRc b4kL1VP+NdEAhcO7N2XcTcUb8YhaA0FUwjf7YSDpOFyBOblcM+4FYP3Wgris7FixzyaR CerBjTm4CbKKTZe0LERXo9KBALOcVvPDmkk/2QCZvydJH9piSowSJqzsXdgGIROeKzkQ TPNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=wabQ6Qd6; 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 u15-20020a50a40f000000b00555bded5b7csi571454edb.640.2023.12.29.05.23.22; Fri, 29 Dec 2023 05:23:22 -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=wabQ6Qd6; 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 35EC868CD06; Fri, 29 Dec 2023 15:23:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8C0068CC40 for ; Fri, 29 Dec 2023 15:23:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1703856181; bh=/be65iR05IPYSNuLf7mQRaICbLWXp4A0IG/svB7wFLM=; h=From:To:Cc:Subject:Date; b=wabQ6Qd6Dc+tnhmaVb3y9/rT2Vx2/ZRgPiHVDM58rATuXd3IQU88ynDALzyMfXT5F 9qPdVyR6zM5O707dbITyCBvVkT61xpRabbVrf3dIHyKu7RjN9JUs+x8jfTiS46JqKI 8SL005Gwf2N6Jvf/obzKNF6rUJx9vmMAn5WtnM8s= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.198]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 5C0A34B8; Fri, 29 Dec 2023 21:23:00 +0800 X-QQ-mid: xmsmtpt1703856180tp78exfxq Message-ID: X-QQ-XMAILINFO: NhUkPfKlCtQwpi+UTm5bFoHMpSmo4s6Lm3tsSXek4LpAaqlbj9RuQ3r0LX6Xud 9Xkxv9yZKxfbqcWSqNJG6F8/f+HRgaPy23kP+aZTZABZ7vmrJBquRxOMvQnCREHlvL9ej0ikW/F/ 0yeip4M6M97Mddt1ktj7XV6VOYEYblHWl5muCYz+1Je0jpAi6zzoHIh8c06B2sSNnYXG//zJYxC+ lG3M+6qobesYQPvs111X5ulwHPudT8Iy/x+e6lJp1U6BRXBHARWk0xfZTNb32KmuAuFwdEu9pkwL uCDT3XGzXTWibbWNigX1UhAeqBQ7gdhMHV1Yj4D4um2ML/Yw3g+wzs0/0pBki6zGu1sGhjpsn9wO 7aWv+dLl4PicSsoD4VuZ+bq11h1KVFonQOKEjuy+TDKFaXNyPTEUnNNozY5MTG/lO+6Zg50N1zM5 qipzV3FH+IFC4GWffB6pLBW6bX4t7ZjXZnWBiwMlhWtxzBZZ/D9jWsayWYFpQBVMjTaeNxaCfgfR hMWtiIEM4ZL07D2fFzH8PBUE0rtIU0A+MkNsGecgw3aSM1MzUdCzNOod5c3UX11tH3vsWjYDnzhF xpYThOEGX7/Cz4LgI2UyGVxR3gPRASMBv638Mjc4ATwp5X9Z7rzXiOEa6HoI350qfbf/3kyw2dXL F88t183wlslZ2okT8GGBtpsR9eaYOOVYgMIRn7ksppTH8aKkN0yWM3r3ofDyScz6dcp2CoET4Fa0 N6cpnVsXpS6NpqbH3wRp2jahPRgfhAwp9GC6dL4qqMIF0PS9UvsKcfWreD7QnHnB1GL1PlpZen6g yh/RkcD7MOl9ZI0Nc+8YW+FL7MylRP3MN/iuNtFTd/ypPxkrc86C1ESS7/xes4PtiV2Oehy3mGZN Y2n4Nls5wj/CPYfxieXYnJ9pY4c33sEKrk8Z4fpayYBHRbizJepgvqaQDv/TB5MT/S1HLAjvgS6h f1zeZgbDFGfsUvq6mZU1InKQUqnZnfcFH5Qotrfo6AMrdUzzVGlpwhYGh7RAxA X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Dec 2023 21:22:57 +0800 X-OQ-MSGID: <20231229132258.31094-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avutil/hwcontext_videotoolbox: add frame hwctx to specify color range 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: aYrCU8LO4QLB From: Zhao Zhili VideoToolbox use different identifiers for the same pixel format with different color range, like kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange kCVPixelFormatType_420YpCbCr8BiPlanarFullRange. Before the patch, vt_pool_alloc() always use limited range, and it will fail for pixel format AV_PIX_FMT_BGRA since there is no limited range kCVPixelFormatType_32BGRA. --- libavutil/hwcontext_videotoolbox.c | 30 +++++++++++++++++++++++------- libavutil/hwcontext_videotoolbox.h | 7 +++++-- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index b8e6bb407f..bb5b7e2764 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -144,6 +144,25 @@ enum AVPixelFormat av_map_videotoolbox_format_to_pixfmt(uint32_t cv_fmt) return AV_PIX_FMT_NONE; } +static uint32_t vt_format_from_pixfmt(enum AVPixelFormat pix_fmt, + enum AVColorRange range) +{ + for (int i = 0; i < FF_ARRAY_ELEMS(cv_pix_fmts); i++) { + if (cv_pix_fmts[i].pix_fmt == pix_fmt) { + int full_range = (range == AVCOL_RANGE_JPEG); + + // Don't care if unspecified + if (range == AVCOL_RANGE_UNSPECIFIED) + return cv_pix_fmts[i].cv_fmt; + + if (cv_pix_fmts[i].full_range == full_range) + return cv_pix_fmts[i].cv_fmt; + } + } + + return 0; +} + uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt) { return av_map_videotoolbox_format_from_pixfmt2(pix_fmt, false); @@ -151,12 +170,7 @@ uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt) uint32_t av_map_videotoolbox_format_from_pixfmt2(enum AVPixelFormat pix_fmt, bool full_range) { - int i; - for (i = 0; i < FF_ARRAY_ELEMS(cv_pix_fmts); i++) { - if (cv_pix_fmts[i].pix_fmt == pix_fmt && cv_pix_fmts[i].full_range == full_range) - return cv_pix_fmts[i].cv_fmt; - } - return 0; + return vt_format_from_pixfmt(pix_fmt, full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG); } static int vt_pool_alloc(AVHWFramesContext *ctx) @@ -166,6 +180,7 @@ static int vt_pool_alloc(AVHWFramesContext *ctx) CFNumberRef w, h, pixfmt; uint32_t cv_pixfmt; CFMutableDictionaryRef attributes, iosurface_properties; + AVVTFramesContext *hw_ctx = ctx->hwctx; attributes = CFDictionaryCreateMutable( NULL, @@ -173,7 +188,7 @@ static int vt_pool_alloc(AVHWFramesContext *ctx) &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - cv_pixfmt = av_map_videotoolbox_format_from_pixfmt(ctx->sw_format); + cv_pixfmt = vt_format_from_pixfmt(ctx->sw_format, hw_ctx->color_range); pixfmt = CFNumberCreate(NULL, kCFNumberSInt32Type, &cv_pixfmt); CFDictionarySetValue( attributes, @@ -750,6 +765,7 @@ const HWContextType ff_hwcontext_type_videotoolbox = { .frames_priv_size = sizeof(VTFramesContext), .device_create = vt_device_create, + .frames_hwctx_size = sizeof(AVVTFramesContext), .frames_init = vt_frames_init, .frames_get_buffer = vt_get_buffer, .frames_get_constraints = vt_frames_get_constraints, diff --git a/libavutil/hwcontext_videotoolbox.h b/libavutil/hwcontext_videotoolbox.h index 25dde85df5..600e9f2c8d 100644 --- a/libavutil/hwcontext_videotoolbox.h +++ b/libavutil/hwcontext_videotoolbox.h @@ -39,10 +39,13 @@ * depending on application usage, so it is preferable to let CoreVideo manage * the pool using the default implementation. * - * Currently AVHWDeviceContext.hwctx and AVHWFramesContext.hwctx are always - * NULL. + * Currently AVHWDeviceContext.hwctx are always NULL. */ +typedef struct AVVTFramesContext { + enum AVColorRange color_range; +} AVVTFramesContext; + /** * Convert a VideoToolbox (actually CoreVideo) format to AVPixelFormat. * Returns AV_PIX_FMT_NONE if no known equivalent was found. From patchwork Fri Dec 29 13:22:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 45386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp4771213pzh; Fri, 29 Dec 2023 05:23:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKv6wzSrhZ5Df0n4uXF8u862GGvgera+Tl/3MvXem2jcm2i++/staeN7/4gDgUD2ljLSAv X-Received: by 2002:a17:906:5358:b0:a26:86af:f1bd with SMTP id j24-20020a170906535800b00a2686aff1bdmr2918584ejo.29.1703856211940; Fri, 29 Dec 2023 05:23:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703856211; cv=none; d=google.com; s=arc-20160816; b=ghp1WyhzdORA9ZtvvIdpiRy1y6q/dkQhRjU1EDE15aThxEzhIDOgPgOnXF3/TgrFIH xnoIX15M7+GgAWtEwxnLT9a0a2wX6oHCY69yCCAmNUJa9TG+qK4tOjry9CO19xcN1mXi bQg+xq6F4cJXnW2AYtfWMYvItShTjFdpDgurc4NK4TfJ3jzEKBS+H3vo4BNGiAZsOBPV ZJfHKpr3fBBc/NsZMlX1rNbNClPICVzbnXPRu9slBd5e3RWfctZTmAkHavXC31GzFOqn izx30GHmoS9tftnkruw/9vy/ktseY1zLYIPEFgBFHwOoq0clKabXvcVPLmojGz3L+k2R d1ew== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=YHMcfag6ekWZF66lY7dU5d3wMK8sq1CZufNnsXnkKFU=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=zlVFeSte+IdwYBgI+4XXlT7EUoHpxHxnULmdwVa/TKMK7rmulIHrIP9s3hOBZAQoDO OFzMr2d63E+/NmTp2WdMkH8JjgLfnDqn1eDvf2ZvDjG5Hrv9vnjY5m2ve974aoxjeuog ymyWfZ9/muaZ/A1XIBiAEnKiiTGIZOiLVitLiNJairruksyhdi6UNlvPKhYlR2d9J98Z 3sLbD8qao71JjDe+K7uER59WbCFIhdpGewqiN7GBwLAg7tAtw+zpIYGUY5RYEP9NhNrl PyvNwSUdyFP60ELdaEfkqFSC9IxLX6DnvZQ9TGXoxJ2ETm0Z2F9D3WmL60tAtUgBerr7 4FIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=L53bytFe; 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 fp17-20020a1709069e1100b00a26ab945bcbsi7086763ejc.113.2023.12.29.05.23.31; Fri, 29 Dec 2023 05:23:31 -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=L53bytFe; 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 2FEC468CAB8; Fri, 29 Dec 2023 15:23:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-231.mail.qq.com (out203-205-221-231.mail.qq.com [203.205.221.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5B3868CA4C for ; Fri, 29 Dec 2023 15:23:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1703856182; bh=8zEFkUX/kQgZT26E8ZZXzi9gE25u+VorPHY2fUutCUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L53bytFeGXaZShsxIxnTZU/qAG7ghFk7R9U2kWiNsgGPOk48q5QFS4woByoulboXc UDMssN01C7Ppave5bRyo/qO3HOXLfwM02gODPRo18/GoatDHe/CJW11XUkbiVA+YjX FiNxNSILJWiJFaAFltT6gGC4IzpD1GEEiQnT2lm0= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.198]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 5C0A34B8; Fri, 29 Dec 2023 21:23:00 +0800 X-QQ-mid: xmsmtpt1703856181tvie3hj96 Message-ID: X-QQ-XMAILINFO: New1l5u9k9F/jBUlEbZv8YcP+1lVegKTuUEpnP/U+pS6Wz3LYmcBwresAN2kfD z27732yB1phVrMQbMVEdVEj21X+wo1N8mRQL23aCpHtu9G9J810699ogXNpE5jRkBDBCBXuU10Yq ifexBjiYSeA/GAiKu1hvkwTWSmnx2l8i6zhRUs94WNWALiFyzlDeOpwB0ipA5+3oqMMCgGH2jtX7 zx8jZDJUlHH49GluywKHExVUI7sDTaT2iMbzj6L7Xpm1z7Le2JdUkuGIsVXq+2sf49U2Fi12c8Bd EFPnkaWB74jUGp7FrSQ7WcP8XCWdJXn67r6wZQydqir8jLuS1LPfUq0t24Kr676EyuXh/PuPBzr5 C3PZyIjO1boPAPN55gqJ/sqW9Izg/OjhpEDPKTVWWOlqpW3cBI0VRrMeYdUUN0r0pY+mkSY3of1f nE2PONIYtZjkh7UUev7hEU1SM+gEobXrPS0Vtcv+cNIoJtJRdY2s6lWVd/U8qJJT2hKw8/5NQVX+ 5zs9sYwJChzpMrZfSBseyAuNSYThmlxs7JjwAERdCDyupFVFzP3+wnCpJMFElGPKT/LqtynQPKpQ EQaddZmixVNVuxu0WHg7PDd26S6rxHivfPbUR953OBk1XUwQXnUxhzOwO7hh6AvOx2T0rFFXxfEG cCJqXZLndnLYwl9MOJ0C79I3DL0d9kQbODbZOruxn+G+n42RLlDYSh0+T/+ituC5N0B2L0ko8UQR 5jfx8U7dNfUyVJZMbsTsRsmWi0R45sFU2RAFH4WcYoBHNIKEUaqe/Sk0nFAb5t1pYTIyfISqDTAL ofveyRJp8Jvc7jmL7apAYTf4hxDNcMYtSVBKJ0GdiMU9hALpyIqIUKfmGI3VnPXGPP6BH/2/Q0WR Vv9eITDkx5Bp0iWJ8Mwxb6WvEO+e3OiWYLqVS9XUfIKcYw5Tz+5iTXSV2tRwk8lBIfN6DOqShQ3Q XO0rDD6mSpPv2e6EX3ugFUXu89CZ4CQC7+Z3JajL6Qoj7WPZxSEk8QtNlJ+Qtuok5XMuAGwzA= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Dec 2023 21:22:58 +0800 X-OQ-MSGID: <20231229132258.31094-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231229132258.31094-1-quinkblack@foxmail.com> References: <20231229132258.31094-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/videotoolbox: specify color range for hw frame ctx 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: hPGJV/3Yze8t From: Zhao Zhili --- libavcodec/videotoolbox.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 43fd2e3fea..f2269766a2 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -549,6 +549,7 @@ static int videotoolbox_buffer_create(AVCodecContext *avctx, AVFrame *frame) cached_frames->height != height) { AVBufferRef *hw_frames_ctx = av_hwframe_ctx_alloc(cached_frames->device_ref); AVHWFramesContext *hw_frames; + AVVTFramesContext *hw_ctx; if (!hw_frames_ctx) return AVERROR(ENOMEM); @@ -557,6 +558,8 @@ static int videotoolbox_buffer_create(AVCodecContext *avctx, AVFrame *frame) hw_frames->sw_format = sw_format; hw_frames->width = width; hw_frames->height = height; + hw_ctx = hw_frames->hwctx; + hw_ctx->color_range = avctx->color_range; ret = av_hwframe_ctx_init(hw_frames_ctx); if (ret < 0) { @@ -1197,6 +1200,7 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) { VTContext *vtctx = avctx->internal->hwaccel_priv_data; AVHWFramesContext *hw_frames; + AVVTFramesContext *hw_ctx; int err; bool full_range; @@ -1232,6 +1236,8 @@ int ff_videotoolbox_common_init(AVCodecContext *avctx) hw_frames->sw_format = videotoolbox_best_pixel_format(avctx); hw_frames->width = avctx->width; hw_frames->height = avctx->height; + hw_ctx = hw_frames->hwctx; + hw_ctx->color_range = avctx->color_range; err = av_hwframe_ctx_init(avctx->hw_frames_ctx); if (err < 0) {