From patchwork Sat Feb 26 23:37:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34533 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1445581nkx; Sat, 26 Feb 2022 15:38:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJx5eZ2pXaZ2mB6fASEMwdw/ioib2m0qxzhPLxUdyq/+urommbf4f7XaSl3BBxAS4S0HdYLd X-Received: by 2002:a17:907:3a13:b0:6cf:1186:1381 with SMTP id fb19-20020a1709073a1300b006cf11861381mr10666140ejc.539.1645918700985; Sat, 26 Feb 2022 15:38:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645918700; cv=none; d=google.com; s=arc-20160816; b=sDOwdje7WD2S0xil3OE7OWSxXlru6RDxW+sRVbMr9aGMwfW4JlhxYPCJnw8tr4ZTBR Pl5z2yXLroGP9WUZlnwX2fWtjxsgkM62W41AiMM8kq+ZQ3vzQftj3zhM8234PYaFV3ZL Pz2YdYcSAOn/lLDnUx1C2vK7NM4Sg1tLf2l4xuI+xPYoyin7ggNjpu50IgRB/qblacI+ 7z8gddcgX+8RdHwowkwYBffLvEeZ5w3bTt8C/ww8I8rbxvJm4LR693D7GADFmHW0P213 2isUyiBazDB+LImy01tfxBgPIc/L4VHRKqSFyM9/oVHN6S8rXl6rYuv5IDQhbmjL5OVC /M6w== 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=Lzx/osyfrnVVFoJk/3Ec5InSiVVovCbHvQq4zVOp7G4=; b=ZnxK7lTbLi8kRUaZom2Lc3aZ/I2Pm/oK2Lkt5xpTjnL6YBwNy2PlRLKlH9vcM1fggk frV+75HTGmr4RbUQHyHa/skze0el3D9TxFYeSGomIGkXOMSMW2L0OMThrtxEPlLiZP9O ZbzN8IgAMhFFvblPlcbq5Kj6iM8OnqYIFmN2pG+gG4XD0zYPw08yMhs9MHglxD8GO0RA fJFjK58ybXmAt8UeFTI3uVYa9GtqUTDXR82E5w/ZnYg1zmZV1CuJ6wWhDOnbQ1a91VPE jfJbPlpSgvdrDpeEpkm+XZKVIe2P1dX4rX7elnuuXkKwIAoICKPSZSfEDxRvCJvD8MNq R6pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l+DzACD4; 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 ka8-20020a170907990800b006b39b376850si3724066ejc.675.2022.02.26.15.38.20; Sat, 26 Feb 2022 15:38:20 -0800 (PST) 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=20210112 header.b=l+DzACD4; 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 1C1C168AF41; Sun, 27 Feb 2022 01:38:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C28CD68AF07 for ; Sun, 27 Feb 2022 01:38:10 +0200 (EET) Received: by mail-oo1-f50.google.com with SMTP id u47-20020a4a9732000000b00316d0257de0so12751289ooi.7 for ; Sat, 26 Feb 2022 15:38:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gga2wR1iVyBduSJomXdggJ+5UZnTZMi3CWKCFjB4c3E=; b=l+DzACD48LD/gPVBnbp2W+N6SE43vbYG3j0Ch0/2QV39MyFKs2ncnZ0yLEo5lQouuw L3W6lBxC6d94PYeSuaze2S4eVhbNdoX3JEoAClmigb7X9RDAAsRePUAPlwWOP7JkcjSu 8MWzVbl8EsQ5falqWBDmrCukpjPvW6OcMzXRVCdw0dlxwnCElRXezw5FOjCFGznwip9B qTRZ9u/DxoJqzIKRUI+soCOAgKW7H6hHTJp1JnrJlpz1vGaThpTl9/lt+tkPS7i4G3SW C+58gY+8sk6lZ7KjX2e+o9jUc1qGe9Vq2RTawSGOxoB3OFzaVTx7NOqPx6jEv2AVOcxp e/fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gga2wR1iVyBduSJomXdggJ+5UZnTZMi3CWKCFjB4c3E=; b=BwEw9BZ6GIbeIKH7VZR+1sERBaF6c8y5nPsrbh6MIk0RKcXGgFF1EbFzAL7zHoxMxE Zt/ViSDMo6jjXFNc7+6qFBon1DGRl9foUUmhS0iL1SIYZtsjRZNOXs+lNXm3tJLm5NCY JwbUgTSH5P4BD60RYX6OnRtbf4fkH87dAqX8FueMBnMPogGBR8QfoGgSjTtCzmHgedNN K2u11kDHyavRGjpUDTpKIqXawsQ2cPy6Da6DNElnWhV0eNEGbKUFOUVftnVkxymPzdzr Bs+zjJxW7Tu1hNN4HH10clCIs+b41IWuVPzMPY1H7vxH6gc1VitIE1N3gpENZAdtF/zg BF7w== X-Gm-Message-State: AOAM531HBAk+n80t8I7cM7A32jjBtAAJ74MarEqbnGpbuhzFELt8AOJx I5X8B7m8oTj9wJK0Tfp8wTdD6ycS4Db/0w== X-Received: by 2002:a05:6870:240f:b0:d7:7db:16f6 with SMTP id n15-20020a056870240f00b000d707db16f6mr1520551oap.17.1645918688664; Sat, 26 Feb 2022 15:38:08 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i28-20020a056808055c00b002d51e377248sm3465738oig.33.2022.02.26.15.38.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 15:38:07 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Feb 2022 20:37:30 -0300 Message-Id: <20220226233730.4315-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/av1: support av1C extradata in ff_av1_parse_seq_header() 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: EwSEwd68CsDR Fixes dash manifest creation for av1 streams with av1C formatted extradata. Signed-off-by: James Almer --- libavformat/av1.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/libavformat/av1.c b/libavformat/av1.c index 1fcfac2356..7771c09b4a 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -335,10 +335,43 @@ int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int { int64_t obu_size; int start_pos, type, temporal_id, spatial_id; + int is_av1c; if (size <= 0) return AVERROR_INVALIDDATA; + is_av1c = !!(buf[0] & 0x80); + if (is_av1c) { + GetBitContext gb; + int ret, version = buf[0] & 0x7F; + + if (version != 1 || size < 4) + return AVERROR_INVALIDDATA; + + ret = init_get_bits8(&gb, buf, 4); + if (ret < 0) + return ret; + + memset(seq, 0, sizeof(*seq)); + + skip_bits(&gb, 8); + seq->profile = get_bits(&gb, 3); + seq->level = get_bits(&gb, 5); + seq->tier = get_bits(&gb, 1); + seq->bitdepth = get_bits(&gb, 1) * 2 + 8; + seq->bitdepth += get_bits(&gb, 1) * 2; + seq->monochrome = get_bits(&gb, 1); + seq->chroma_subsampling_x = get_bits(&gb, 1); + seq->chroma_subsampling_y = get_bits(&gb, 1); + seq->chroma_sample_position = get_bits(&gb, 2); + seq->color_primaries = AVCOL_PRI_UNSPECIFIED; + seq->transfer_characteristics = AVCOL_TRC_UNSPECIFIED; + seq->matrix_coefficients = AVCOL_SPC_UNSPECIFIED; + + size -= 4; + buf += 4; + } + while (size > 0) { int len = parse_obu_header(buf, size, &obu_size, &start_pos, &type, &temporal_id, &spatial_id); @@ -358,7 +391,7 @@ int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int buf += len; } - return AVERROR_INVALIDDATA; + return is_av1c ? 0 : AVERROR_INVALIDDATA; } int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size)