From patchwork Tue Sep 15 13:24:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22421 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 E6ACF44A1E2 for ; Tue, 15 Sep 2020 16:55:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEDC168BB39; Tue, 15 Sep 2020 16:55:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11FD768BBF7 for ; Tue, 15 Sep 2020 16:55:45 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id n133so4222478qkn.11 for ; Tue, 15 Sep 2020 06:55:45 -0700 (PDT) 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=AkLLIYBvedsyIPF3QwkFvkbm4Zr0MLweO+z4mYjz3pM=; b=gN2cvbSh3HOvGuNiNcfrw23C/IObz6Gl4MYVuGOeFuu0xwhREeGBDUBCuvDCdYxCqV 9cdC70xSSr4lOT+TZL733XZ178gfes6b5z+ZB8sh9LkjfB+JB02My80hWCo6YmD2yqtJ zGINTCpB2OFigJCa4yx4YVK6us5ICmAmoqQFtpH+M7JX6ul923MT1VtjunoEJs9azcn+ M0GvHMojjpZElftO6xbU8seagVhMydqm/SFXWtz69WbWYtHrZVHFZXFcQedGaqEpeO3x a1+YmZofjfadxNB31zPrQfBxZZRv7SqiYKknN0DQo0bPpal8cB5y0NXcaE3xzoc0S0qQ LV2w== 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=AkLLIYBvedsyIPF3QwkFvkbm4Zr0MLweO+z4mYjz3pM=; b=jK53edbnUMC8FiduMeOlRpDK7cHc3RpCpzt3TVrkAm1K5/4zwSDkfRTrtrcz9I6B81 4lrvCu2+uTu/PnR8NMnJ93Pm8G32C2Bhjymq6vbS4DNL0Wo8mBiMCK7ws+7LeeOaLqTH cCHDCgCmvwLz56wGd9lMZxMA/Sx6hI975iULTiLgyeHGXGdaqUG0JaXdJ9BxS067aQiX 2TRjcj/USZJZWuJN1LjY/F7KNMK/d8Ad6aByqYsIICO9B6zhIKsYKub56W41vQ+Hn4SE kwbAOEzaxSeu/IgFkf43YnjEb0WjySDEFzN9d1bxRJ9+UBQe3vJKBJBzGJJyHXK/3Ce2 29Lw== X-Gm-Message-State: AOAM530K3/nn4Vcm0uSLI3FmoHHofgiFhlgle8ucwiifoahF4RPkBiBw kApPlYOArPtV1dJDjV8Q2sPfz18zq1gNPw== X-Google-Smtp-Source: ABdhPJyqN/y4zPVdFGOOZVTVQunxN+p1WVQ9ErKN+6HfOQusQ3N5RVGJwtRNGELzITDO98Ai7ith+Q== X-Received: by 2002:aed:3223:: with SMTP id y32mr18584994qtd.341.1600176290258; Tue, 15 Sep 2020 06:24:50 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.67]) by smtp.gmail.com with ESMTPSA id n11sm16593225qkk.105.2020.09.15.06.24.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 06:24:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 10:24:24 -0300 Message-Id: <20200915132425.5527-2-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200915132425.5527-1-jamrial@gmail.com> References: <20200915132425.5527-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libdav1d: parse sequence headers in extradata if available 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" 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 1b9289824f..13673ae2dc 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -191,6 +191,17 @@ static av_cold int libdav1d_init(AVCodecContext *c) if (res < 0) return AVERROR(ENOMEM); + if (c->extradata && c->extradata_size) { + res = dav1d_parse_sequence_header(&seq, c->extradata, c->extradata_size); + if (res < 0) + return AVERROR_INVALIDDATA; + + libdav1d_init_params(c, &seq); + res = ff_set_dimensions(c, seq.max_width, seq.max_height); + if (res < 0) + return res; + } + return 0; }