From patchwork Tue Sep 20 16:42:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38103 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2066728pzh; Tue, 20 Sep 2022 09:43:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4m/sfpFVJ0BXwxJX833Z+++m5X7FS9jmlIEK6Z7txNUsKhwEqlHz+bF0NdaPG9l772YrAq X-Received: by 2002:a05:6402:298e:b0:451:129e:1b35 with SMTP id eq14-20020a056402298e00b00451129e1b35mr20733382edb.79.1663692200376; Tue, 20 Sep 2022 09:43:20 -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 hc18-20020a170907169200b007806f92dfeasi295586ejc.55.2022.09.20.09.43.19; Tue, 20 Sep 2022 09:43:20 -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=KYb9D3dq; 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 E3F8F68B957; Tue, 20 Sep 2022 19:43:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2044.outbound.protection.outlook.com [40.92.59.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9978268B730 for ; Tue, 20 Sep 2022 19:43:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZM3TuRvb8Hbek2SYBjXEsKvwCpONJOiylEJrOFLcOGumLzYgJ6M22vPdSLHHvE2lZ3vmMez/Jey7pamQdAzSPZXexXvN2nVL6M/ixZWkPbkwxxqeaG6vSE9JijkmWMYsZUNXCKIXO3T5tDfMZt69/HNhh5SCX1+Y3qCPzBosxzGIkIT347kBDTCjJX41BD6ExoZyFzysUE8xhMrrKO4j6gIq/KmqHt8hTE0oc0IIGpE+XaVqETWysUFyPqEyYlj2LCg+tWKUficGfXo/9jD4mr4VYd4y/Ra3CLdPp9603lSprpycnNwG3JUiCJ0dzCWqtxJl+VzFSOfkWWMO1JE94A== 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=qwrk1/SXNY2XjqwIjrvwzsAlhY+Hei5iQvCqn29y8PE=; b=bu41ATFP2KtlRgDpvgL6+61flWxBObDDWh9+AbmYcvkulv3kOfaf8mr5XcTXSlHEj1spMidDvoQK2UAPb3e3nUsYRa9+FeoZDv6rFvmJU2OzuYF+ytM3qJFUqGegrACzbwlHqcm9EGUXXeOKlyGZvRvlShly23+IaVT0XuFGQzyHp8TTETGjyET7S40m2g0W9iY1EV/q2bMnbWpbCLN2R8OiEbDvEr0CDXZC2Ebvg1/C7rr7tPeAiNliWddIwaBN1/tPab+4W3fDbHrOpStx9qEI/Gg1R1lM2YV5Qp4lCJjei0xWo7P8d+xzyHqtgmR2llR/9P6z5WIow3J6xP6Kjw== 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=qwrk1/SXNY2XjqwIjrvwzsAlhY+Hei5iQvCqn29y8PE=; b=KYb9D3dqADeW7WfdD0CBulFKpl/FlLMSEDiwS8j6EZX6CpIPmilHRUD8E6MQlikWq+3zS+zaMtOqm+WmFtM2b49XgGobyT11G/qQBYJ6G8WEEo7YrpPEGaoRxJusmSnYxXcSJIUoSZafF1rwm9hCVyUV1TMq+CFk21ZvhhYMiSCHZDejPF18ZVQVcbyzJzpWjyHy5VCvtOwu6jjDwRFJCrpfGMt01Sc6/7B3dv/H/rGmw3wZ/wC4OK7Ui7gv1BPCPBSVnQAxbMN8lvtuwXVRttqJljlURwfdwTLskNjUdx7xXmt8d40AJf5CEx2STn5MIiXz0WVP/1cAvjJ+Rxt5og== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0366.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Tue, 20 Sep 2022 16:43:02 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 16:43:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 18:42:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [/CXm9dMDyuu0lSrQE2E/8NgUbP8lJwdR2uBJWetAmhA=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920164257.3991697-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0366:EE_ X-MS-Office365-Filtering-Correlation-Id: 74037f7a-b5d6-4d4d-1b62-08da9b272ee8 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5rAVFPd+GouzFIhnk/a9Vg1w3OdYi9FvMNuvvM3rX+snCyW4HesiJZqSgt5E5ZIHObkjG9gopQdAqG6khkK6fWaozltvssFmsQ1Y58dFjQ1TaAjbC34Ito1isr37Bc181I5JmPTJtl22NccvEr3lEInvONdfexKEj5xybCmEQ/lv7VeJQNCBqwMNCzxYPLp5NyAMPzFHQQGUeTksaceFS//1wVDKENPu/M10/cjPwCBJlzEndp88jpLOSw9gNaRSYY9KEWIYA854e+k/AdXA4UyJ0dPjytVJL1STiEFZcGBEyhhDrLxWIRgdcdwrZ3eEOfvJmsWULEvoOXUgZ9/U2NzBhDX5LgMCE5FMUgQDjZvuPzsyB08oQA2M2aTb2e5oWQ1LADLNIIw+j5l1JSeIGTS7UQAIZtr0JJhGoefqPdCmmPpbjVtSN1awq4OJq8QhNT5ntM+19wURN5EpDuPVEsrFukp+yo0DBdeGvxRVBK7oEYFKty4TLx1hY6M7jNw//f4DM046ZXHSuBmvT5llj1KA67TdXGLkntunkK6l4kwc9thzYIL//h34jB2Nf08rnRmKL3MrkCBJA0+W6jAtBVrR7u7CcRFt9tDF5QCD9uUOn4BJrNICC/glSZrAtlBbARb3vJDAgMyhdLRXOweaL8CCXUFGPMJBCUkA9HU9b+S7+v++yeVtM72I53Xo4OyOL0Z4+E9sZ4vKmqgpRRuOqh02oBh8Y2baNiOEvP+blkrkSSm8s/51Egw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aAfzmbHP9tXrX/9mjtmwr1jXW0kNzq5aJAm2Z4WAdLbPzDgdDAZbKIrZjOi3QRTcKhVOvVHYmKrvyDlu4AzeKLVpn7haRaVyV/Ebc36nkOcTDkUWyz91SzZ0l39jLb6M6SuELWZZ5cUkp8v9yC+ylosVd1Z0PzVblbiyyQ0k5IU8leMqFHFOLnPcRQy0+TgxdhN5GCfc4lBJx/PZQYFXfKsWCD8gR80mNHIMntq8G8OzMU0dunpfEL7O78rcerkLk1BNFMt1SM87Md6J43q+QgeexsOsv4F25r/FOjd9BwSVmw3lj6GQM/e77MU8cprEDDXOteIxXLr58U1jQjBRV/Totu+6DlcCxPbJtUs7M7JjOXFq6GUOcFLONSUWk1s6Ol2g2NY04yNUjoJnlkfbY2leDKjE5Rm0KDtWJoEfQiODOrPip7gSGaj32ebIz3Bmi3ae7hgGTrOgRvkjb9QVRXdXn4/br0vRCusyFJ2Y0vXcsqkKdA6UG8VnFVjQevSU1sVFaQflHplJMnAPWw0CISwzn6r2Zmtfb7jMmtpfPtS3bRMnIZVNY1d3EtZf5YAC5/lu5a/48vFuLMFx71edaW335XSO775m9g+qHYSQF+aKYHxK9d1dAzfUl7QWE11PmM3WnGhis5zNNOhtFcj10w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Z6mVwupjj4y65CHLQDYAu70RPr2KKoPObHcZehoJr26srFAikaKCMdJEge0G9DXE/YPVdJrWe3rtnCZ9+MFxVDhmvHyZ1xabgSWez+4ag0zJhIrQu7c3zUlDWjoIpTA9Tm78vWluNklBn6p7nDT31kCmz+NfknGZ3V8YGumUcJ/Yi43HUwSIuplnikvD9l+ZYyYyg8eQPC5N411zSWMhFe+b+mNHMBFs2EO+DmPXSG5kMBj4Ch3IkOr4+Y6OAKGqfIK6j0HUQVzkPotvU5JoQ3KI5b3nquXKE3OsAZfCgMxpswwWSS/LDEIKnEGczVAEWTaksG7GKFi0W3O0hjOMf20H130Sy0JFNgpy/15oMWN5AoKrG69F1OaNr1G67GlHMzaD5KeCNJHdEwcpYXXcNwlbKzMiyWMIiwuMyPg/FjN4n3d7vyfZqe/s9OO33lzyqWxrBjXlUdek32E3vQG1yTM7Fkup8C6eiAZVDqzoa4H60WXUnjWxqS82d0D0KkTB6BMjnQAfkjKE4FAzmSaAOG9cSyNMR7ovSsHFLsP4AC02di/fz+yXop5kmRo6TXFzOISlP22s2vr+Vu1sJg71Pmyj2Mk23QLnNiNZlaQv26HfAQYasfxaaHGMSeik12evHN1MYr5uVqTZHrrr01RK3GBTditp0BjdIOy6BrlsligY/TGcf0Fr9loNgfP57laGpUndwiChbTXXcaaCC2tL2Cz5yXFhfwerrPlQD61nuaIWB7ZPMXHyAQm8izKdHGc3m3RBmS2BE/YDoX5O1pk5DVVKUa4V1orYMywFYfNX8D+K/8kYpqPqRejQGxIrKUxOIuGKfQFKIN4l+9tJIw7st6oZ4fqKtbJcS1eSMTKA9pR6fzTPFt+9HVZDBAIeoKNMGw/1vICNOd1JfY5QZSP2+XmIk9FAi99r6r+y4VdVf6/wA+urW9fhuU3kcLnVwHKm6TzW1huV8Wk7W4/+FLsS/OETODF1vpZ9X42xv/gT9LeEEEzvxjjw9gOzg1A7m66T1rI4Qqr6SLm5dW4ppc+L1rWqwJ+AHUut1jNyIHFviKrSJfPD00azUNKX+WTCVIa7HgBov27lFevvohVvij48UydPkgox24X1araFlgupMhNe96txmZVObG5oXOg+oIKIa/Kml2JZlTlXx7as2nwGHOeBVTNG3Y/NJCgQzxdNSoSvZ9CRuSzu3vzbUp8kA7+8zufeQeyvbiMRMcwq9LcIv3Gz0VUQhFbhHumZ12RP1F3Vtf/MaZp4nS2mI41vn4fIc8s3n+q3NZZuCMeiuconiKlzFl56R8Zqor9x+FEKUs= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74037f7a-b5d6-4d4d-1b62-08da9b272ee8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 16:43:02.1214 (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: DU2P250MB0366 Subject: [FFmpeg-devel] [PATCH v2 1/4] avcodec/h264_redundant_pps_bsf: Don't remove PPS 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: afXOXHGXKV3m There is no check for whether these supposedly redundant PPS are actually redundant. One could check via memcmp which would work in practice* (because all content buffers are initially zero-allocated), but this is not portable as compilers may trash padding inside structures as they wish. In case the PPS is not really redundant the output is garbage. This happens with several files from the FATE-suite. E.g. h264-conformance/CVCANLMA2_Sony_C.jsv doesn't decode correctly any more, whereas h264-conformance/CABA3_TOSHIBA_E.264 even fails in ff_cbs_write_packet(), because the inferred value of num_ref_idx_l0_active_minus1 mismatches with the value set in the slice (this happens when num_ref_idx_l0_default_active_minus1 changes in the PPS; the value in the slice header is inferred from the original PPS's num_ref_idx_l0_default_active_minus1). *: Unless slice_group_id is used, i.e. unless slice_group_map_type is six. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_redundant_pps_bsf.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index f8bab1f109..df9a88a705 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -80,26 +80,15 @@ static int h264_redundant_pps_update_fragment(AVBSFContext *bsf, CodedBitstreamFragment *au) { H264RedundantPPSContext *ctx = bsf->priv_data; - int au_has_sps; int err, i; - au_has_sps = 0; for (i = 0; i < au->nb_units; i++) { CodedBitstreamUnit *nal = &au->units[i]; - if (nal->type == H264_NAL_SPS) - au_has_sps = 1; if (nal->type == H264_NAL_PPS) { err = h264_redundant_pps_fixup_pps(ctx, nal); if (err < 0) return err; - if (!au_has_sps) { - av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS " - "at %"PRId64".\n", pkt->pts); - ff_cbs_delete_unit(au, i); - i--; - continue; - } } if (nal->type == H264_NAL_SLICE || nal->type == H264_NAL_IDR_SLICE) { From patchwork Tue Sep 20 16:46:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38104 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2068850pzh; Tue, 20 Sep 2022 09:47:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4pwFzhU5u9G6nq6tvcYRjOtAm1Bkig/Ryo81vdNf5uIEMY8wsrnFrw+4ZNZfF5/9oqPv1a X-Received: by 2002:a05:6402:1704:b0:44e:b523:585d with SMTP id y4-20020a056402170400b0044eb523585dmr20949707edu.22.1663692424149; Tue, 20 Sep 2022 09:47:04 -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 jo5-20020a170906f6c500b0078198611a45si93625ejb.980.2022.09.20.09.47.03; Tue, 20 Sep 2022 09:47:04 -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="FVxf+//a"; 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 0FAC468B8C8; Tue, 20 Sep 2022 19:47:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2072.outbound.protection.outlook.com [40.92.90.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A19E168B8B9 for ; Tue, 20 Sep 2022 19:46:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MtGdfsH9OESwMRnppORBsrkyJwoUtAWAeG4z7yvuobesZLiOrSeDNqMbPJoj8nxoMRDyIkjNPM+hr56xXFK3XJVbOJ5Zchhts1Z61DZz1KPDrGTiMF57GqFt4IaPPvMmlrtlu+pVFdys/PChOSeroGxaxjYc9BBBpQCcq4h0EH92wtKQDkl5Mvii2LAzqRDXezfDNis6uKR8uEGLR1WRlVJxfT+t03RqHy9BdxDHn4ErkuKxrBfInfd6OFdNgb12AV6nF+i0EBHWd1wBV79c7dMg/OGlXk50a1UkQuLqxxzW/SuZyjV9wehadbDE76reXABkzTSiygVeerb2wnZjTQ== 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=3dTF8fJu2IuB54Pew2znq3nyNRrKqpw6RGOr/Nk38kU=; b=AUQlzJYNgXFswmzASUNv7cxAAusOKMFT/HRkIVfFO0F22R5wnMNiIYBhKlFqqof0ON/0Qt/To6FxjkvXT1o3AwCDx1gYd+MXzLeOvTmvFk0mgGkyzt8L/tODcRqGAOeDRr6WR+EKIcirwZGnRJ4azky3hiEW6vyvXDYPjL0Q0BF1IOq6xy7/vkXLHTUdX74v+swfnbOG5b/oIRCnzvqJzf4VKaxH4zSvnl51mteCK7fVHwufhO2p5A09iqFjwuPKIvOqlOXoDOX9q/sOD4GgOjXffhdFkci1XTJu9cgcEciucYnRDmJgxpdIicFaGMzFlhvyDV5+zi4pLcEgIfVgUA== 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=3dTF8fJu2IuB54Pew2znq3nyNRrKqpw6RGOr/Nk38kU=; b=FVxf+//aS7ukDG9ZIRm3eJo2pUcCxffY8Wjt2PKlgwrH0FS/6EbhaDYMKWXSLrYjngmhLKZb5NVmEwTWbyRPZs8WVcAehsUpT2clOa0p0UsHAAmOvr+pqKsyVwM2g+1jdWWV41geSD985uuu01kS1rlLxF8744bNt/gXC2flXqiaQ2uH4K1/8r2FW1h2TR0S2hE3ulU4mMFXfNe1Ac1jmJ7tisrDEEuuEy0NaHrI7DX4h9mwbvnuCswoAMdgQJE0pu5b44UEsESgmTNiIlB3PSrtLHYCW3/0dDxVL2cCNXUdLirIABnGCBQwIDdWk0t9rbJ5/Fx660M59y/NqwG5QQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB4P250MB0981.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Tue, 20 Sep 2022 16:46:51 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 16:46:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 18:46:43 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [E3ql0tpZJgyMonUXOBzd2vU1fZraIfM8kTEUT5MnEng=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920164645.4006844-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB4P250MB0981:EE_ X-MS-Office365-Filtering-Correlation-Id: bc35f558-16e2-4222-5f0b-08da9b27b7ba X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxVFFkeyUnvb4NA2iPYdXOJ1SGOrBwghCroVcGdLNCRev/pDJKiRuwqFzTvLUlUGMbKx4Wkqf/EKD4KFpKX2BcKRWsKccibeGFr+Gtq6tQcxFEd2MUfCSJySUgZ2mfyoi+PrTjn+LdGTf6ychur1eJpGA6o2xe6Sb4Soe5M5STI7kVzFIXBvBE180J/2dDhvoWlZtfwNNPq7ZZJAf3jdPsQT1U5yaMJIbpLMQzwtPk62lTt4B0Dv1bvbcL8ks6CInPInxdFRrA8UxQEay0YML2vxpMGNwP9xQmG+u/ws1LYlpMzlLMWtjhD0ztKJ6GIy94vp1Ueu4Fzs5FiKXV6PYaJc7gzJsNqsWMdHGW4jdZlYJjbRuHOQ8drrM5NaPj+9+YMrPMi689DTxGHWpEplLlWKhPVMe2TzsC/T4DQ/2aKUqkcXglv9PK8MHU1g1Wg4EdKR2HJLnQa1CQHmzE2wn/JjPSTq6y85TPNpHAObaMg57Q7etkq+6jPyBGk+ku11uoBRMCIPb/zTmTt9i4Xh5sSkjXVpf5Rmm8my6pROMxC7VE7RwuPUmJZP6HOjSoKqa6zBjgGSMDUUK26t4Zspbn2O3CLqe7O6j1JPJmbkxWP0HiUelj9JIR1iWLouTuBbzxmMisNfOMn75H6yJdpM18zFWvzJaTDRDo+tlHog/JgW9AnIjs1XtZgAjolDgsOO8eEukhGnZ/MjLdhrAqTM6ks42xUbAIALrI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d2239ZwP2JyAOPQK7F4u50esJoWTNvNCZ9uqyLSXB1YKh2aoIrna7ClXHQhvAPehYBOJ5BEwmjGmJ2ScUK0vZUgRu3OoDqediOl62ufU6eQvgzu5X5dl1v6UKcewT5wTSgKxl3mbRcHIxz6kufBaogIg6ykw6yC0gUoQzpLQZdmokVgtPAX/J3UXHiRtPqlufBvE7xt1HrGPDBcMWnhGWTZtiFcq4GxCqLXQ+FBOfpRKxRjx7VYxdJK7gYxLTupDUwyVlhLgBiKOwW8Li/qTHca3aKjuwhvctT7y0hXkc5zfipQUQ7i9d5VrpIFYJNdimTOrrggEXe9rGFvT05HkH2/9ASMAL8Afyrqluy0rkgbo/BRelOz43u5t+paa3079SglwXJT6Tf2+m5iupnMCwfABvScO24/s8slAs/v5B6h/mUexAqUSELBJLSFxj5+55ZuGs28BP9Ph9fUaioRxelxqAMcMAw0sd/t6deHmEqyZCoh0ALt9ZDvOSPCqWMs4Ao3HICzLppn+gNUwPTKVv7G3t92lnhYwwFMqKgRWEvPp3mGCo0DyktdrgDeN1xZECYxoFnjChKUcFIf6K+0cJeZuEqjVDCIlKeg4gWJ18zjTOXdQaHaNrGziOTTU5VAvi2SP4xDM4042F8kgPZXZ+Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NzYyZ82aG1E+7LN8gw4PWUQ7E6dPsobq3gQwDY/jV1UAJwcshOZ3FrRlbKDS9Dil/WmBtBqAQ5TKYme6fIXGVCZ0VdL1JI//kOmTLvlSNj18JzGNooIOM2f9SjIRiYR2VpwjYPPn4kGHYFLSmp9k7rTN3bo+kmWGW77L0UcqUo89RGSzTmAroJi8AIOUOuCW1FXnldUT3ThsO3Pfu929Se1/SnXkXv84QCWElnCGKrEaE5Z2VCzEGdSGBos3S/28qVy8okBJMOmO32UHltYbQ9o1ydb4Y+rOB8YX3GmBPY+wNkqU36YR5uww+h+ptEJ09QImLMrpLsHKQmZEStzd9UK6HPAh4uVZv3GKDo2w3lbSUWZc2q/y00SFZu4VUDxUWNbmdZlOVwpP90yZ8snlnob/UgpJNX0INeHPXkMGGHhGC7cLeC78AZIEXc98nEYR0IxL0okOkLGsUbJLbVwdjxcx00NfDTOBs8/hceDtr3eeKKlTtvCDBHBfLM/btwirs8D6V2tUaawUQRVB1R8nk+4CUGwpmYLvlh2JrYtDuIPj1Efnww4vFkbe7wzlqGXxNsIpr46lUfzfRGmaIb6U2H1CqXzLPgnQtELnszhIPtOEDZwyUsFodZiRJX9scSdinb7ouv+tuvRS53OtUCbHChLuprRdDD6Gc2P3xZ0yqxyUd59ri3O5oTGEdx0bO+2URSa/AvHU7hDA6UYLp5g5n2089emBkFsDyYhFHCHOr2G7LDqfhf1GuNjhAMuVVbDFZV4Es4Flsz2O9wgKeyW9GWRO1BqaCuB79vt8ezMq+VkAOxr4XoxtYNpVhVkEdYlxIUjwtkUbiMdSvSXdXzBRiJStylASsNHXgakRe5hujZ2MitBoRWvmue94uwJOT/oOYeAxY5KpL0SPi/zd2OZZ/31d93/NPZRuUouj0oDT1JDJyD7ry1ARziavfDgJ27QtWNOSgyTWfIr8xcjh+jB3pY/dQGLMeei0BjE/sixDbffonhp4BSWMHSV6uccKFjAP0t6rDvtiJ7Wpm2NgSJdwvPCi1DpYD/mi9kDl38lasGHNGR+c7PtZtL7XyLYbNeRRnFcNFgAsykCDJGFU1PbYwYJ7tAbeMErNBc0GXP4lEUVHJR3ZpLL2tmQyM6YUBCqPL8wbBWsEaqt7r9N5Cm+GkZmL6x9SlFuTfzqyB9Wl0F1XiEyOe+7eN8zbZyChdRi8nsra8OsjKMqFoZ96uxgXgOTJv6kM6Vhu0zHrU6YPU14xmrBlvFsX8Me1IwF6W0inE4fQwqQuE71tFSgTZnav2vzEDMDY5WfSeXdBvkR3F90= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc35f558-16e2-4222-5f0b-08da9b27b7ba X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 16:46:51.7164 (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: DB4P250MB0981 Subject: [FFmpeg-devel] [PATCH v2 2/4] avcodec/cbs: Only write extradata if there is something to write 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: jIgc00VbpiJF It is e.g. legal for an ISOBMFF avcc to contain zero parameter sets. In this case the annex B that we produce would be empty and therefore useless. This happens e.g. with mov/frag_overlap.mp4 from the FATE-suite. Signed-off-by: Andreas Rheinhardt --- Maybe check for the number of units to write instead? libavcodec/cbs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 07ae658a4c..8d6e3c3442 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -438,6 +438,10 @@ int ff_cbs_write_extradata(CodedBitstreamContext *ctx, return err; av_freep(&par->extradata); + par->extradata_size = 0; + + if (!frag->data_size) + return 0; par->extradata = av_malloc(frag->data_size + AV_INPUT_BUFFER_PADDING_SIZE); From patchwork Tue Sep 20 16:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38105 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2068920pzh; Tue, 20 Sep 2022 09:47:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6N5D/1czbeCu9UaCoyqnFP0INMcVnnGXZsmVs1lGOtdBqE1waMiBjkx2dmNypWFKOI9kHv X-Received: by 2002:a17:907:94ca:b0:77b:542a:4cc4 with SMTP id dn10-20020a17090794ca00b0077b542a4cc4mr16892033ejc.257.1663692432551; Tue, 20 Sep 2022 09:47:12 -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 hp21-20020a1709073e1500b0071200866b78si179994ejc.689.2022.09.20.09.47.12; Tue, 20 Sep 2022 09:47:12 -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=O1bdYoPK; 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 0F85A68BB21; Tue, 20 Sep 2022 19:47:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2072.outbound.protection.outlook.com [40.92.90.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1584168A6B5 for ; Tue, 20 Sep 2022 19:47:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z6Qy53Ts2cspRiH+5WRHHhtqvBLTCmlkh96UD2EdnX2n9x3BcsV454i9QOZwyctiMv8+DW1pZAKKX8mErt9EDS8WfvchpXsAKPj1Yev0lfcqoqnGQH0v3XyNKuwYIWWLtAfxLXq4VFuj00veKq4gPCV4haElrCh7qJybOURTOx2H8yBqlm1t1wld0mM47KZC5cLX8Vbb9mIVsGyNBWvwGVcOFEDYmLS2RVF1IPBgXT0I9TsBocaZDq84EEHpLTZsSlqhpl6sV7Tlsy3ni3rKYXxQBqeljyhEjZ2sgf4OYK7TOizshiruWRXpY9S8/uGvZ42QuRjqpldsXPG7Pit4lg== 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=HqEyjEWl4KiqBHZjzhuqdDYQKlfVpFhBpGu9Hp+HjcA=; b=h4njD0avJ2eHMVLdOwloOBbdKtjC+Worg3j8KDxOyGVnYYmTdB36r/YL2x0zkBbql/Z1uCQIle02XAHIWIA27KkaHCUGHSrOPQLIxAa4ciuFLAKAf34Ulgr/Xkl8T8ZQu9E9FXKs6at+PxjFrGz+OSp6gZpnWz7Q/An/aTJ51hLlqZBC5cZ1o5O3X9PEr2+CMpU6NYgorQXVPOsAt400cmJmp5sEG7c5UNpmjRS56PDU4yxvWJBYxGZxIozr/2O8AbDa1KKVzkuU9ZfTZzA/kc1ImAvYJWuxlFxyujRPSYR9SRK2Zme8Wg7kWMUuBeVfpFwr84pwFZLRI4E4FcOE3w== 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=HqEyjEWl4KiqBHZjzhuqdDYQKlfVpFhBpGu9Hp+HjcA=; b=O1bdYoPKoEgu+ZoIUURgrLZGjaMZrDgWeScRWpd5M2TuS1jA1YVlWj+z4oKItL0XN0W3FiI/pkXa47fbtwapEhA6f2a3opPfniH4aOgLTR+dQzoUjS/zriuoAvd8g+8srmGySwSC/rxPAWjAEDBTIw4aOsk82mMW9rG9lDzGDbJblgssF+nL4Dzrz1VvCRbCJgN4tXjMSAobXyKeLY7kNlDLgCBlBkwNsAKhgiUbSJnBLaXMiSkvRKvH9qlrn3q/Gtd0iNbQhAqnkVK3BiPqWGVzD8lfsZfcLLJCP2k18DWS+fOawb3WSoV60NM91TRlZxhzbTGx1QymLEzLL5WFAg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB4P250MB0981.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Tue, 20 Sep 2022 16:47:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 16:47:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 18:46:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5zVhXR1IFBxUBWmdw4a7RhlAd6fmcRcBMyjGzjTa4xw=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920164645.4006844-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB4P250MB0981:EE_ X-MS-Office365-Filtering-Correlation-Id: 787de595-98d3-4192-0b91-08da9b27bd51 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5rAVFPd+Gouz/nKE8A14cfxJkAgAzDN4ueZHPbIsL4grL1eY0zDoBpFqj63iZCkKmtSRmUQ1vyA63xve5/bd3pQixV3R6Q58Q7g9uli0w2oE+Z1yY0wIV5jBwt3kHQCpnZMVXWa/TkOhGrr5T9TRZzo5093GVWitG0qaWW0PBsNdovrt2hoWSjbqIrfCcEkWjg+a6YUbZ0Dn33gkjyys4cqpWVFc5SXqhCHV1ndw1uY3Avk0wzjv0qMlzyhwHeYnVOClJzZP5wbdDGeFk4I+FiqYcZQxsc7jn8oFLfv6lsvO50sGuFs/SVEzjoFIQ0VLUuK1PPxCtoTH7zUT6FvdQ1JFF6+OvWZd9ExsQ4b4k+cQXgTTkYGxVNaYGk0alJJe9tUUcQcQkXj/yRLDSWb6pFBCpCN7TeIgU6XSBNvwygAJepAp9nuuP92VHWAxXiY5lSS157F4/jF2+a+c9pujzMzkwz/GMi7Pc9uNLVauyGnPaNdCFQWeh6JVHELU1fmG1a8iolxFhGOL4Yi+tNcLOJ7GLaIuP377uBNWVwu5BBnR82eEuGwiyuYwvze0az0WUwegiEklU3p6naecbi+HtvS7YF5qXaJEUfeXuJ4oAYXGJkznC8pFFxU5neWLVvRm6ux7MoJ0bFklx81Fd1/XvNM0hHryI1vOEpGu7TOvQIHCR+03FZ1Y0vS4W1jvJnrqzfxX+F+0BlCXiot2fydG77kX0ACFkhQQSq5PSMUv8pTABJsx0XJDnP4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TDouSJSZYanJ1rZ8MlwXJmf6zNi76cCqMyXP7hHcGrwMl6IrxnVKkg/695GgFDXGeOJtfDQG6LKiwOYE8KgGu6i1/5RFEyeiiRKYf1lmU4VkXFroU621XvoXVTH55w+/o/2b+R0yfoG/adMBGXblnfCdu0cJo8gwZuLKqB9lPe/x+GkKxEu2t6VyvxfTVY53etMQMUuAS5gbvRe1VR0Ca/cripUuoAeoEj9sti8pScaYBmQdTE4xxTfiVxM9EqzaAFFERGMTES68H569/JhhQNbQXLgLnA3xxFmf9W8RtL4R2zS5a0U8bfFK3nDFWlvYYYiBtNu0z2qfBzWp3udDnffQRuSx2HKJ913xfpvhdO6Mi3ptuB9aW/eSyqrA3ItNJTRk3f4LpjCcPnVBgNZLmj+iAau1M2bWH5YGwxkguQvsLQlDqnTUGjQdlHVU3KwnsaCwzZBCuamy7jY4qcGGwiHq9J0gqUE5RsDhSTgnvfO7npny1JJM78rWeQC9XLz/5wFCUSHta2hjbDVU17821fWe9oQ8iIxTUr4CMkpRyLJ1bOfmkQPN0cL27VecwVD/gH+g0pcz7CelYtpqzCDH5yO/sr8o950pNYB0do1tkmDcytJrqlkFS2sKWlR2j1Cy51b/6MAVAEIJrlXSxaSIhg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8Fthh1ML51ED59YjPG7ii/SxoMqnhqNmYex9n8xd1QL3bE7qghZWzOB1TvipsKfIi4YbZm5apcpHjmyW3aV2Y0TgYxzmHWyyC3hDz44FmdsgJSbYMYWDmkdL7s+3fpvpr917nAdnszJq0tt/55hSIX/uP40CzavYSnW6Al79jGI8gJBPQrBnyvMuCcHNXmRdgelmsCvtotYsvQoUZ6gu2f5C3AVLvVrKTU37Gb/xmbk/2FIteN/MHJ7v1Z56ZPSH1iKD7aJXA901JQem6BfL+1qTTxd5/HyIdb+aykygHsfcA4gYaBN8CWgi6zZErHu3zgQjv1AuSSabSf2HXA7Cl/BIJhsoa5Lab+KLFwpJPuBxW99ARS+ZhL0zjzPIYMno5mK0sHEXd4pevIEp6Vcchho82bNdc3hJc2xX7kp1FfxECI+tGIw6/OVsfD64kLwJ27jLc1Sm4dcG1XpxmHqpyV4bLC8Ng23xMDjsvp8UDG1ayg81t1z7nRK6YoNqYe4PgQzbXAzQwm6GATd19qe1BD/7bFBFfsFMaMy6Yt/uRnm2O5mlKqfCfXlLbwZKPXDJZFb++YX5O4Vnn0IdqJyHEMGv2DR4nDvnM/3b0ZxHhAUGr2hFeK85SSoQ747vQIDwW+wRHkgfY+GHJGb9X7Y/ETrxbNr96NuVDMBtb2iKuReCM/vwiJbdguxXp54QKTz86EAZ9+4L/SetHlGelzQIWu95GbYwjjAs0lB/7hqRwSAGdFmvy/GUpCRtJ0sS+aZGyITidQ7FJeAhBcUGEjhnMZy3tMr0COK0qOkWKKO/O2kYdoWv92jrF2ck5ExGPt7yFRLbCkePl7UTCty8wBq8qtttV73poErWcJPTMKOlbbko3oJegfSk2Hec//gWgQJXQG82RRVXLqMLyNVW5SuQj5bj9cnenJqlxG+avy6oZ4+7H2MOrUr6hShxDosJJAYX4hlJ9ONvIDwzwvvYBux9eGscvY7C0CAgAWu5HWRt9M5x/TxiAVSjfP1lEEytnGcEmMc0GQeshi6mh3iB+/5PpAJSOJd9TanGGncL4E5SdeRy0U55AoLJyhb9KnScBtR9n8W+X9L/OUR5wcI1gGvN0utuXpFEXGNp7cEQBTVc5fzbN98c08CW7L+tS2Pev+1G5UEs/7/HDsNWV5l1sB5rCP15xbQYFSuYJePJ+7A4xp/tqLEcyeOXqzAua9xJVA2MOgLXxPM2YJCNRiG9JyDyPxvo+yJCPoC70MCx74zyDhMw11STqwt0Q44wrnK0k12sjwHS40OhBlRubwUWuDAKM8G1ppxLqInyDVnPKRxzK6A= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 787de595-98d3-4192-0b91-08da9b27bd51 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 16:47:01.0768 (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: DB4P250MB0981 Subject: [FFmpeg-devel] [PATCH v2 3/4] avformat/nutdec: Don't shrink packet size manually 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: 1C8YlTx6pzAn It is unnecessary because an av_shrink_packet() a few lines below will set the size; furthermore, it is actually harmful, because av_shrink_packet() does nothing in case the size already matches, so that the packet's padding is not correctly zeroed. Signed-off-by: Andreas Rheinhardt --- I was about to make append_packet_chunked non-static, but then I noticed that it unrefs the packet if the end size is zero (this might cause problems for side-data only packets). libavformat/nutdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 8cc56615ad..1d04f51d8d 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -1127,7 +1127,6 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code) } sm_size = avio_tell(bc) - pkt->pos; size -= sm_size; - pkt->size -= sm_size; } ret = avio_read(bc, pkt->data + nut->header_len[header_idx], size); From patchwork Tue Sep 20 16:46:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38106 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2068995pzh; Tue, 20 Sep 2022 09:47:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM41CEu/fmE/GUGLV2GG2WdfaDPrMlTImD5FrRi0xk53WEp5YF3t33A3iHOcMhm/s5nN/rWz X-Received: by 2002:aa7:c415:0:b0:44d:f432:3e84 with SMTP id j21-20020aa7c415000000b0044df4323e84mr21239618edq.56.1663692441980; Tue, 20 Sep 2022 09:47:21 -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 oz43-20020a1709077dab00b0077f4362c957si209887ejc.702.2022.09.20.09.47.21; Tue, 20 Sep 2022 09:47:21 -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=Fp2KMuqt; 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 AD57568BB3D; Tue, 20 Sep 2022 19:47:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2072.outbound.protection.outlook.com [40.92.90.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3620468BB2A for ; Tue, 20 Sep 2022 19:47:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lwra/a16erlNZFdNlOtmSKSQt9lZdG35xKZAS0ial1paNLo5onQBn2QpfEBL+I6IfTCSYxgjn0kGOAFtUv7jgXICLnjB5VghkYWnsGCfdaEOq9zpt/bLsrwH/OG92XbEhvuQaSX+F3EpzdzzyMnsrcHqI6VA6Lv26m0nU4sjkBHx5Vw3BM4WChivt06M47Gt41D4NnpjqmuKYkhVvzpeWVz1iEHWehV6swhdMFTBKM5UXogTHyoBrApkdsjgWLGT5WikkLlUdcozEv91yH8bQ4DOExhP4HQ/NO6KIgZQ1NaB3g4mT/V4c5VrTXm5tawilocEFZGb2Jyr1uNF9RZp3g== 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=PhKZiv0bT0UknQamlp4xYX9aEW5s+4iPVyAvaibCvs0=; b=LBzn7Q/l/iQR1HL2tAXMB8HKZHILBR9VGbVL9xqxW45v+x6kJYppY0Lx/MRkVZ1dEtIRFuKgdy4KA71d7GKJj+QBN3nJ239C0Kpeo/MJpjXy1wNLspS5MIU/qk4QjfhSjIQmCtFXerx/8jrVe3b6kMYBRlEbvIHLyL2wIx2rG9Ozg+duReGyAvmLyPZNFDdSWy1/Yfj6ZdIcOxqPZ3e1DpK+zQNzEjP91wxhM3BAVY9JAe+9ON1EF3zAbBId/YZfc4sibT5Pa+CDCo8MEFS6sOvkgGCFtYzJDE30S1ftXFBAttaZLYrBbgDSev2c3rwrSAuA5x1qy2IT2VtCw9+EUg== 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=PhKZiv0bT0UknQamlp4xYX9aEW5s+4iPVyAvaibCvs0=; b=Fp2KMuqtMwAFIGSfxdkMzGsB+D7HQvHx0zKFZa7ofI16bUn2c+TWLKqsBNyArJ87CpVJ8/Dt8Pb6uB14Mh2RHDGi1EpxnJtlmf3LKkPyMzgwma94U9M5T/T5/wv0G/N3DuCTr/DVrzFqRAe8JzslgUtLjzKad07VdqkMinkYvcIFnbxLtE7k5zUK3JwXLUZVtFtptDVUAKvbKrPzwWiHvmpT1sXvTcibzKdaXah9n6698E8fVKPfXE/gUUsWJXNM5bOrjpYrNW4VLwdINt2Xb7cfsX4V8ktuhg1WQZdUojeEMfM03TQdig6SlQACWMJ5LvCB+iBlTxoLk403XsMJyQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB4P250MB0981.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Tue, 20 Sep 2022 16:47:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 16:47:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 18:46:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DygWOx5zhGyYUqEcQnEHIiatHHPkvzVh8UPQKwnmIHE=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920164645.4006844-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB4P250MB0981:EE_ X-MS-Office365-Filtering-Correlation-Id: ce9e3545-7f70-473f-ec23-08da9b27be8b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5rAVFPd+Gouz/aTJoXEw8vIQ3XhKvNrEHnqkCwnDWM3r8/YWGEKoskyf3GwH0olk6L14VNBW/dZEjYUxkW8vq0PEs3jRHt5tSq7+gCA11NFD3OjJglNEI3AZriyCNcK3lOIr2h6g/KzLAHOV52LBRU79mSitPEHNehWkp98AqiW6to5hjmHxY0ldo6Feht34k006WqwCAU2+Bry3XWjtDCyQC6WhLSeTVDy45cB8ycq91RJJdI+442o0Fo418wXi4Jb3NtcJZSEHQ2vev3VavprqHbjhsxtIQnEb7c8Xbf4Zw3XsbBn1iOIGyT6FlBA3IZcgB1zcv7MwIkSV6IrDnKJkh7R7Vxhca6OO+Yjd9GxxXX/TGC1iA/UBFD7UsqGGIVYacnGUnJGJ9WuO3JnxVFE/gVMJW4uC5W/Htlo9sHd8VpAiPEt7Vo+coFpBSN2USRFDIfLPN3lpC380LFmNdyXBQVskLMVYt3qwf7faVLZ2lFd5hFjikvEyINyUBCUodXic2+rVxaxXC0cwjD24EET3swIppX/0sIFq0lsRHA6AdclXX+bn15qpDIJZizc75eoDDHuiN44GUSu5tvgLmzaCJTjZWzKp/JdgYvkJcpE1lSsWB+IyUE09lcDG4V5mFZ+icHNFywBGfYvIFYETwamm6n6Kz38egZrO4fSRVxlkfbaays+MHCL0E0cJ7MM8fTCEWK3l9xoxsGG6W86Pi4NthJet2wTZyQaKzd+FCEeMS096XRnBdvc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +vdj7hVSqSAq2WajRM7qob2UpLlHM5VY5VPz0M0bkHfSrAWr0mYLiw+VQFrOj/gpuIcXUWLRWRPUo2lW+OjH6Yr3weAEB9QCbpVS9HhA6qZjEvhW0NX6oSySjtElPdX4EXzuDbvg1Pvlyjt7vkb0JqVTW/w2GN9DBWwm8gUdnhLrf6YDPkM6mx4sebfLUNvDMWAPc5EPkkiwHe22rYXOVck9KQYrsl7vQbjqMLeXm0V9P7v0yxu69c7tktktV5vDrDz3YocTV0GbAvLyMf8YFvPXJZeqEDeAg7uuxuhvEQT2cw0tNE/yUfBlNLw2pCWSB1mku9cJ0psM/BeIPtjHAfAIMdGPIfLVH89fewbajcKQtp5yOPb5I9GqS7sHoManCT/dpLt0ng2JMW9nhxpoKU+BL8nJl3LCEcycyxwIHRgdVNQImK0XKSJCyVVd5U1f6TA+OjmAPrAYniCoVeGmMscPymU4r/BH5OkemOgx3kQQ+8OlK+4GU/sLyqVVoqXjMfUxGflOm1I+hq+fJuCOU63x/WjBVg4e5ioPKlt5eOrylxLj3cgtZHdc0X/5KA4OZHrT+SKOgr8ip9sfFbXY1SVldRy3xJWd1s8OYAvflC6we5EPwaag/SuU0wloNxUtFnCKRNKoIqtjx5eqANtZpw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e8DWjejhqM+mir5CNSsM7AXwOzghYG2E83qayW1n3brP5d90NlhaZp6bA+mgeNqBgcVcUa/Ubx81WoY5LG3ly3G4aDcHMHRHPc/NYtNDUgQjRrMc8btvg+ORUPENdXdDi5vf8GwtFST8WiNR1V9//EgdEyeTaIy04Y+WhDTR/sK3tNfyEJdk05jAJx1UtUOuZJouXtFyubxO75Fo5Jyz/Wc1ftu/pfJvVGr6VLPDCqxJkND0xHxf3Vzm537LxfvfyV3gNSYzPPODRzRnUjPuYXDoEG/rB82Mt4rBNazlmUrIL6J7vD9Nc9Ss26Qr74Uk2JyDrwhUyp3bp+LWnNre1sSKlm0NMXh3YSvbymHwF4jPLpuZPCdAxuAaYdT0GKD2hhj+xwFVYtpGVjzb1FqmQ/t7M7id/OD1sD6d3iJ/pZ6c7JNf1rS0iaW7EoPLxh871fI+ncA0lYDu7UqO3UgOHNuvav892QHookWLoko4PRnC7mHJTW2EJ0/QQ1dz/HKHkakmyzatkJBeWZ+vZzWVHfXFKWbUn7jyAM0mUXKRf7iOSmIzheht74/tBNhpfAVpYCdB+GGuBOKCKFBJec21JIhNsGpEpLdteRQZfIPfDCRIdnsN3Fu1UkYkOIZHK+DqO2zUj/HF3JydVRjnnzfQYLB0weTUTnQuQE1EIEPYxYxmJtMZvNywz9Me0on9RKacfgSOTJlg9eolzl/lxCPmsOPBpYRHDqRmTbgWopX8iqXTjWp9WXkcd9eZ3K46oH+swV8A4a2vcjtmU3rDN3mTQ9MOGqCjz92C1QJp/aK5bK4ahMi6Hk58coCQ5T5I4ZdG1ZJV1Il5gWnh95Ww9KpqqUM68Axkemk/7ON7xroZaebNRYtDaMVSBQhJhI0I3lx59cY7eJWjXiUmJ4PyzeNioD+PVEhuFjoLZOfX60EHG4f7Id/c4q3e1KXMeQHrCWDctFiseyNmODS03/9Gr6tzJJZ3077DV3fyQvZTixU4p4XgHbdsxTgA0AEgnYj5AMv3QcleC1B/MF/nbIylme6RolupGdKsXgyD33KSg7hDfeYrBgwuo0AEPgNBJJwdZf8BkyQYiwxlQeCa6ELfK261deun6c6Y1prb3j+4Stz6rOV7WGf7zOWBTfinih0D7WLm0Pw7qNqD45CuClHkcLIAGB1QotA6ooh4nmuN2qQ9VNb88thZPYPIo0G7qo7PqxoZJHCuwZHbIs2UEVeiq+FkESN196OiJJSkCzlYPQjG5u9tsg0D5hpIxy3GLJb1sQ7hzTaANCMi1kEXZ+uLvX8OfMYXD3mU6Rygp3CUlyf4CE0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce9e3545-7f70-473f-ec23-08da9b27be8b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 16:47:03.1872 (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: DB4P250MB0981 Subject: [FFmpeg-devel] [PATCH v2 4/4] fate/cbs: Add tests for h264_redundant_pps BSF 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: 26maPTHjwsir This also tests writing slice data in the unaligned mode (some of these files use CAVLC) as well as updating side data as well as parsing ISOBMFF avcc extradata. Signed-off-by: Andreas Rheinhardt --- I mistakenly sent only this commit earlier, but it is intended to be applied on top of the other commits. tests/fate/cbs.mak | 43 ++- tests/ref/fate/h264_redundant_pps-annexb | 307 +++++++++++++++++++ tests/ref/fate/h264_redundant_pps-mov | 115 +++++++ tests/ref/fate/h264_redundant_pps-side_data | 21 ++ tests/ref/fate/h264_redundant_pps-side_data2 | 11 + 5 files changed, 494 insertions(+), 3 deletions(-) create mode 100644 tests/ref/fate/h264_redundant_pps-annexb create mode 100644 tests/ref/fate/h264_redundant_pps-mov create mode 100644 tests/ref/fate/h264_redundant_pps-side_data create mode 100644 tests/ref/fate/h264_redundant_pps-side_data2 diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 18efa96a61..a93e58ea9f 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -1,4 +1,4 @@ -# Read/write tests: this uses the codec metadata filter - with no +# Read/write tests: By default, this uses the codec metadata filters - with no # arguments, it decomposes the stream fully and then recomposes it # without making any changes. @@ -66,8 +66,45 @@ $(foreach N,$(FATE_CBS_H264_CONFORMANCE_SAMPLES),$(eval $(call FATE_CBS_TEST,h26 $(foreach N,$(FATE_CBS_H264_SAMPLES),$(eval $(call FATE_CBS_TEST,h264,$(basename $(N)),h264,h264/$(N),h264))) FATE_CBS_H264-$(call FATE_CBS_DEPS, H264, H264, H264, H264, H264) = $(FATE_CBS_h264) -FATE_SAMPLES_AVCONV += $(FATE_CBS_H264-yes) -fate-cbs-h264: $(FATE_CBS_H264-yes) + + +FATE_H264_REDUNDANT_PPS-$(call REMUX, H264, MOV_DEMUXER H264_REDUNDANT_PPS_BSF \ + H264_DECODER H264_PARSER RAWVIDEO_ENCODER) \ + += fate-h264_redundant_pps-mov +fate-h264_redundant_pps-mov: CMD = transcode \ + mov $(TARGET_SAMPLES)/mov/frag_overlap.mp4 h264 \ + "-map 0:v -c copy -bsf h264_redundant_pps" + +# This file has changing pic_init_qp_minus26. +FATE_H264_REDUNDANT_PPS-$(call REMUX, H264, H264_PARSER H264_REDUNDANT_PPS_BSF \ + H264_DECODER RAWVIDEO_ENCODER) \ + += fate-h264_redundant_pps-annexb +fate-h264_redundant_pps-annexb: CMD = transcode \ + h264 $(TARGET_SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264 \ + h264 "-map 0:v -c copy -bsf h264_redundant_pps" + +# These two tests test that new extradata in packet side data is properly +# modified by h264_redundant_pps. nut is used as destination container +# because it can store extradata updates (in its experimental mode); +# setting -syncpoints none is a hack to use nut version 4. +FATE_H264_REDUNDANT_PPS-$(call REMUX, NUT, MOV_DEMUXER H264_REDUNDANT_PPS_BSF H264_DECODER) \ + += fate-h264_redundant_pps-side_data +fate-h264_redundant_pps-side_data: CMD = transcode \ + mov $(TARGET_SAMPLES)/h264/thezerotheorem-cut.mp4 nut \ + "-map 0:v -c copy -bsf h264_redundant_pps -syncpoints none -strict experimental" "-c copy" + +FATE_H264_REDUNDANT_PPS-$(call REMUX, NUT, MOV_DEMUXER H264_REDUNDANT_PPS_BSF \ + H264_DECODER SCALE_FILTER RAWVIDEO_ENCODER) \ + += fate-h264_redundant_pps-side_data2 +fate-h264_redundant_pps-side_data2: CMD = transcode \ + mov $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov nut \ + "-map 0:v -c copy -bsf h264_redundant_pps -syncpoints none -strict experimental" + +fate-h264_redundant_pps: $(FATE_H264_REDUNDANT_PPS-yes) + + +FATE_SAMPLES_FFMPEG += $(FATE_CBS_H264-yes) $(FATE_H264_REDUNDANT_PPS-yes) +fate-cbs-h264: $(FATE_CBS_H264-yes) $(FATE_H264_REDUNDANT_PPS-yes) # H.265 read/write diff --git a/tests/ref/fate/h264_redundant_pps-annexb b/tests/ref/fate/h264_redundant_pps-annexb new file mode 100644 index 0000000000..11d79f8b1f --- /dev/null +++ b/tests/ref/fate/h264_redundant_pps-annexb @@ -0,0 +1,307 @@ +ce0890bd80342f8a3f6703f83b1c4959 *tests/data/fate/h264_redundant_pps-annexb.h264 +163967 tests/data/fate/h264_redundant_pps-annexb.h264 +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 176x144 +#sar 0: 0/1 +0, 0, 0, 1, 38016, 0x72723ce4 +0, 1, 1, 1, 38016, 0x347219d7 +0, 2, 2, 1, 38016, 0x813ff182 +0, 3, 3, 1, 38016, 0x4e69d41a +0, 4, 4, 1, 38016, 0x5e56acb6 +0, 5, 5, 1, 38016, 0xe72197e5 +0, 6, 6, 1, 38016, 0xd035807a +0, 7, 7, 1, 38016, 0x9ee57559 +0, 8, 8, 1, 38016, 0xd0f56f28 +0, 9, 9, 1, 38016, 0xa5097788 +0, 10, 10, 1, 38016, 0xf108978d +0, 11, 11, 1, 38016, 0xf76cb475 +0, 12, 12, 1, 38016, 0x0184cc3a +0, 13, 13, 1, 38016, 0xa4b5dc15 +0, 14, 14, 1, 38016, 0x209cdc42 +0, 15, 15, 1, 38016, 0xd9e69a8c +0, 16, 16, 1, 38016, 0xa2c3a9ba +0, 17, 17, 1, 38016, 0xdf84a52e +0, 18, 18, 1, 38016, 0xfe48a7f0 +0, 19, 19, 1, 38016, 0xb0279a19 +0, 20, 20, 1, 38016, 0xf3b48652 +0, 21, 21, 1, 38016, 0xc12b61b5 +0, 22, 22, 1, 38016, 0x13065a22 +0, 23, 23, 1, 38016, 0x804853d4 +0, 24, 24, 1, 38016, 0x40935736 +0, 25, 25, 1, 38016, 0x1a135ecb +0, 26, 26, 1, 38016, 0x125f6116 +0, 27, 27, 1, 38016, 0x53286da3 +0, 28, 28, 1, 38016, 0xd49287ac +0, 29, 29, 1, 38016, 0xc70a9c2c +0, 30, 30, 1, 38016, 0x0c0c6998 +0, 31, 31, 1, 38016, 0xf37d9141 +0, 32, 32, 1, 38016, 0xd36eafa2 +0, 33, 33, 1, 38016, 0x0d1fc298 +0, 34, 34, 1, 38016, 0xf84ad5d9 +0, 35, 35, 1, 38016, 0xc1e8d93d +0, 36, 36, 1, 38016, 0xe190dabd +0, 37, 37, 1, 38016, 0x9542db28 +0, 38, 38, 1, 38016, 0xa67edc7f +0, 39, 39, 1, 38016, 0x65efdfa7 +0, 40, 40, 1, 38016, 0x7039e6c6 +0, 41, 41, 1, 38016, 0x8307ee87 +0, 42, 42, 1, 38016, 0x1f83ec00 +0, 43, 43, 1, 38016, 0x9e33ea6e +0, 44, 44, 1, 38016, 0xb53ef238 +0, 45, 45, 1, 38016, 0x6d04930c +0, 46, 46, 1, 38016, 0xed90a50e +0, 47, 47, 1, 38016, 0xd98cb4a6 +0, 48, 48, 1, 38016, 0xa7f5bd5e +0, 49, 49, 1, 38016, 0x4df9ca95 +0, 50, 50, 1, 38016, 0xc8e7cb40 +0, 51, 51, 1, 38016, 0x93d9d23c +0, 52, 52, 1, 38016, 0xc07fd34f +0, 53, 53, 1, 38016, 0xf7c5d645 +0, 54, 54, 1, 38016, 0x3c1ddf53 +0, 55, 55, 1, 38016, 0x0bafe394 +0, 56, 56, 1, 38016, 0x9179ec6f +0, 57, 57, 1, 38016, 0x3483efc3 +0, 58, 58, 1, 38016, 0xf7ccf70d +0, 59, 59, 1, 38016, 0x289ef13b +0, 60, 60, 1, 38016, 0xb00c99dc +0, 61, 61, 1, 38016, 0x59409b34 +0, 62, 62, 1, 38016, 0x3fc079a2 +0, 63, 63, 1, 38016, 0x90ad49d9 +0, 64, 64, 1, 38016, 0x8e7751e2 +0, 65, 65, 1, 38016, 0xed20743d +0, 66, 66, 1, 38016, 0x66a1a470 +0, 67, 67, 1, 38016, 0x7a77e252 +0, 68, 68, 1, 38016, 0x6bb427fe +0, 69, 69, 1, 38016, 0x87126360 +0, 70, 70, 1, 38016, 0x330789d0 +0, 71, 71, 1, 38016, 0xc298b987 +0, 72, 72, 1, 38016, 0x4959f143 +0, 73, 73, 1, 38016, 0xa66e3082 +0, 74, 74, 1, 38016, 0xb9f67824 +0, 75, 75, 1, 38016, 0x27fe46a2 +0, 76, 76, 1, 38016, 0xc50c87ed +0, 77, 77, 1, 38016, 0x9523a9f6 +0, 78, 78, 1, 38016, 0xbe28d1d7 +0, 79, 79, 1, 38016, 0x3c0ee964 +0, 80, 80, 1, 38016, 0x65c7f36c +0, 81, 81, 1, 38016, 0xe5030946 +0, 82, 82, 1, 38016, 0x4bbb11fa +0, 83, 83, 1, 38016, 0xeaf209ed +0, 84, 84, 1, 38016, 0x96c80987 +0, 85, 85, 1, 38016, 0x69820c58 +0, 86, 86, 1, 38016, 0x5f951aa7 +0, 87, 87, 1, 38016, 0xfe6122d9 +0, 88, 88, 1, 38016, 0xa202301a +0, 89, 89, 1, 38016, 0xdd2628fb +0, 90, 90, 1, 38016, 0xe081a5ff +0, 91, 91, 1, 38016, 0x5b858e9e +0, 92, 92, 1, 38016, 0x7a368229 +0, 93, 93, 1, 38016, 0x3791829a +0, 94, 94, 1, 38016, 0x9c68723d +0, 95, 95, 1, 38016, 0xef26778e +0, 96, 96, 1, 38016, 0x39a491cf +0, 97, 97, 1, 38016, 0x776ea867 +0, 98, 98, 1, 38016, 0xda9ac03b +0, 99, 99, 1, 38016, 0x653bc9a3 +0, 100, 100, 1, 38016, 0x79e1da19 +0, 101, 101, 1, 38016, 0x3b98c6eb +0, 102, 102, 1, 38016, 0x42cdb846 +0, 103, 103, 1, 38016, 0x7872ada1 +0, 104, 104, 1, 38016, 0xb2f6d2ef +0, 105, 105, 1, 38016, 0x9468b16a +0, 106, 106, 1, 38016, 0xe793c91a +0, 107, 107, 1, 38016, 0x80bde366 +0, 108, 108, 1, 38016, 0xa7250446 +0, 109, 109, 1, 38016, 0x7039280b +0, 110, 110, 1, 38016, 0x1665350c +0, 111, 111, 1, 38016, 0xb5c93f1f +0, 112, 112, 1, 38016, 0xf77a4c44 +0, 113, 113, 1, 38016, 0x3a093143 +0, 114, 114, 1, 38016, 0x1d6b1005 +0, 115, 115, 1, 38016, 0xe1a10c01 +0, 116, 116, 1, 38016, 0x2d4d1d54 +0, 117, 117, 1, 38016, 0x902f2b14 +0, 118, 118, 1, 38016, 0xb26e3e73 +0, 119, 119, 1, 38016, 0xed7a469e +0, 120, 120, 1, 38016, 0xbc663d2a +0, 121, 121, 1, 38016, 0x60a5488e +0, 122, 122, 1, 38016, 0x451b31ca +0, 123, 123, 1, 38016, 0x54311166 +0, 124, 124, 1, 38016, 0x57d9f31e +0, 125, 125, 1, 38016, 0x567dd693 +0, 126, 126, 1, 38016, 0x0e58d88c +0, 127, 127, 1, 38016, 0xa555e124 +0, 128, 128, 1, 38016, 0x94e2f835 +0, 129, 129, 1, 38016, 0xe49e0ec0 +0, 130, 130, 1, 38016, 0x585d188e +0, 131, 131, 1, 38016, 0x696e1a0d +0, 132, 132, 1, 38016, 0xac9014b1 +0, 133, 133, 1, 38016, 0x915413c6 +0, 134, 134, 1, 38016, 0x5fa30be7 +0, 135, 135, 1, 38016, 0x8fbfb69c +0, 136, 136, 1, 38016, 0xcaeabfab +0, 137, 137, 1, 38016, 0xe494bf5c +0, 138, 138, 1, 38016, 0xae03be55 +0, 139, 139, 1, 38016, 0xb734b4d3 +0, 140, 140, 1, 38016, 0xdc6fb56f +0, 141, 141, 1, 38016, 0xfea0a853 +0, 142, 142, 1, 38016, 0xb4919381 +0, 143, 143, 1, 38016, 0x13a792fe +0, 144, 144, 1, 38016, 0xc8829fd8 +0, 145, 145, 1, 38016, 0x2113a62b +0, 146, 146, 1, 38016, 0x171f98d2 +0, 147, 147, 1, 38016, 0x1a6d6d17 +0, 148, 148, 1, 38016, 0xd4ab41c3 +0, 149, 149, 1, 38016, 0xd2df1c80 +0, 150, 150, 1, 38016, 0x14cdbb35 +0, 151, 151, 1, 38016, 0x2b74b829 +0, 152, 152, 1, 38016, 0x6433bd55 +0, 153, 153, 1, 38016, 0xd11dbc28 +0, 154, 154, 1, 38016, 0x4981ad33 +0, 155, 155, 1, 38016, 0xc38bbbad +0, 156, 156, 1, 38016, 0x048de367 +0, 157, 157, 1, 38016, 0x6c9a0c5a +0, 158, 158, 1, 38016, 0x384c4255 +0, 159, 159, 1, 38016, 0x3e9873ba +0, 160, 160, 1, 38016, 0xe4988671 +0, 161, 161, 1, 38016, 0x05b4843c +0, 162, 162, 1, 38016, 0xed0a7e13 +0, 163, 163, 1, 38016, 0x750c6f90 +0, 164, 164, 1, 38016, 0x9d296035 +0, 165, 165, 1, 38016, 0xbaa006bd +0, 166, 166, 1, 38016, 0x8289f8ae +0, 167, 167, 1, 38016, 0x3f3de147 +0, 168, 168, 1, 38016, 0xc5debc49 +0, 169, 169, 1, 38016, 0x1fe9bbfc +0, 170, 170, 1, 38016, 0x006cd4a9 +0, 171, 171, 1, 38016, 0xe551f2b3 +0, 172, 172, 1, 38016, 0xb370140e +0, 173, 173, 1, 38016, 0xc9441c24 +0, 174, 174, 1, 38016, 0x7f5c01c5 +0, 175, 175, 1, 38016, 0x352ad9f6 +0, 176, 176, 1, 38016, 0xe0909a17 +0, 177, 177, 1, 38016, 0x49bf5ea8 +0, 178, 178, 1, 38016, 0x7f1d387b +0, 179, 179, 1, 38016, 0x30812233 +0, 180, 180, 1, 38016, 0xb0bdf16f +0, 181, 181, 1, 38016, 0x5372d0e9 +0, 182, 182, 1, 38016, 0xbf1bc91c +0, 183, 183, 1, 38016, 0xaef5d647 +0, 184, 184, 1, 38016, 0xf007e86c +0, 185, 185, 1, 38016, 0x683bf72b +0, 186, 186, 1, 38016, 0xbb722114 +0, 187, 187, 1, 38016, 0xc5864b63 +0, 188, 188, 1, 38016, 0xfefd5cf4 +0, 189, 189, 1, 38016, 0xa0f263d5 +0, 190, 190, 1, 38016, 0x18401a02 +0, 191, 191, 1, 38016, 0x55cdd97b +0, 192, 192, 1, 38016, 0x5a4ee22d +0, 193, 193, 1, 38016, 0xa60706b3 +0, 194, 194, 1, 38016, 0x644422bb +0, 195, 195, 1, 38016, 0xc22421c9 +0, 196, 196, 1, 38016, 0x1d6b54e4 +0, 197, 197, 1, 38016, 0xc7627820 +0, 198, 198, 1, 38016, 0x0a6ea609 +0, 199, 199, 1, 38016, 0x4315c087 +0, 200, 200, 1, 38016, 0x3164d978 +0, 201, 201, 1, 38016, 0x08e3e7eb +0, 202, 202, 1, 38016, 0x4f04eaed +0, 203, 203, 1, 38016, 0x9f83eb5a +0, 204, 204, 1, 38016, 0xfbbcf0b2 +0, 205, 205, 1, 38016, 0xee1efb8a +0, 206, 206, 1, 38016, 0x87710ba0 +0, 207, 207, 1, 38016, 0xb96b05c1 +0, 208, 208, 1, 38016, 0xd5a4fc50 +0, 209, 209, 1, 38016, 0xad85ea19 +0, 210, 210, 1, 38016, 0x5f606058 +0, 211, 211, 1, 38016, 0xdaf55ad0 +0, 212, 212, 1, 38016, 0xee8564d6 +0, 213, 213, 1, 38016, 0xa1846cad +0, 214, 214, 1, 38016, 0xcd316a62 +0, 215, 215, 1, 38016, 0xdcf5638f +0, 216, 216, 1, 38016, 0xc5e36d1d +0, 217, 217, 1, 38016, 0x958369a6 +0, 218, 218, 1, 38016, 0x05826bf0 +0, 219, 219, 1, 38016, 0x22146914 +0, 220, 220, 1, 38016, 0xf5086111 +0, 221, 221, 1, 38016, 0x88f35468 +0, 222, 222, 1, 38016, 0x3ae94126 +0, 223, 223, 1, 38016, 0xf4473aa8 +0, 224, 224, 1, 38016, 0x430c3da2 +0, 225, 225, 1, 38016, 0xaf95113e +0, 226, 226, 1, 38016, 0xa8a216d6 +0, 227, 227, 1, 38016, 0xad2f328c +0, 228, 228, 1, 38016, 0xea724415 +0, 229, 229, 1, 38016, 0x34016af4 +0, 230, 230, 1, 38016, 0x4829a4cb +0, 231, 231, 1, 38016, 0x4b24bc67 +0, 232, 232, 1, 38016, 0xb523f023 +0, 233, 233, 1, 38016, 0x5c6d2305 +0, 234, 234, 1, 38016, 0x39e63adc +0, 235, 235, 1, 38016, 0xf7c64a7c +0, 236, 236, 1, 38016, 0xd601680a +0, 237, 237, 1, 38016, 0xbbad6a12 +0, 238, 238, 1, 38016, 0xddc1500f +0, 239, 239, 1, 38016, 0x1f1726e6 +0, 240, 240, 1, 38016, 0x48aee68f +0, 241, 241, 1, 38016, 0xc1fbd4f0 +0, 242, 242, 1, 38016, 0x4a89dc83 +0, 243, 243, 1, 38016, 0xa7cd2b02 +0, 244, 244, 1, 38016, 0xf52aa0b8 +0, 245, 245, 1, 38016, 0x1f260626 +0, 246, 246, 1, 38016, 0x80561eac +0, 247, 247, 1, 38016, 0x6687f8ef +0, 248, 248, 1, 38016, 0x986ab08f +0, 249, 249, 1, 38016, 0xb4923773 +0, 250, 250, 1, 38016, 0x5cc2d603 +0, 251, 251, 1, 38016, 0x9e8d93db +0, 252, 252, 1, 38016, 0x33fd8981 +0, 253, 253, 1, 38016, 0xaf45e630 +0, 254, 254, 1, 38016, 0x1227448e +0, 255, 255, 1, 38016, 0x424cccf0 +0, 256, 256, 1, 38016, 0x03b0cb3e +0, 257, 257, 1, 38016, 0x7aad547d +0, 258, 258, 1, 38016, 0xbf8544b2 +0, 259, 259, 1, 38016, 0x54a843ca +0, 260, 260, 1, 38016, 0x759d4dd0 +0, 261, 261, 1, 38016, 0x000162da +0, 262, 262, 1, 38016, 0x87ec74b0 +0, 263, 263, 1, 38016, 0xefee8259 +0, 264, 264, 1, 38016, 0x7b547eea +0, 265, 265, 1, 38016, 0xcae96b73 +0, 266, 266, 1, 38016, 0x730f59c3 +0, 267, 267, 1, 38016, 0x7d9b3e82 +0, 268, 268, 1, 38016, 0x3bb11ef0 +0, 269, 269, 1, 38016, 0x7581fa6b +0, 270, 270, 1, 38016, 0xe594a982 +0, 271, 271, 1, 38016, 0xde3888d6 +0, 272, 272, 1, 38016, 0x0e096d6b +0, 273, 273, 1, 38016, 0x297c20dc +0, 274, 274, 1, 38016, 0x51f7ce7f +0, 275, 275, 1, 38016, 0x23d2c247 +0, 276, 276, 1, 38016, 0x0bdcd0d0 +0, 277, 277, 1, 38016, 0x63cfd4f3 +0, 278, 278, 1, 38016, 0x6d4b01f8 +0, 279, 279, 1, 38016, 0xa50d72f0 +0, 280, 280, 1, 38016, 0xccad0d72 +0, 281, 281, 1, 38016, 0x10c9e33e +0, 282, 282, 1, 38016, 0xba6daf97 +0, 283, 283, 1, 38016, 0xd65074e0 +0, 284, 284, 1, 38016, 0xd36954aa +0, 285, 285, 1, 38016, 0xd9a2a642 +0, 286, 286, 1, 38016, 0xce755f9f +0, 287, 287, 1, 38016, 0x81d29c44 +0, 288, 288, 1, 38016, 0x23b0aef5 +0, 289, 289, 1, 38016, 0xb0ef9efa +0, 290, 290, 1, 38016, 0xf20d4a7a +0, 291, 291, 1, 38016, 0xa0c86899 +0, 292, 292, 1, 38016, 0x1ae4f865 +0, 293, 293, 1, 38016, 0x3a5731c8 +0, 294, 294, 1, 38016, 0x75f17ec5 +0, 295, 295, 1, 38016, 0x8f447aa9 +0, 296, 296, 1, 38016, 0x71615441 +0, 297, 297, 1, 38016, 0x90c13e26 +0, 298, 298, 1, 38016, 0x08d04aaf +0, 299, 299, 1, 38016, 0x14fd7b04 diff --git a/tests/ref/fate/h264_redundant_pps-mov b/tests/ref/fate/h264_redundant_pps-mov new file mode 100644 index 0000000000..7cab0e0b29 --- /dev/null +++ b/tests/ref/fate/h264_redundant_pps-mov @@ -0,0 +1,115 @@ +ac2e8f528dae4e4d610fa3517d2c94fb *tests/data/fate/h264_redundant_pps-mov.h264 +187284 tests/data/fate/h264_redundant_pps-mov.h264 +#tb 0: 1/24 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 640x360 +#sar 0: 1/1 +0, 0, 0, 1, 345600, 0xc40ffa02 +0, 1, 1, 1, 345600, 0x346acaba +0, 2, 2, 1, 345600, 0x26f3de5d +0, 3, 3, 1, 345600, 0xacf384e1 +0, 4, 4, 1, 345600, 0xd7dc8e0b +0, 5, 5, 1, 345600, 0xd7dc8e0b +0, 6, 6, 1, 345600, 0x47f99430 +0, 7, 7, 1, 345600, 0x00259c5a +0, 8, 8, 1, 345600, 0xec659aa2 +0, 9, 9, 1, 345600, 0xec659aa2 +0, 10, 10, 1, 345600, 0x84fef765 +0, 11, 11, 1, 345600, 0xcbeecbe4 +0, 12, 12, 1, 345600, 0x9386982e +0, 13, 13, 1, 345600, 0x682ccf66 +0, 14, 14, 1, 345600, 0x89d10278 +0, 15, 15, 1, 345600, 0x407272a3 +0, 16, 16, 1, 345600, 0x32e0b287 +0, 17, 17, 1, 345600, 0x709ccfe5 +0, 18, 18, 1, 345600, 0x00dcbebc +0, 19, 19, 1, 345600, 0x61b7aa83 +0, 20, 20, 1, 345600, 0x03c7c404 +0, 21, 21, 1, 345600, 0x9b794d4c +0, 22, 22, 1, 345600, 0xb090b3f0 +0, 23, 23, 1, 345600, 0xdb596340 +0, 24, 24, 1, 345600, 0x031f4ba8 +0, 25, 25, 1, 345600, 0xef484d42 +0, 26, 26, 1, 345600, 0xa2814cec +0, 27, 27, 1, 345600, 0x5432765c +0, 28, 28, 1, 345600, 0xef5fd507 +0, 29, 29, 1, 345600, 0x13b2138d +0, 30, 30, 1, 345600, 0x29f24795 +0, 31, 31, 1, 345600, 0x6dce96e1 +0, 32, 32, 1, 345600, 0xb0cdf793 +0, 33, 33, 1, 345600, 0x1b921fb6 +0, 34, 34, 1, 345600, 0xcc446384 +0, 35, 35, 1, 345600, 0x784689e7 +0, 36, 36, 1, 345600, 0xfaf5ac7e +0, 37, 37, 1, 345600, 0x6ce2c6b5 +0, 38, 38, 1, 345600, 0xcb9408ad +0, 39, 39, 1, 345600, 0x4f40082d +0, 40, 40, 1, 345600, 0x9c039eb7 +0, 41, 41, 1, 345600, 0xb271ec7d +0, 42, 42, 1, 345600, 0x31d2af2c +0, 43, 43, 1, 345600, 0xe187adc4 +0, 44, 44, 1, 345600, 0xec28b3cc +0, 45, 45, 1, 345600, 0x5596b34c +0, 46, 46, 1, 345600, 0xb75f475c +0, 47, 47, 1, 345600, 0x888f311c +0, 48, 48, 1, 345600, 0xedab720f +0, 49, 49, 1, 345600, 0xbf75fa40 +0, 50, 50, 1, 345600, 0x13bb37d7 +0, 51, 51, 1, 345600, 0xbc6aeded +0, 52, 52, 1, 345600, 0xf6a6478a +0, 53, 53, 1, 345600, 0x46d4e723 +0, 54, 54, 1, 345600, 0x1263e5e3 +0, 55, 55, 1, 345600, 0x6d3fc449 +0, 56, 56, 1, 345600, 0xc218c2c9 +0, 57, 57, 1, 345600, 0x12ef8744 +0, 58, 58, 1, 345600, 0xc073486e +0, 59, 59, 1, 345600, 0xa3403147 +0, 60, 60, 1, 345600, 0x720a8c5b +0, 61, 61, 1, 345600, 0x7a268f12 +0, 62, 62, 1, 345600, 0xf311d147 +0, 63, 63, 1, 345600, 0x5cc12e78 +0, 64, 64, 1, 345600, 0xf09ecd59 +0, 65, 65, 1, 345600, 0x0e3b46c3 +0, 66, 66, 1, 345600, 0x80786a01 +0, 67, 67, 1, 345600, 0x3edd6931 +0, 68, 68, 1, 345600, 0x14e27291 +0, 69, 69, 1, 345600, 0x12776fd1 +0, 70, 70, 1, 345600, 0xa68cf46d +0, 71, 71, 1, 345600, 0x04f99d27 +0, 72, 72, 1, 345600, 0x76618a97 +0, 73, 73, 1, 345600, 0x7559dcae +0, 74, 74, 1, 345600, 0xc9f4d77f +0, 75, 75, 1, 345600, 0xe76fbad7 +0, 76, 76, 1, 345600, 0x6efca571 +0, 77, 77, 1, 345600, 0x0619a437 +0, 78, 78, 1, 345600, 0x0b48a563 +0, 79, 79, 1, 345600, 0x6ec1bae9 +0, 80, 80, 1, 345600, 0xcce588aa +0, 81, 81, 1, 345600, 0xa003e269 +0, 82, 82, 1, 345600, 0x6507ec83 +0, 83, 83, 1, 345600, 0xa697ec03 +0, 84, 84, 1, 345600, 0xb18a0ddd +0, 85, 85, 1, 345600, 0x96b74d36 +0, 86, 86, 1, 345600, 0x6b6d5ebb +0, 87, 87, 1, 345600, 0x86a082c4 +0, 88, 88, 1, 345600, 0x463ac3e6 +0, 89, 89, 1, 345600, 0xac54e07e +0, 90, 90, 1, 345600, 0xdd32e5ce +0, 91, 91, 1, 345600, 0xc27b9140 +0, 92, 92, 1, 345600, 0x70855f0b +0, 93, 93, 1, 345600, 0xad849d48 +0, 94, 94, 1, 345600, 0x26f6bbba +0, 95, 95, 1, 345600, 0x4c01cc6c +0, 96, 96, 1, 345600, 0x2f6fdac5 +0, 97, 97, 1, 345600, 0xb4d8f6d6 +0, 98, 98, 1, 345600, 0x53aafc9f +0, 99, 99, 1, 345600, 0x53aafc9f +0, 100, 100, 1, 345600, 0xa016f90b +0, 101, 101, 1, 345600, 0x7a68ea8b +0, 102, 102, 1, 345600, 0x74cee980 +0, 103, 103, 1, 345600, 0x16621888 +0, 104, 104, 1, 345600, 0x16621888 +0, 105, 105, 1, 345600, 0x4f6c5227 +0, 106, 106, 1, 345600, 0x5d8343c2 +0, 107, 107, 1, 345600, 0x4ea83d1a diff --git a/tests/ref/fate/h264_redundant_pps-side_data b/tests/ref/fate/h264_redundant_pps-side_data new file mode 100644 index 0000000000..c1c00eebae --- /dev/null +++ b/tests/ref/fate/h264_redundant_pps-side_data @@ -0,0 +1,21 @@ +a35cca13c3f91d1a279bf576b8264d05 *tests/data/fate/h264_redundant_pps-side_data.nut +596153 tests/data/fate/h264_redundant_pps-side_data.nut +#extradata 0: 34, 0x851f08e4 +#tb 0: 1/48000 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 1920x1080 +#sar 0: 0/1 +0, -2002, 0, 2002, 247959, 0xdb721881, S=1, 34 +0, 0, 4004, 2002, 43356, 0xa366eb79, F=0x0 +0, 2002, 2002, 2002, 11423, 0x9c0a86fa, F=0x0 +0, 4004, 8008, 2002, 50801, 0xfbfe860d, F=0x0 +0, 6006, 6006, 2002, 12567, 0x650a5321, F=0x0 +0, 8008, 12012, 2002, 52447, 0x19e106c1, F=0x0 +0, 10010, 10010, 2002, 12575, 0x83c94868, F=0x0 +0, 12012, 16016, 2002, 54028, 0xa8460c03, F=0x0 +0, 14014, 14014, 2002, 13539, 0x0bc96c74, F=0x0 +0, 16016, 20020, 2002, 54489, 0x319c9032, F=0x0 +0, 18018, 18018, 2002, 13705, 0x38a02805, F=0x0 +0, 20020, 22022, 2002, 22313, 0xec81a420, F=0x0 +0, 22022, 24024, 2002, 6335, 0xa524214d diff --git a/tests/ref/fate/h264_redundant_pps-side_data2 b/tests/ref/fate/h264_redundant_pps-side_data2 new file mode 100644 index 0000000000..7484fbeb07 --- /dev/null +++ b/tests/ref/fate/h264_redundant_pps-side_data2 @@ -0,0 +1,11 @@ +dd953f8d95d2927703ce9593a07fe2e7 *tests/data/fate/h264_redundant_pps-side_data2.nut +5162 tests/data/fate/h264_redundant_pps-side_data2.nut +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 256x128 +#sar 0: 1/1 +0, 0, 0, 1, 49152, 0x08745db9 +0, 1, 1, 1, 49152, 0x96bf5e58 +0, 2, 2, 1, 49152, 0x8fe31b6d +0, 3, 3, 1, 49152, 0x0b621cc3