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);