From patchwork Mon Nov 22 21:58:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 31598 Delivered-To: andriy.gelman@gmail.com Received: by 2002:ab0:6957:0:0:0:0:0 with SMTP id c23csp7337403uas; Mon, 22 Nov 2021 13:59:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJz7YsJQmYroJTZFU+FMRuq5WoH6/0mcrPRFm4GeQKVkqbt1ZDtfg5odPpnk8dr+qg10qkZp X-Received: by 2002:a17:906:6547:: with SMTP id u7mr739997ejn.544.1637618343551; Mon, 22 Nov 2021 13:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637618343; cv=none; d=google.com; s=arc-20160816; b=K6hzJTl1oISZr/+Og9uFTlUGTfLge9I3VODzf7fCg/QHHX95LFo8AqQXF4joFWcPir xyo9wViVM4FsLPfBdrjLm0l4dH8vXQjyFg/f3l7JGWl8KNss9Wkxq64qyW1GCwmkgcbd 7tKFHTXEBjaVcBHF1Oj4nY4GRdPFqet8MnWZFiDRpuOKioPcdAeAaxIp5nXjwhGi3vov 1ewO/Qv0HjbPwC8vdqgmqTEH/EC18cT97AsQirNtnEFZffEa3Vax6MivhKlRriMPilh1 rDhhXMS8ZBIbojG9uXKxwS8v6hvhd74OtZ+AaLaYEVHI4MSdQXlrWz/kj8Cb67Z0EFXt XGwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=gwWQIa2DGKzQtwaAqUhzHim6/Bmvg9GNWKtzdWtho8Y=; b=pFIOaPJpd9h8Biv91/XJdWOaLMQG1cihl6zt33oGwC9HwXMN6ibzs0Vd46LIxTJylm uAVHPrYSLGQGk5p5dQRYdpaO7t9V3AuWxE/QfrdU4o+8hRg8ez0OTvTDmuNd9DLlikNF tU4cZxfqlrqsh2kJIHYtwCVp+hmrjoxq/oWS6cVoA/1+Hnpq+mv45tOTsPJxHdlP4CbA rZywEO9VtDSYYq2gp8NmduaMxU3Bwoffq/FqYimAlCBBsTdrbKK85ddjf/cu0fVC6kdi XFnSddHQcqc9QaZGmR7te+C0PHq03ZjozPtQBvmea3q8oax9L5vHfT/LcWK5IAeeiO+S yQAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=LrqgIvk1; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id du6si32501336ejc.161.2021.11.22.13.59.03; Mon, 22 Nov 2021 13:59:03 -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=@rcombs.me header.s=google header.b=LrqgIvk1; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 247C068AB87; Mon, 22 Nov 2021 23:58:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7160268A96A for ; Mon, 22 Nov 2021 23:58:34 +0200 (EET) Received: by mail-io1-f41.google.com with SMTP id v23so25324978iom.12 for ; Mon, 22 Nov 2021 13:58:34 -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=90lpGakv6s+RfvSfFrMk4sxnuyhkXapuucPOPTIOTPc=; b=LrqgIvk1xMETrLHDNg9vxhECqtDU2NIgDVigGBa85+Zt0fZGr7SqS+7vp1SB0Ls9C9 oK+9gU3s8x80276k7jS5yBS+V1CBUcFlafXGxJ25y8FaZNtg/DRXfgoGv2sPuA4SXob9 Sv3RgktWcDgbTBE4y6o3nCwlrUy/FVMkWxrl9+o/pv+xtct4fjYwh0pJINgSw/2AcsiW M8Y1lX0vrOcTjvQawgEcuTN8fl1KwwvNIZvY8goizXbfKTqxaCRH6W4+liXvsRInImOL cRdcLARBtlwt6Ma/cgmmETZ4PBBcNpFGT2KsF7qOZf/w/TjqUze6h9LL6LqzgtU1cPJD q8lg== 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=90lpGakv6s+RfvSfFrMk4sxnuyhkXapuucPOPTIOTPc=; b=APIEsw2tWlsDWy1odTUsOFl94MVfe0grfl7SW/YWuQrM3fnbnkP7+qXZfvy78h1hjF zVA/3uY5IUIYdjySmLylID5bvYnY9Io3PxbJvObCBsmJbKquYKVv7NYSzcgXchMMzFTS BHWqdsualp2jrV829aKQJkejKSyhG9tWrcz/Jxso/XlM4unsGNix9V17rOsUSe3mjxg/ xnJ0ZjNehKase/tBgOfwz7Imi2rvkgb17oXv3LzcM4LblC97Nhk6njEN3wsOw/jX83sX dKvYK0haaQHzeE7xdTuUASi7eLpWYuL4Fwy3nSZyeKmFuDJnP/47lnSZGspbqhlpa+gm +h9w== X-Gm-Message-State: AOAM533IQryg3dvxGX+qWUNMpfWq7wr9JLzq8w1jGZvKEv3U5tcs7ErG 5J3zvXw1EnZ4WJvyP3KMNTfE65bPimtCVIU= X-Received: by 2002:a6b:650a:: with SMTP id z10mr18996iob.169.1637618312506; Mon, 22 Nov 2021 13:58:32 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:edf5:499:2479:42a8]) by smtp.gmail.com with ESMTPSA id o1sm5668802ilj.41.2021.11.22.13.58.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 13:58:32 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Nov 2021 15:58:08 -0600 Message-Id: <20211122215821.9849-3-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211122215821.9849-1-rcombs@rcombs.me> References: <20211122215821.9849-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/16] swscale: add P210/P410/P216/P416 input 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: glMVwJ4r59AS Content-Length: 3498 --- libswscale/input.c | 16 ++++++++++++++++ libswscale/utils.c | 8 ++++++++ libswscale/version.h | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/libswscale/input.c b/libswscale/input.c index 1351ea5bd4..6acc39f89f 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1238,15 +1238,23 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) c->chrToYV12 = read_ayuv64le_UV_c; break; case AV_PIX_FMT_P010LE: + case AV_PIX_FMT_P210LE: + case AV_PIX_FMT_P410LE: c->chrToYV12 = p010LEToUV_c; break; case AV_PIX_FMT_P010BE: + case AV_PIX_FMT_P210BE: + case AV_PIX_FMT_P410BE: c->chrToYV12 = p010BEToUV_c; break; case AV_PIX_FMT_P016LE: + case AV_PIX_FMT_P216LE: + case AV_PIX_FMT_P416LE: c->chrToYV12 = p016LEToUV_c; break; case AV_PIX_FMT_P016BE: + case AV_PIX_FMT_P216BE: + case AV_PIX_FMT_P416BE: c->chrToYV12 = p016BEToUV_c; break; case AV_PIX_FMT_Y210LE: @@ -1519,6 +1527,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GRAY16LE: case AV_PIX_FMT_P016LE: + case AV_PIX_FMT_P216LE: + case AV_PIX_FMT_P416LE: c->lumToYV12 = bswap16Y_c; break; case AV_PIX_FMT_YUVA420P9LE: @@ -1561,6 +1571,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GRAY16BE: case AV_PIX_FMT_P016BE: + case AV_PIX_FMT_P216BE: + case AV_PIX_FMT_P416BE: c->lumToYV12 = bswap16Y_c; break; case AV_PIX_FMT_YUVA420P9BE: @@ -1687,9 +1699,13 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) c->lumToYV12 = bgr64LEToY_c; break; case AV_PIX_FMT_P010LE: + case AV_PIX_FMT_P210LE: + case AV_PIX_FMT_P410LE: c->lumToYV12 = p010LEToY_c; break; case AV_PIX_FMT_P010BE: + case AV_PIX_FMT_P210BE: + case AV_PIX_FMT_P410BE: c->lumToYV12 = p010BEToY_c; break; case AV_PIX_FMT_GRAYF32LE: diff --git a/libswscale/utils.c b/libswscale/utils.c index c726922527..ae92ac9fbc 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -268,6 +268,14 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_Y210LE] = { 1, 0 }, [AV_PIX_FMT_X2RGB10LE] = { 1, 1 }, [AV_PIX_FMT_X2BGR10LE] = { 1, 1 }, + [AV_PIX_FMT_P210BE] = { 1, 0 }, + [AV_PIX_FMT_P210LE] = { 1, 0 }, + [AV_PIX_FMT_P410BE] = { 1, 0 }, + [AV_PIX_FMT_P410LE] = { 1, 0 }, + [AV_PIX_FMT_P216BE] = { 1, 0 }, + [AV_PIX_FMT_P216LE] = { 1, 0 }, + [AV_PIX_FMT_P416BE] = { 1, 0 }, + [AV_PIX_FMT_P416LE] = { 1, 0 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt) diff --git a/libswscale/version.h b/libswscale/version.h index 0d3b7cf363..15ad54319c 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 6 #define LIBSWSCALE_VERSION_MINOR 1 -#define LIBSWSCALE_VERSION_MICRO 100 +#define LIBSWSCALE_VERSION_MICRO 101 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \