From patchwork Sat May 8 12:29:42 2021 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: 27703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1371795iof; Sat, 8 May 2021 05:35:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+s5HvMyPGripZJCtqbX+4CnG7W3qrPzLKqqSS9EiX9GtfIHLddqrGQhO0CHixwun6VT8D X-Received: by 2002:a05:6402:5106:: with SMTP id m6mr17795990edd.212.1620477332258; Sat, 08 May 2021 05:35:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620477332; cv=none; d=google.com; s=arc-20160816; b=xMqM/rGIPe31+rJmDmn54z8TRLilFKdu2FU37vnZYp8GZ77E0RDlPPBbTt9eUEn7+B XUU2STKtLQLalX29AiXKxbEgTG09Q07g7ACRGT6zOaMBgFM8qvuxcmdLhjHct633VKAh LI9/WhHzRKxNQUG+adx62XxKEUZUtvI96hFVI8EQDteR+lUwhe3IVJElIrAQiEpnDDtU qYaSes52zXGJAPfDY5iE1XENsPBRVaAFwqD5qb+ZCeA/9TvyljQd5GknCvWRFMlh5Kac SmG5xArYCmvPMjmVyZGoRvSvTbCa479bKr5yU8tJkkaJejrLMj+0GYu+iAVuONFrfQzm guMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=oaPU/HB0cJ3IY7jZA0cEvLw6EuJ5FxfxbJKPwWxmEm4=; b=lUYtF21ppLIOMRiIEMBe3QCoaeuJNNsqZnzIGd3IYM3eywWuuOh5MLKy++pKTTQyaI tAP65Wt1uP4L7sGt58pGtye3oCAhbZpcJ8gqZUdFUV9/z6hzon6PAzuPmQL3Plr9F+LU RSNiWWymPuDZXC+O3TeI4TAI4vXhuan3L/2ZaHbMAiR8nMTEoQfaU4KB4HDErhAk6UMX TRDpitpNtMiRycDGZGB5jLpyi0ZOGIT0h36cHX687ysJOGnNQwGI/BWkMhwo3Py888b5 rf3rbFnku/5rPa2vzAZngRQtx9q7+kgRxkXB2E9jnMImw/DfVkhQdt5a57AnKjy/QcOi hzOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CHYS64tP; 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 h25si8204515eds.368.2021.05.08.05.35.31; Sat, 08 May 2021 05:35:32 -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=20161025 header.b=CHYS64tP; 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 3B09568094B; Sat, 8 May 2021 15:35:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DC6B6808D7 for ; Sat, 8 May 2021 15:35:22 +0300 (EEST) Received: by mail-ed1-f48.google.com with SMTP id c22so13378225edn.7 for ; Sat, 08 May 2021 05:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y5PsyGROvnBhXsIqrMYNVgvFxo5NxOQAYgKLDJYGi9M=; b=CHYS64tP+Go/e0P+z1DfoBmzGj1RiCCfYrHQi3hBvPgW9q4wSBffAr9l6C1WZ2JYRq iozKdN4+qUlsbZetBWF8BU+Z+8/KP4tqquRSIj77rUH95JFrVKaED95y7VFsD9P1htG5 f0BJZvOZ47Npk+BMJvGsX+xzWavZPHQqa4Ozh3GT/5ZizJCrHqK3IELAp/my5rrBiNhM AP1RyIArS1j0d1+OYr4nyZBbG0ANCslFXzwTuxAOdapIR9xO1FwNX+IrLZaiEW/tYULD PiTPghEzqYPkhUsBShND/cMTLrRtOJYEXYpmQReiTtT9FEOo9YpVsvHPJbD3xUxqWZje H7dw== 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:mime-version :content-transfer-encoding; bh=Y5PsyGROvnBhXsIqrMYNVgvFxo5NxOQAYgKLDJYGi9M=; b=r6moJO5S3I+Mk8Gepgfna7bpmZONuBatenege1q6ehqmz0ZFnk8LRht7tQTvwCjaCQ GRh7scOqQjD33tYw+X3a78XMW0Zu7qlSGy89Lin7guLCZF2+VnkyKe/pkgmTwBTLOjhg W0IHFuA/el9gJAloo/a2dHsNjxLt5nYBWq22bxOK/I4DGwxYcLjdUxyu/VmEK0dxQE3n x6b1iVlEyB93MXhpyoebRXPjZ2N3Fb/aGee9mB+jkoBQ30sdVjOWKoKGPSOfp9drvGBg LTA+BZZ92Pwi2V4yIL0oQNrjBK4rbcaiSPwhh9LKQS28ktAEeWoKO5JEwfUFbzapbtyo JN4g== X-Gm-Message-State: AOAM5332HlOz6wUsnRwwMZ7IxiYii1VbNSOCW6Ht4M10lsa/4ixWzE84 H788hZwB1eMsEt11r/T2kNEM4gICQTY= X-Received: by 2002:a05:651c:293:: with SMTP id b19mr11757782ljo.451.1620476986220; Sat, 08 May 2021 05:29:46 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id g15sm1638376lfj.197.2021.05.08.05.29.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 May 2021 05:29:45 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 15:29:42 +0300 Message-Id: <20210508122943.15579-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: remove special handling of av1c extradata 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: Gmkwe9MfTcg2 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 295a8e2b99..f67bb2441f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5295,34 +5295,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; @@ -6850,7 +6822,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 },