From patchwork Sat Jul 2 13:46:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 36594 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1663580pzh; Sat, 2 Jul 2022 06:43:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ugTD3BpJt3ivT0tXuB21HhVvhkJrT7baOFK8hbc3fB51aOhJTUZFQVt+Q6PhedvsG2Vnay X-Received: by 2002:a05:6402:5109:b0:437:6e67:6fa5 with SMTP id m9-20020a056402510900b004376e676fa5mr25941162edd.149.1656769416571; Sat, 02 Jul 2022 06:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656769416; cv=none; d=google.com; s=arc-20160816; b=AGpA+m8NZbcLflVVwkEMIv/4DmuR6+N0OtkJSEAazFoT3oAKeGYbwpScATHDSyIvSn g+dU8ixhUyt/TUDCN39KHVz0MXgVakmAqdWDLot/n8WKn0+sHcXfkzosJGv5nK8eA7EB fc6ZtMzkN5Jvy3rujaYBUndFXamEl4W31BsUsd76OZNd/Ed3hIBIpJ2bopmucrQ5Qtwc Qs+3P4ewPVvkAl/fYWmd6LFDboT46aGRoNbTF9SvI+YxcMVfAnNiXwW+AMQPabAucOo0 mI5yjLKh9n1KcEz4MiuNkMBjuht6iPwih5zN6OUSP/Z6NjnFY0/xzCTB2YsQjun7iO9s EfZA== 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=/QGtwoi0ouvWepMObdRRuxIOaDQmr7shudSFV5N5QjA=; b=OdCfetulca6we5z/EHZaAo8FL8oWwJ9RFDylq/M7jpo1tWT2tKKqGkXV5BvSOv8s3C orovXLFUrrB9KhAyCxrY62+cSpv4i/vTt2UAcriqt/XOVXMGYCgxnbrYC1QFmhGmgVYR iAnbvFeM77H6DESBnTjZ2y77YnvdcCIegQqN+PXDbhSa6A3w6qVNKeQHzkIjLINodKnK Xuwq0yIAKr/Q7yCSxd6D8WZMbugTr36dLsmIr3nEWBxVTQt/4xxrKKNTDPH1Chxrae7j c/zwdmvloKXns3s1VK+P78lVycnuE2uZfAgfjVjuJWu86YN/mYYna/IEZPypoyjWCjXg SKZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qiWoHYwl; 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 p8-20020a17090635c800b0072629f000a0si26980248ejb.134.2022.07.02.06.43.35; Sat, 02 Jul 2022 06:43:36 -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=20210112 header.b=qiWoHYwl; 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 ECE7A68B668; Sat, 2 Jul 2022 16:43:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4882A68B5E6 for ; Sat, 2 Jul 2022 16:43:25 +0300 (EEST) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-3176b6ed923so46438437b3.11 for ; Sat, 02 Jul 2022 06:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=zlJ6M/C/MyyQ8nP3WgEZz7SVF5bW3hgqUZo7ggwi9wg=; b=qiWoHYwlge0PHN0mtKInkpiJzCq1voTx0sqWTJdqrJRVAyApETlBm6o1z0oltiqC09 Iuh04efSIQOxpN9hAG5vBXRLfHrRj/jRHSjcUsKA0WYmg2hHHgcf0iATomfVMTLTU+zn K/OjJrjsyEwvCdJDg511aEJuCpnzy8PxaxCq09vYvnThhKrxhQjSmKgzLdW4qYAMVUh5 WkVTwSbj2+nSZb+sifWXolyMaUWWQhBzQnuIVZVzKU4o8nsO3DjFuDF7GpKtvZL3AqZo Ak2WVrKkGCa0bn2wnx6oQDjjfS8lwR0NnhTo4nc5ltqEPXSTB8c9m/kg0jjeGlG0jTl5 CAaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=zlJ6M/C/MyyQ8nP3WgEZz7SVF5bW3hgqUZo7ggwi9wg=; b=cKocxubSeVlnmcSG53Rkel4AOSiR8/K2ReLf2F6INfkMtZvSslYhDY2hT6aD7hKbXW 7Ut4yIi0Lj4PEbYC5PGgWyj6Xr/V075Ja1wcfCLHepPS7WlAAgcWi4F33fR7QfYgQDYb iNjyd4C27hEJtMcIkT2kCa2QuJP8DLfvGqO3w/rZtk5m/aXEa0AxCOwcxNG7E5qSoTpM 0a41u+mzDfK/elppNatBCY5WtqGBKrQqxnHL4kXqrmy7Vq8TJCWRjGem91dx2Vy/Lc7e cGvPKCVtsYRww8Yxdx5A1Auw/f3Y8kf8yaoINbpZPAaF+36tnF9aZ398didClkJkrD+1 6RMg== X-Gm-Message-State: AJIora+nplrBqJgsE8SJbcqi76wXDCiyu8kxd/YiZpX875CuYlBh/Jzi /4rK+ha7jI5V5Ta2QZ2n2vr0yDspbTNq4mMQOxo7Uuts X-Received: by 2002:a0d:d708:0:b0:31b:840a:a957 with SMTP id z8-20020a0dd708000000b0031b840aa957mr22508092ywd.177.1656769403881; Sat, 02 Jul 2022 06:43:23 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Sat, 2 Jul 2022 15:46:08 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] fate tests for some images 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: EYpcRc72cOK7 Hello, Patches attached. From f6fa87efb5e8231012af846a60af66c2f187d9c6 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 2 Jul 2022 15:22:42 +0200 Subject: [PATCH 1/3] avcodec/pnmenc: support both endian variants for PFM Signed-off-by: Paul B Mahol --- libavcodec/pnmenc.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 258d919d32..db40f4b8e2 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -88,7 +88,8 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, n = avctx->width * 2; h1 = (h * 3) / 2; break; - case AV_PIX_FMT_GBRPF32: + case AV_PIX_FMT_GBRPF32BE: + case AV_PIX_FMT_GBRPF32LE: if (avctx->codec_id == AV_CODEC_ID_PFM) { c = 'F'; n = avctx->width * 4; @@ -97,7 +98,8 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, n = avctx->width * 2; } break; - case AV_PIX_FMT_GRAYF32: + case AV_PIX_FMT_GRAYF32BE: + case AV_PIX_FMT_GRAYF32LE: if (avctx->codec_id == AV_CODEC_ID_PFM) { c = 'f'; n = avctx->width * 4; @@ -112,22 +114,27 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, snprintf(bytestream, bytestream_end - bytestream, "P%c\n%d %d\n", c, avctx->width, h1); bytestream += strlen(bytestream); - if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32 || - avctx->pix_fmt == AV_PIX_FMT_GRAYF32) + if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32LE || + avctx->pix_fmt == AV_PIX_FMT_GRAYF32LE || + avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE || + avctx->pix_fmt == AV_PIX_FMT_GRAYF32BE) snprintf(bytestream, bytestream_end - bytestream, "%f\n", (avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE || avctx->pix_fmt == AV_PIX_FMT_GRAYF32BE) ? 1.f: -1.f); bytestream += strlen(bytestream); if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE && - avctx->pix_fmt != AV_PIX_FMT_GBRPF32 && - avctx->pix_fmt != AV_PIX_FMT_GRAYF32) { + avctx->pix_fmt != AV_PIX_FMT_GBRPF32LE && + avctx->pix_fmt != AV_PIX_FMT_GRAYF32LE && + avctx->pix_fmt != AV_PIX_FMT_GBRPF32BE && + avctx->pix_fmt != AV_PIX_FMT_GRAYF32BE) { int maxdepth = (1 << av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth) - 1; snprintf(bytestream, bytestream_end - bytestream, "%d\n", maxdepth); bytestream += strlen(bytestream); } - if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32 && c == 'F') { + if ((avctx->pix_fmt == AV_PIX_FMT_GBRPF32LE || + avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE) && c == 'F') { float *r = (float *)p->data[2]; float *g = (float *)p->data[0]; float *b = (float *)p->data[1]; @@ -144,7 +151,8 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, g += p->linesize[0] / 4; b += p->linesize[1] / 4; } - } else if (avctx->pix_fmt == AV_PIX_FMT_GRAYF32 && c == 'f') { + } else if ((avctx->pix_fmt == AV_PIX_FMT_GRAYF32LE || + avctx->pix_fmt == AV_PIX_FMT_GRAYF32BE) && c == 'f') { const float *g = (const float *)p->data[0]; for (int i = 0; i < avctx->height; i++) { @@ -280,8 +288,10 @@ const FFCodec ff_pfm_encoder = { .p.id = AV_CODEC_ID_PFM, .p.capabilities = AV_CODEC_CAP_DR1, FF_CODEC_ENCODE_CB(pnm_encode_frame), - .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GBRPF32, - AV_PIX_FMT_GRAYF32, + .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GBRPF32LE, + AV_PIX_FMT_GRAYF32LE, + AV_PIX_FMT_GBRPF32BE, + AV_PIX_FMT_GRAYF32BE, AV_PIX_FMT_NONE }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; -- 2.36.1