From patchwork Fri Jul 9 14:53:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28879 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp823731ios; Fri, 9 Jul 2021 08:24:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqQlUmiTr01fUXyPBsVhFjXDOSU0ABdLivJ2bNIdWi6DA1mziFVRCMDK4Pkqxx4Yw4ZFqz X-Received: by 2002:a17:906:dc91:: with SMTP id cs17mr38411455ejc.389.1625844247403; Fri, 09 Jul 2021 08:24:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625844247; cv=none; d=google.com; s=arc-20160816; b=SisbSO7lkSnR28HxrbHR79W7DN+OjTIfPTZAzUCH01ylnjJr+D91tq8COs8EfGTq3o cImvj54+TvGIXlCsUAT+WL0cFvMjNvydS2CNf48noCIEAx9wGIHNjxxkB6dj1xvTbxcs lJZFIKBhGq52dgOuJGv7/VZ8twrPgmswA9geNL6ekVw1hSMzvuxbHkV2wx1+5N4QlrHb xWMoSPakw6lGpWFUaWKoO9Gbtzw8Y9y6nt2naxaYwulgoEmzEpgCumE93kAmoM2VQPDe wG0UO/1I7fddsNvlf0Ghq3h21AYxGnV3o6GLJdbHOU8CQxtDmc1TTyVF7/HFxbDzPd6h 3Ryg== 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=aj+mhLGkV0i8qPsMLB8qDmf30ovVqqSfGqw/3eKiqT4=; b=nKTAm019onRfhujNILwrtB882xMmWRVHTg3oBvwU5vV4cQzshhDIpSk7zFU1E8H2aB mgflOGd+GeQ0dJIcEV3speeOxu3YMkj257m5M9dveIjJy3zTsaHZCDmvZSvYtC7UaJWB CM9mpMRsZt8kl6Nz37xKhZS35yh6xXiHHzBm3oI5Xe0yAk0ecb4yMyuOVd1lFZM9ecnC APq9NSBTmaKkH6KsaqthR92n0NkcEB2bw+wmGFePC/k10xzgLAInOQQ+ecAcLkBJ+dmi aCQgJKWMD9egt3YQO1nIYDfh7+ieDM29iU5QfzhqN9Wtl0i4hjFP7HDrMeolfb+Jd6yi niHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PcLa0WeO; 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 c7si7132003ejc.373.2021.07.09.08.24.06; Fri, 09 Jul 2021 08:24:07 -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=PcLa0WeO; 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 2C08068A756; Fri, 9 Jul 2021 18:24:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C1A768A349 for ; Fri, 9 Jul 2021 18:23:57 +0300 (EEST) Received: by mail-oi1-f182.google.com with SMTP id z3so11749334oib.9 for ; Fri, 09 Jul 2021 08:23:57 -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=yTd12soi61oKTXfKEQ55svQGZPCtvUWZPmTcdc4sPt4=; b=PcLa0WeOrwHjHOw22EQ6J3vEFT1HqI8Z7JNazCE5iqkpox4i/qJiFJB341bDLGQkJI yg+8CiQf8wqUl+rqDT4RFi/5ki2zwsRYx2WrKID5+aVc1w36Jem7hlAWNm3eog63YgD+ t7gKmeKguy68WUluS+kJAuwGMJJaVhY2q/0U+UY0Mo9JYBc+1i750Xq74fnEW47w+Ls2 tlZHPhau/PyC2yrJ7+0ONPBEx6ePK+DhMxdC/+n9NWQg1VsbXk3/ZyyW/zl97h+9SLXt gHkXrANg+yomz0M/hzZ9e4+Kt2/N0Wk/WwUcqg61lz9AMhXel/e9Q5eAzk/62StFdLrT tYuA== 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=yTd12soi61oKTXfKEQ55svQGZPCtvUWZPmTcdc4sPt4=; b=RnwcC3Vai4J+CascYyVL3CNzIZeD+Pit1I+cq+Zko/bjtvWE1kLa7NGjUZ5HusMvwx FVmf69+vZAyCsNJhzG7Jt0VI/r7vrfxhCH00jzhfiIOzGXmpJCABuRG2zcluqQD+Lf0c KIS5q8e6wSXU+ZgJiVgU6Q1QlUm7hss9JQofG68p5yX6Ztfe4RwZJPEGqGcIUJ2NYUcQ CGIpRQBAQxp/CyNKEuZCZtWc6PWh0v6amWWLWokwYfndkQ9cid8LWP63bTDrQkrY1AGX nfy2y2COJGK18XZzJy5yYAmvRHJk0zRWJISSAZxlmjpud4NP2p5jTW406Ng0i4WdqCwY UA0w== X-Gm-Message-State: AOAM531WCBVsFvnGW3An5V/x0U4SNJRS0Sj2tYf14wr2wg2lWH2wh5Nw w0RNdc6SS2Ej9YdaG2LIs/XjwzrFXzQ= X-Received: by 2002:a17:90a:19c2:: with SMTP id 2mr22592360pjj.233.1625842406072; Fri, 09 Jul 2021 07:53:26 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.217]) by smtp.gmail.com with ESMTPSA id l2sm6686522pfc.157.2021.07.09.07.53.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 07:53:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Jul 2021 11:53:01 -0300 Message-Id: <20210709145301.3715-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: parse sequence headers in extradata if available 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: 8e6euqEAD8Db This allows the decoder context to be initialized with all stream parameters before a packet is parsed. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index c39df418d5..8132ff1593 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -158,6 +158,47 @@ static void libdav1d_init_params(AVCodecContext *c, const Dav1dSequenceHeader *s } } +static av_cold int libdav1d_parse_extradata(AVCodecContext *c) +{ + Dav1dSequenceHeader seq; + size_t offset = 0; + int res, explode = !!(c->err_recognition & AV_EF_EXPLODE); + + if (!c->extradata || c->extradata_size <= 0) + return 0; + + if (c->extradata[0] & 0x80) { + int version = c->extradata[0] & 0x7F; + + if (version != 1 || c->extradata_size < 4) { + av_log(c, explode ? AV_LOG_ERROR : AV_LOG_INFO, + "Error decoding extradata\n"); + return explode ? AVERROR_INVALIDDATA : 0; + } + + // Do nothing if there are no configOBUs to parse + if (c->extradata_size == 4) + return 0; + + offset = 4; + } + + res = dav1d_parse_sequence_header(&seq, c->extradata + offset, + c->extradata_size - offset); + if (res < 0) { + av_log(c, explode ? AV_LOG_ERROR : AV_LOG_INFO, + "Error decoding extradata\n"); + return explode ? AVERROR_INVALIDDATA : 0; + } + + libdav1d_init_params(c, &seq); + res = ff_set_dimensions(c, seq.max_width, seq.max_height); + if (res < 0) + return res; + + return 0; +} + static av_cold int libdav1d_init(AVCodecContext *c) { Libdav1dContext *dav1d = c->priv_data; @@ -192,6 +233,10 @@ static av_cold int libdav1d_init(AVCodecContext *c) av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", s.n_frame_threads, s.n_tile_threads); + res = libdav1d_parse_extradata(c); + if (res < 0) + return res; + res = dav1d_open(&dav1d->c, &s); if (res < 0) return AVERROR(ENOMEM);