From patchwork Mon Nov 23 19:10:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 23977 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 11269449287 for ; Mon, 23 Nov 2020 21:16:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F139D68BB81; Mon, 23 Nov 2020 21:16:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6668568BB7E for ; Mon, 23 Nov 2020 21:16:46 +0200 (EET) Received: by mail-ed1-f67.google.com with SMTP id y4so18275225edy.5 for ; Mon, 23 Nov 2020 11:16:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VAiRkJ3ftDw2uFQHVE9fokhj8m+jqN5kQbaX/F9kYMA=; b=HX6W5mFrzIPNQylNyp1gj+L9ZhDZJHkb33+ihgCrDvL19nizzhJF2RVSePJzDbOseV R1Pk7ppaaggahfTwdUcxjqn6n2gkbkhVBlcqqikhBbxV3ivnivesXs4HwjZ4ToQOnieK qklMjKG073snZbuCdN9vKUvxGwveccoLOIa0d8sIdohzLb3zzbBW6dpLb06sDwhMTfoM 11TyNBlKQUnIwuUSfm5K5hAOc3X0tkplqdTxP/EHekYIH8NtsFYZ4npp65h9F5xENX2U NXm7CRkg4WcDhMYXZQ1f8I5gEaqqihJZ3FzNEW20+G0Uz7J7ojtVxTxX/7WCwRj1tu0n EdGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VAiRkJ3ftDw2uFQHVE9fokhj8m+jqN5kQbaX/F9kYMA=; b=ZmQE2JKMSKRFeU+GU0sJhbzQrRhFcG4No0+Vx8C7ajvxg7LlQ74TbwhTev5xnAcHlH ZMkO2rwKSMvDHSHPjZRGPsDeLQSFv5fisNbNZA8LZpzBF0OoFYDyUKuRVeiEM4/G/Yrg BSyDVQewSyG4EKCW04L19aPFnUCbSo/BVRHOpl81v7EQb7wG+yKC5Q46EuC5GNGPc+kD 3mvYP+Qt2dyQrb/sLMkwZjTr2BOe3QdhfEzmFBn8A0Gwg5c7rAjiLA85A7rFE/zE87u7 8zEW3bc1mD+x/6n++CtpyZ8NvtuY3BmjGid9hFI+7owmenGSjRKMQJfDvmaKTHune6Qa irMQ== X-Gm-Message-State: AOAM531HqsqqcU70MRefj2ULhMP3Zp8S46QhLErYlbJaEZNn7y3NwwcD PzEdGgmHgkSeb/gCbXx28EjEJRsHm9il2Q== X-Google-Smtp-Source: ABdhPJzulzGPSaIqwLRs1x0+tApLYILPkdune9aENAp12lFAc3s/I1B1octXqwjui+Jn7K1Tt3df3w== X-Received: by 2002:a2e:975a:: with SMTP id f26mr378345ljj.81.1606158657988; Mon, 23 Nov 2020 11:10:57 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id j19sm1469995lfb.29.2020.11.23.11.10.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:10:57 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 21:10:45 +0200 Message-Id: <20201123191046.28887-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201123191046.28887-1-jeebjp@gmail.com> References: <20201123191046.28887-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/mov: remove special handling of av1c extradata X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Libavcodec can now handle the AV1CodecConfigurationRecord structure as-is when passed as extradata, so the standard behavior of read-box-into-extradata should suffice, just like with AVC and HEVC. --- libavformat/mov.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2b90e31170..2698269b4d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5324,34 +5324,6 @@ static int mov_read_tmcd(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } -static int mov_read_av1c(MOVContext *c, AVIOContext *pb, MOVAtom atom) -{ - AVStream *st; - int ret; - - if (c->fc->nb_streams < 1) - return 0; - st = c->fc->streams[c->fc->nb_streams - 1]; - - if (atom.size < 4) { - av_log(c->fc, AV_LOG_ERROR, "Empty AV1 Codec Configuration Box\n"); - return AVERROR_INVALIDDATA; - } - - /* For now, propagate only the OBUs, if any. Once libavcodec is - updated to handle isobmff style extradata this can be removed. */ - avio_skip(pb, 4); - - if (atom.size == 4) - return 0; - - ret = ff_get_extradata(c->fc, st->codecpar, pb, atom.size - 4); - if (ret < 0) - return ret; - - return 0; -} - static int mov_read_vpcc(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; @@ -6875,7 +6847,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('A','A','L','P'), mov_read_avid }, { MKTAG('A','R','E','S'), mov_read_ares }, { MKTAG('a','v','s','s'), mov_read_avss }, -{ MKTAG('a','v','1','C'), mov_read_av1c }, +{ MKTAG('a','v','1','C'), mov_read_glbl }, { MKTAG('c','h','p','l'), mov_read_chpl }, { MKTAG('c','o','6','4'), mov_read_stco }, { MKTAG('c','o','l','r'), mov_read_colr },