From patchwork Thu May 9 02:04:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48678 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9d8e:b0:1af:cdee:28c5 with SMTP id mu14csp154598pzb; Wed, 8 May 2024 19:05:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWq39KvAnGl4zU8jP/Lq2XtIr06vq2hS6tV+PkDJqWbc98hyY2HKGxVOVJUF/NrIyrfGlHEPL+41g1CVmf4oeUT2EAfEn/c5EfUlw== X-Google-Smtp-Source: AGHT+IF4WS/2WUxhF7CibrGeRJ1AtWXfQ8Qt2hrfjBYV2443PxPfYRS4srG74nZZemtm74XYsVVK X-Received: by 2002:a2e:9114:0:b0:2d4:7292:92c0 with SMTP id 38308e7fff4ca-2e446f7c7c0mr23267211fa.20.1715220302625; Wed, 08 May 2024 19:05:02 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5733beace7csi229673a12.95.2024.05.08.19.05.02; Wed, 08 May 2024 19:05:02 -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=@outlook.com header.s=selector1 header.b=FNrmPF9X; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C27F68D646; Thu, 9 May 2024 05:04:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2050.outbound.protection.outlook.com [40.92.91.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46E9068D646 for ; Thu, 9 May 2024 05:04:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LBlN5z00CWF5+QUzisWesTwtRWCWggBSBSG5Zfm8+ZRsYiVmUEl4cQux7wp668IBmbeh1vzH/UbYTROUq5m7dyi0WIQTMAGF12LNxlgPxguoq4QuoUMbm1DoSYZZv1rmdSy1aBk0YvaQrcK5mAAP5rHz8fxNkhETxouXV19RtD/Wl57O5TsQ41krIZdsdl/vfUvy8tkJpYDKtxAGPYqxnWCgirgDUPyNmSJCWdSGtAiGHYrBPZda55jvKL18ptx5LA8qZVRi7kb81jUjxLCaqvGirWCGwC112bOAhFzbbEts+yaV1UrMq23IYt7vG+UCHIUy+Nw1XbbcshqTbKtDcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Dm8CiwuOnEVeuw0lO8RH1vUdPda1VzdwrfFaBCyix9o=; b=IeAHwGiQzFqD7HLxY2Tg/oqDIUQX4mlsnAbtdGaarNBkwKzUvs2N6xDxZXLjCj8GvlqikMYXrKJ/PkOSS7QxHmcH+iwZVWxlkO+cD76oKWq4m3brr0ng81qJEkbEeLn5SVzwlzCs4UJWr+IHGzTQ5vgdHDoEnBOVY5FqRGbJijAVe2Cb0Saw5F1SOdMsHiPd5GWA415htUc71YTjfH5rrjQPtDUpthwW2dUcCzGU3PgV9tfNFFy6Xltv5u7m/S6qiyMGT91Y3qnyyQxTe68HFMKpPRriI4FSFfryTOYZkujOfdYifH/GC5Qbarhgkw9Y20qwlTbdx0N/fpkF+3+EBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dm8CiwuOnEVeuw0lO8RH1vUdPda1VzdwrfFaBCyix9o=; b=FNrmPF9X62cc68OMjB9rSht6eNHc5PBk2SUEESUxiE65Wbv36H/jErNEXLjgJ6Sedfr7vLzvh8r/X/GVtatO0EDvi5ZPyOlDEGMcLnFt/fM5hkTowvdB0d082Lq1lJqLLWOl4yaa2WHEWkp0Nd67RZFdgG8VQS9bh2g5VelKaHtzrTczUCgmiXWxnMBFiJ18AbTdzHUbbbKfCHbUt7001u5sKkNEfY/PYPuVXfb8Y8x4eaNpEgvw9JoJbQetjd1Fl8IXjjM0XeO55SrA1rp4gM8XCl7Ozi6Io61TnUKPZCsPKQ+18SnhrKZMle5r8KTM1yin7ze+s8udCMxoso+rLw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0044.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3db::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.47; Thu, 9 May 2024 02:04:50 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.041; Thu, 9 May 2024 02:04:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 May 2024 04:04:41 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [rHYAsM97Qmd8gKDl1VdiDtMb9AD7uS5jGppjo8AYINc=] X-ClientProxiedBy: ZR0P278CA0067.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240509020443.3715755-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0044:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f650940-a1b2-41b0-8c5a-08dc6fcc68c8 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 7w9WRftI/dFrzcTteuafoq85tAZWpF04qDb2y2XnwCPxfSzAl+PCZ/va4PurH6hjjvN9++9TPwxV3XcFVxAQlK8/KyiOZ7xzEADh0vprydSTpr38qyWX3ns9sjRB5VzXhk653dEPWKkuNMjFKXOt797enNHR8HTYd0aD5puMKfs8cqo47+KUbFB2yB7Rq0qNyMxjDKfusbwiAvRv7G6ipF97FsAROuQVeMPnR+l/UBt8UVW1hbSsLN80D6CQnO1eQx6dsRhp8puourGirdTHTli7SibV068oiO2Rc1mTR71Q1EfqpRXbgVT2E+NKtWz2cqKPrdXatbNHr+0N5ukN0e3Xyp+grlgyq9lzFCo8u3V5DMOENv0hsUmEu0xTsHDwSPstdc8+zeVOETNjEwVok6jB/hLobMFXF2jgEPm+D2n+Nfr6JY37hf5g/7bBui4SGlP4m0pOfaG9WZKv/DArwWGHLg2ir7ts5xv3MXzutx7KLCgcln/N18AdtoQ7CJD7HtIZppvKj0EYo/+qNBvdnoXke/fYfpMZ8AKZp4AGs4l35EYyu8iOLJblk0F9jrHx+EGwo5pQ0R/wRuD/u8LQ7RTvthnieIGA5dVJxXF5UDwwk74SFigHEqNu/Wik3cUI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9u9FKchF5GESAqBfTCj0K0M0BzvgCp+qAf8iQyCGl1gpXMzfaKpZMZW7e0lMwLrucfxhKmHu19+isocbTBx1SOnIjibU+mrhu4Ky2UGW8VZcvnkZkZkLKKhTevZmAIW+di09+hNNovLK/m8zGyEdpikZP5tknvBLVz+MdlbjsqUVF7w6IPdDwrb/pW7X8w75gOVa4t1ks51Gzi8E2Aw3cexYT+K/uRfnJVRnLNbU+qx04nttPiDajJ01DUsFgPnD0DZWcT/ewvejeUHF0LUKgTfrNdmXOcncT0yOpqP/RxApUE/ihpAKh5R90gcp45FrRkK1p0EHKs/fdfNVrYnsSdCX00Jk5gqDHUKojZQtV+6CQCC9iY5GjxirqjZ8LHKIbnRAAc+nW93rxpyj5F70lZ8EsaVCgs9e9tQ9xPMoN+eWBQhvVYJ1YL/u+l12zUa9kDnz2Ppsb5fke0G0EX5PPEO5AkW1Br4g0kyRRACjUBoHUikS8RIFte9Kfvi98dk3+YEI8neZRieIQ5EQI0DWr4V2TZHVC4YZEb3ANkQWR5eHXygoWghLbUD/ZJELq+pFdbM0EWJmmKfhZhBHYFeS2Uehb+SVasFPjBlaf5E7x4Qg98NHsuYv3p1YaZ31mKfgFdCcEMESo7F9Sfz4KAk1JY5C90hM4jlpq7BJ57iIU4tXYdCWlACouD9IkdSp1GmB9Jfi484VTiqmxnvV8WHnTNGG2nzLjGatj9vQmvOBCEwVDa8r1QKr3nHqEcdh6lIs2YI3GAzCcmLdKz+SgX5jAdFvjgSvmaefLVKH2C/m+OeJsRtLcx8dO8j0aiysimhN6eCc6gQszYeds9JSiXWSB+vRCtW5OuxF7bDDIKK/XiIoHHlYm9XVBqhWENbnEVR1mkHGHKAbU8VTshmIn+vP8B7GttwQRMLVbDZytcMX/2Ofpf4iV9iK4/2VB44e8LWFvCzVpyB+VUU39lHrQE/+OyIN49ObdSr3ma7g46q6jI24Mbf0qLKlw4ywE3uyKKlQkUSqfwB8cIVZ7CwMth5SksXasy0wZFNrDCb6k0YiBSkejIiZvXv2D7T86vSYZ5QhUNyYdr/Z8rMq4v6CZL39r6hQjRLoboUtDlzjp8+yLacaiXnXbKxu42bMckQoNkRAY0KjEf0RGHbTp9trRz5w6CLJ+71FkeeoIolwTT9vyo4tjqcC0YlQZO+lQJSufW/eWnqUUUP3NQ9VSE1gLYJqwekNYVWAORip9FRO8Az+ATtOPxXUcw6unpbjTTfe3mLr272i2KDbTU0clqjYpCRTug== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f650940-a1b2-41b0-8c5a-08dc6fcc68c8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2024 02:04:50.3744 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0044 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/codec_desc, jvdec: JV is not intra-only 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pmOuulcqbqJD It reuses the previous frame and does not code unchanged blocks. Signed-off-by: Andreas Rheinhardt --- libavcodec/codec_desc.c | 2 +- libavcodec/jvdec.c | 2 -- tests/ref/fate/jv-demux | 14 +++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 7dba61dc8b..5ae26f5d2b 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1095,7 +1095,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .type = AVMEDIA_TYPE_VIDEO, .name = "jv", .long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV video"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + .props = AV_CODEC_PROP_LOSSY, }, { .id = AV_CODEC_ID_DFA, diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index 13ede9068a..2b7c9f0d29 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -215,8 +215,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *rframe, } if (video_size) { - s->frame->flags |= AV_FRAME_FLAG_KEY; - s->frame->pict_type = AV_PICTURE_TYPE_I; #if FF_API_PALETTE_HAS_CHANGED FF_DISABLE_DEPRECATION_WARNINGS s->frame->palette_has_changed = s->palette_has_changed; diff --git a/tests/ref/fate/jv-demux b/tests/ref/fate/jv-demux index b5d3196cf5..22a9217e23 100644 --- a/tests/ref/fate/jv-demux +++ b/tests/ref/fate/jv-demux @@ -11,13 +11,13 @@ 0, 0, 0, 1, 6, 0x000a0003 1, 0, 0, 131072, 131072, 0x14c664d6 0, 1, 1, 1, 773, 0x11802a51 -0, 2, 2, 1, 12974, 0xc2e466b7 -0, 3, 3, 1, 12200, 0x3c0eeb31 -0, 4, 4, 1, 13339, 0x91d82488 -0, 5, 5, 1, 13940, 0x064c350a -0, 6, 6, 1, 14418, 0x078d2dd2 -0, 7, 7, 1, 14539, 0x145167ed -0, 8, 8, 1, 2552, 0xcf2b1db7, F=0x3 +0, 2, 2, 1, 12974, 0xc2e466b7, F=0x0 +0, 3, 3, 1, 12200, 0x3c0eeb31, F=0x0 +0, 4, 4, 1, 13339, 0x91d82488, F=0x0 +0, 5, 5, 1, 13940, 0x064c350a, F=0x0 +0, 6, 6, 1, 14418, 0x078d2dd2, F=0x0 +0, 7, 7, 1, 14539, 0x145167ed, F=0x0 +0, 8, 8, 1, 2552, 0xcf2b1db7, F=0x2 1, 131072, 131072, 1764, 1764, 0x30be734d 1, 132836, 132836, 1764, 1764, 0xa4c873a7 1, 134600, 134600, 1764, 1764, 0xd5f17443