From patchwork Fri Sep 25 14:43:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22581 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 577C744B0B7 for ; Fri, 25 Sep 2020 17:43:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4190F68B5CB; Fri, 25 Sep 2020 17:43:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC4E268AA33 for ; Fri, 25 Sep 2020 17:43:42 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id d20so2986063qka.5 for ; Fri, 25 Sep 2020 07:43:42 -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=7w84hQZb3a2qIp2UGWeUaIOfottrVhjpeJBuh9aFqNY=; b=GLp9G3i0/dmyxOg6xeZ4Z6ibRWSD46WMy4gb7lrWdkGgcJ3cdvqzzvVnBP2Vh0tov4 izvxtV5BvOK2v+hWb5Cp1Pmf7vVFCf6BwpoefHfSe0ZSzmXlGxkl+fD/p8ax89AdZCqR wCLreKMJVr0IvPCS40Pq4Inv6/iXIE4+vORskoiLr+ZvWBKw32pp+2+AcNGfeIfuc1Bl Xw7QmbmF0mlnY6TC6OVz/K2UGTgqk7WWP2gml/+CAb8DS1OQVI2K075Pfc/tj+dhHeFw xqykll4ScmrZK1MuEXdRIX7rQD3HttI25vDIMDwzE8ZAXBdvPMZkVKNTlSgxMqKaSO6G 8mqQ== 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=7w84hQZb3a2qIp2UGWeUaIOfottrVhjpeJBuh9aFqNY=; b=nzK+T3+JcufIIvucVC1TjDAcln9g7Cdquleq0UF22V+72kQ1+HJxfQ0regEFtOeeVn d8Ze57AY527qnyC8C9J5JyaC9+4+Zt7eyaYfYTyZNqZ/B4LVIuExzsPLzJnMOGm9PXEh K67NqEHQGIG0wMwOMAZ9Wh/ciqGpz5a/fVkb/XrlYCrjPs1NJdc5v3yUQAU+lVMrVJ+e mgc4O/R9qT94F/2Whdcx9l01ok//RVTrjAQn0+6hRKaW5KIPAlrs79ist2RxXpp9ocI7 wWpwQxFIisezYm0/w4aw4hK571wOMvm7B3dOGGplAT+tE6iZClkUuqM8+Fp/Ze6+54Bv 4w3A== X-Gm-Message-State: AOAM5316ugupZ6FF/h14FLm19fnw4kukZrFPYjsRYPhr9uxl7gQPyq4N 0uHAF6yiNuFH+A1ViGsnf9JJeeBSVRLk8A== X-Google-Smtp-Source: ABdhPJxM6qwjAL9P3P2Rb7ZNxGsy4vebY90cERjAIvhB5G6pBESZ2XdMqlkn+Cd8a1MFL7Wewtf0DQ== X-Received: by 2002:a05:620a:4c3:: with SMTP id 3mr304764qks.105.1601045021475; Fri, 25 Sep 2020 07:43:41 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.67]) by smtp.gmail.com with ESMTPSA id x126sm1792498qkb.101.2020.09.25.07.43.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 07:43:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Sep 2020 11:43:15 -0300 Message-Id: <20200925144318.6194-5-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200925144318.6194-1-jamrial@gmail.com> References: <20200925144318.6194-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] avcodec/av1dec: parse dimensions from the sequence header in 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" Signed-off-by: James Almer --- libavcodec/av1dec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 0bb04a3e44..f6b9fbbac3 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -405,6 +405,9 @@ static av_cold int av1_decode_free(AVCodecContext *avctx) static int set_context_with_sequence(AVCodecContext *avctx, const AV1RawSequenceHeader *seq) { + int width = seq->max_frame_width_minus_1 + 1; + int height = seq->max_frame_height_minus_1 + 1; + avctx->profile = seq->seq_profile; avctx->level = seq->seq_level_idx[0]; @@ -423,6 +426,13 @@ static int set_context_with_sequence(AVCodecContext *avctx, break; } + if (avctx->width != width || avctx->height != height) { + int ret = ff_set_dimensions(avctx, width, height); + if (ret < 0) + return ret; + } + avctx->sample_aspect_ratio = (AVRational) { 1, 1 }; + if (seq->timing_info.num_units_in_display_tick && seq->timing_info.time_scale) { av_reduce(&avctx->framerate.den, &avctx->framerate.num,