From patchwork Fri Dec 17 00:12:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32677 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1002647iog; Thu, 16 Dec 2021 16:14:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEP4T2Nzr/wlz+XPHBUcLM1z5pwjz1QLvHnzUpajszDf/p5J00XR0G5cdpSZJByG0nPDeV X-Received: by 2002:a17:907:97d5:: with SMTP id js21mr385896ejc.445.1639700042664; Thu, 16 Dec 2021 16:14:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639700042; cv=none; d=google.com; s=arc-20160816; b=VzggOBBEm4kHBqvTAjgJAx6ZYTdfPkfjRnSmMmfH6gdO3UVkMvjql9zdNOzXIwwdtv bStFfMBIIxv/QNjA85YbBo57/RzTAd1XV4RV+YqO7dabZcq4Y/19CKCGsVD9S7nTIzfH Z7JFHJk0WcdHyjQLPmARKXDJC6sbdaGQN10Bi3B81Vtp/fQYKUvOm6V7gAsQhBKwzDU7 csweY6xEJXV6VjtE+8SbJ0ksCH9eL46z+BsIz8E3iRgCV/y5UL53q+FePMOD6vEnWXc4 jKluthoaZsLveDQkLrH/W85zHQDkadj5f85biFI4lShMQio7PhtZY3rcY+FNxcy7NBkD wvug== 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=AOYcac98WJ/WomPnX16PpsUJj+A6nzO9W3Jann6UYAw=; b=k81uH9YaQItl1K15JVoyiwi7DZYO2wD4kXlteCojNV95tM0ZbAR1r/4ghmx8dJs9qu Ac6ARNztn4129P647dCZtRRD5Hxsh0+6hMx8qYb/iz7XNHe/UPuxnbtOV/ka1usX16KE j3iX/5nHkcdum6b75LveuWBy+eu1DZmCsC1Yv8SOPMehlrdN7aDgwGIfzqxOYQUIQVT9 EH5in/l20JydwM33rWyfvYBncsUIXOTALjTNOcrmvn/XkhoCFekh20cxQnDl03lDOadE voLtmajyFt62FRh5NK/7zIaUlxkAVpDo7dSm8rX8kTsbm6VYNcUWgiHQE86xQyVoa7iG L0zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=hb9MZ7o8; 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 dr2si5790255ejc.435.2021.12.16.16.14.02; Thu, 16 Dec 2021 16:14:02 -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=hb9MZ7o8; 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 2F0E568AFF6; Fri, 17 Dec 2021 02:12:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E898468AFF1 for ; Fri, 17 Dec 2021 02:12:27 +0200 (EET) Received: by mail-io1-f44.google.com with SMTP id x10so704421ioj.9 for ; Thu, 16 Dec 2021 16:12:27 -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=U9QONINNgGHhaqg8JxILG5IaAjCQXLJlp4NPOujY2Uk=; b=hb9MZ7o8T/HJhkh0cduAe4P/1mpO1Re/uaUaUgPn83p80WGiLMj+noDG04J6eZEBcJ yc6JhHvGgaNYFRzui3kFDiP1IE0lmjE0G0V6hitwfT3P+TbXc4QlUQC3r3T4i/iHItVf qfQpxTc677In9qQ/1hCt6eeTYdoqKk+EtLH8/9sjZ41EfFNa61c6rKk/STPsF5c931O+ 9TxZlq4BMs73n6Qz32SyTefRzTNXC1394tnKcvHhRLmyZACrXfULxPbqQJjavWk5ZzFM YanQgBBAVwD0zvV73TnbAw+mYKrJ8gTinIE+y6BsNN5FIhUk5SaFa348P7kOlJpRFS8I JywQ== 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=U9QONINNgGHhaqg8JxILG5IaAjCQXLJlp4NPOujY2Uk=; b=RXPLbwUKxIrCyme7sscPoDakzYvmP3sA0RHy3RtVp28Z3W3y/M0dOGaK8+czoXms12 KBEF//nUupvxTxzIPyACXYY8fxlOVX4YdbL5yOMgiAev/VIv1j30x6G7p1iHSFOS9OIy 8qtp4PLlBQY1dbADsAN9B6AOgUEjpB3jcqft5ONrdGXc2UabkBp3HIlh1DJbHQr+GO7B ZuD3lhC4N7ukKPdMStCQfF0gECdry4DWkWNP3QWJKhu0qNvgaAklsQ6G0XBhzCPfGNX3 lcmfP/WXwOo5aT26chToyqORiNPfuJzkPNzUBGUi3/yDlWMGSncIGsXCD8pMwwJA1Cvx pang== X-Gm-Message-State: AOAM532v3TaoEI1v3uNbgkkjLEeQZ6JZWLqGWYTV+eOeU5wOyaBQyYHQ +S4PuHiRogWbHLa2IctyCToPE6vqLfExouY= X-Received: by 2002:a05:6602:1592:: with SMTP id e18mr396418iow.142.1639699946031; Thu, 16 Dec 2021 16:12:26 -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.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Dec 2021 16:12:25 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Dec 2021 18:12:14 -0600 Message-Id: <20211217001215.75135-10-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 09/10] swscale: add P210/P410/P216/P416 output 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: S1FXX7AJOtqZ --- libswscale/output.c | 8 ++++++-- libswscale/utils.c | 16 ++++++++-------- libswscale/version.h | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libswscale/output.c b/libswscale/output.c index 58b10f85a5..4b4b186be9 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2563,14 +2563,18 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, enum AVPixelFormat dstFormat = c->dstFormat; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat); - if (dstFormat == AV_PIX_FMT_P010LE || dstFormat == AV_PIX_FMT_P010BE) { + if (dstFormat == AV_PIX_FMT_P010LE || dstFormat == AV_PIX_FMT_P010BE || + dstFormat == AV_PIX_FMT_P210LE || dstFormat == AV_PIX_FMT_P210BE || + dstFormat == AV_PIX_FMT_P410LE || dstFormat == AV_PIX_FMT_P410BE) { *yuv2plane1 = isBE(dstFormat) ? yuv2p010l1_BE_c : yuv2p010l1_LE_c; *yuv2planeX = isBE(dstFormat) ? yuv2p010lX_BE_c : yuv2p010lX_LE_c; *yuv2nv12cX = yuv2p010cX_c; } else if (is16BPS(dstFormat)) { *yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c; *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c; - if (dstFormat == AV_PIX_FMT_P016LE || dstFormat == AV_PIX_FMT_P016BE) { + if (dstFormat == AV_PIX_FMT_P016LE || dstFormat == AV_PIX_FMT_P016BE || + dstFormat == AV_PIX_FMT_P216LE || dstFormat == AV_PIX_FMT_P216BE || + dstFormat == AV_PIX_FMT_P416LE || dstFormat == AV_PIX_FMT_P416BE) { *yuv2nv12cX = yuv2p016cX_c; } } else if (isNBPS(dstFormat)) { diff --git a/libswscale/utils.c b/libswscale/utils.c index d4a72d3ce1..c80b4f3e35 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -268,14 +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 }, + [AV_PIX_FMT_P210BE] = { 1, 1 }, + [AV_PIX_FMT_P210LE] = { 1, 1 }, + [AV_PIX_FMT_P410BE] = { 1, 1 }, + [AV_PIX_FMT_P410LE] = { 1, 1 }, + [AV_PIX_FMT_P216BE] = { 1, 1 }, + [AV_PIX_FMT_P216LE] = { 1, 1 }, + [AV_PIX_FMT_P416BE] = { 1, 1 }, + [AV_PIX_FMT_P416LE] = { 1, 1 }, }; void ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos, int filterSize, int16_t *filter, int dstW){ diff --git a/libswscale/version.h b/libswscale/version.h index 15ad54319c..8f7b56df9a 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 101 +#define LIBSWSCALE_VERSION_MICRO 102 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \