From patchwork Thu Sep 28 19:54:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 44001 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp106667pzg; Thu, 28 Sep 2023 12:54:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKoq+BDBKsbllmpT5l1y+ZAfHA77ML9KjHy2aCifwdpqljzy38E8mAqClpKdtrJwgQAD0x X-Received: by 2002:a17:907:7622:b0:9ae:699d:8a31 with SMTP id jy2-20020a170907762200b009ae699d8a31mr2103575ejc.33.1695930859629; Thu, 28 Sep 2023 12:54:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695930859; cv=none; d=google.com; s=arc-20160816; b=VkUL2ATpJiMmKpfj6DsgW1kBwe9i+ZhKuqh/Wviz9rfbhjKIHlMI+ZhDBZH729g7Cy prdUlbzrgiJp8CsiAzw9sg0hOtOTA4WewKWgyNkoU58UoAvQbFoMirr/ynce38u9P8PZ 8N2S3NnOA9JaY7WiDWPTZlXII/OSj41Sbnqy9nYi1bEnv1meTw1iOAUaLEGyxE2EpBUD VErDrrRFjs59JR7YAo2DpVWP//oCiEXovTFkVtojxZS46fjyLOXOHcl04Ty25eJNzvqD vRqmi8SzHdhbXAEMjAXHTAydkxtYRrLmsmb087+9KXO+V8yyybyZhCnK+vCrYz9S5Fzj I08Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=rRwLXDhTdLErRdED960OiN1nmKbFy+m4q2RJ4xs10E8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=H57s5YJn9aIZUZYQr9tucPCwVCUVVZekLaxcWFbC4MafEZBIrQIErpFXV41yXrEBTQ eb9DEDPxFV/gThIu/nHkMaNOWf5bkTNZCraNDaFlvkiFBdLhNMBvGNZDP8p0kXn091kW jGwvZYJYjLTwF4B9isF11qFqhbFO1YGZlW6I1w/XyOw+44G9OHjipkCfq7xMZMBTVod5 dlo8rXXX8wEHYUu98p6gWF38nxAz9JP89yT3Y6bAVSIxaUhHktEu2Evz6QbTcG6W7wdg 4JN42ETRaAvIx02sQduV5kAMP8e1wy0lfDEeaLB/IkWndSS5P+y37sa5d1GdaeN3++zn hFVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=PmICxIHP; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i13-20020a1709061ccd00b0099caf50c27fsi14813684ejh.1046.2023.09.28.12.54.18; Thu, 28 Sep 2023 12:54:19 -0700 (PDT) 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=@gmail.com header.s=20230601 header.b=PmICxIHP; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 341E768CBA5; Thu, 28 Sep 2023 22:54:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f177.google.com (mail-vk1-f177.google.com [209.85.221.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C25C568CAB9 for ; Thu, 28 Sep 2023 22:54:08 +0300 (EEST) Received: by mail-vk1-f177.google.com with SMTP id 71dfb90a1353d-49ab6c1869dso1200100e0c.0 for ; Thu, 28 Sep 2023 12:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695930847; x=1696535647; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=QCiV9VWFk1DI5ruGeK9WHYT0kOhSCrRM5SbJvUXVb5Q=; b=PmICxIHPqnQ4QEiFS6aw0Y2D/zvN/4r0venR6gNvCYXWcw1R02JtVYCnIQZW4Y95kU BKdRQSnz8kyTZHuMHsvXiEY/6rky2RPDI0Zn+Er7faOZxsfQ556VcmdR4kDABKjABxVM TN0YDD+2zOCKU5LN1tavCN6XKWDi02yq4M8CRceYLez24Zh7GhScMpyTYsuD9SrdmQbP D1orXhWlM2sOpeE1CFgOl3V21amm8JgN0zyn2JWWL5XGHHagAGtcIZNsAhYThrNZS+LG DwraWgX+jrLPbIR5IyScSJq0OoaXYPUBCnaVqhJ8Qci4ZBbt47XLheDZEmkdQO+eNXGf H7kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695930847; x=1696535647; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QCiV9VWFk1DI5ruGeK9WHYT0kOhSCrRM5SbJvUXVb5Q=; b=dgwh5vqeJKPUs8AGFpe8FxVik9hORoKaCYYQl63pQOnDk7JeHbl9gmlOzBWuwLO9I2 U4oItjmcBT+EobFjm2E+2d2C6/3VIQIgGBLvzbcRiAyCTfliexf1MartY/v++9fl4HcO UxV9ZXDW73NECig+irIwxZiYfMWbP2Xx4eguDtz2wyBdV4W6grfHxmgPcHdjO/Bj3K72 tU0DTBYxEae4AsL2fRE3skROPz5npFAiAPtTEA4IN9e61WjQvpI3LWqDvPLlRzmEra7S fbVLVPA0yrCj0qU0bQfgRkKHMRsKnSv/GWXddqhyIoxSDIoFRGr28+MVsvbpKK75jcm+ fMow== X-Gm-Message-State: AOJu0YxxSmTkU1C49WWhCwPWgP2DETN5Zof8OWc2orrV4lB0xvmacKrF WCsmcP/99+Tvjm/khxfyPO1kkbxFbh9iuIFZN7zaNxW4igs= X-Received: by 2002:a1f:ed41:0:b0:494:63f7:4e7f with SMTP id l62-20020a1fed41000000b0049463f74e7fmr1075551vkh.2.1695930847042; Thu, 28 Sep 2023 12:54:07 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a59:cca8:0:b0:405:b46f:a850 with HTTP; Thu, 28 Sep 2023 12:54:04 -0700 (PDT) From: Paul B Mahol Date: Thu, 28 Sep 2023 21:54:04 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/ffv1*: add more pixel formats support 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: uI2uZE1EadD6 Attached. From 80e70d4cde1734b01809352d280f43a9d4ba79dc Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 28 Sep 2023 21:22:34 +0200 Subject: [PATCH] avcodec/ffv1*: add GBRAP14, GRAY14, YUVA422P12, YUVA444P12 formats support Signed-off-by: Paul B Mahol --- libavcodec/ffv1dec.c | 11 +++++++++++ libavcodec/ffv1enc.c | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 54cf075b8f..cdf72a25dd 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -626,6 +626,9 @@ static int read_header(FFV1Context *f) } else if (f->avctx->bits_per_raw_sample == 12) { f->packed_at_lsb = 1; f->avctx->pix_fmt = AV_PIX_FMT_GRAY12; + } else if (f->avctx->bits_per_raw_sample == 14) { + f->packed_at_lsb = 1; + f->avctx->pix_fmt = AV_PIX_FMT_GRAY14; } else if (f->avctx->bits_per_raw_sample == 16) { f->packed_at_lsb = 1; f->avctx->pix_fmt = AV_PIX_FMT_GRAY16; @@ -690,6 +693,12 @@ static int read_header(FFV1Context *f) case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P12; break; case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P12; break; } + } else if (f->avctx->bits_per_raw_sample == 12 && f->transparency) { + f->packed_at_lsb = 1; + switch(16 * f->chroma_h_shift + f->chroma_v_shift) { + case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUVA444P12; break; + case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUVA422P12; break; + } } else if (f->avctx->bits_per_raw_sample == 14 && !f->transparency) { f->packed_at_lsb = 1; switch(16 * f->chroma_h_shift + f->chroma_v_shift) { @@ -734,6 +743,8 @@ static int read_header(FFV1Context *f) f->avctx->pix_fmt = AV_PIX_FMT_GBRAP12; else if (f->avctx->bits_per_raw_sample == 14 && !f->transparency) f->avctx->pix_fmt = AV_PIX_FMT_GBRP14; + else if (f->avctx->bits_per_raw_sample == 14 && f->transparency) + f->avctx->pix_fmt = AV_PIX_FMT_GBRAP14; else if (f->avctx->bits_per_raw_sample == 16 && !f->transparency) { f->avctx->pix_fmt = AV_PIX_FMT_GBRP16; f->use32bit = 1; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 746f717568..2778c63012 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -585,8 +585,11 @@ static av_cold int encode_init(AVCodecContext *avctx) case AV_PIX_FMT_YUV440P12: case AV_PIX_FMT_YUV420P12: case AV_PIX_FMT_YUV422P12: + case AV_PIX_FMT_YUVA444P12: + case AV_PIX_FMT_YUVA422P12: if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 12; + case AV_PIX_FMT_GRAY14: case AV_PIX_FMT_YUV444P14: case AV_PIX_FMT_YUV420P14: case AV_PIX_FMT_YUV422P14: @@ -667,6 +670,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 12; case AV_PIX_FMT_GBRP14: + case AV_PIX_FMT_GBRAP14: if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 14; case AV_PIX_FMT_GBRP16: @@ -1284,13 +1288,14 @@ const FFCodec ff_ffv1_encoder = { AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA420P16, + AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_GRAY16, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, - AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRAP14, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_YA8, - AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GBRP16, AV_PIX_FMT_RGB48, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_RGBA64, AV_PIX_FMT_GRAY9, -- 2.42.0