From patchwork Mon Apr 1 23:39:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12553 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 97219447332 for ; Tue, 2 Apr 2019 02:40:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8215F68ABF3; Tue, 2 Apr 2019 02:40:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7AFD68ABA7 for ; Tue, 2 Apr 2019 02:39:53 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id c1so1195241wml.4 for ; Mon, 01 Apr 2019 16:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FO7TUwyHBnKXVNbOxFuNlI0lkEBohX/ZF9wUbZIxnHU=; b=M5cigVXVlUjXRSZrUsUScdDKx+xvHmHanYleahFFbAEr0qPO/uxkcsjb8LOeKsH5Kg Os6PFbW3uLyvYNVMXLDWsUQRkfg07U0E9kpTZp5SotMykqp2JJT1hIWMQrzpnWsjJVRG OMyY0vdGYGlgAenB2A7pZYJix0SVtLnFCSvwNywFgY2PmuUNUxp09Pxy54XWyaEDFfjQ +0rCdawtCusEVZz/UAdbO4oCqwVPSes9q+hX1x2hrKM266gokxlwIs/R+F6smTmvYc6P FpwY0BDEZKP1+XncwAkZXkzYrI4J42E+S/bzeCGseMRYY1GX0okmzDHryJJUT/wf3xLf VS2w== 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=FO7TUwyHBnKXVNbOxFuNlI0lkEBohX/ZF9wUbZIxnHU=; b=W4yXbFHri9t/6LD2//7//MHwE2Q5G1rdpTEVE5xAJGXdsWd/PnT7sq5kKxmpwMucd7 lKyWpX3HEQ6BwfetEpVuxY5HAWGbAwppVEtCtWySYn99OQ5RkNKGqLzd6iROXiinbtTG 4jL/Ln6o9QZjZzWalP8l8yMUS/xvsguZ+QxjeRYZnqNb09qV6AtWCUWCLSA4+BrseXsK nPctskuTs+UksAko/VEUwhYXJG5G468+j6c2vIvTlakWdB2JxBKF/979wr0QQuht0lfz jbGuyKWx69bosblWilfH8O44DXJaZJ7GbvoE8tVJ3Z+36ZnLqI9aPPW+xad4pHqNpA9u qeiA== X-Gm-Message-State: APjAAAVw7k0qlMFGUun9sRaGuQ0XfX+jAbRmsPVVg1QIJYbwS9RVyAiG fi13d5N4X6QVCageQih7cb0GIHtIHvg= X-Google-Smtp-Source: APXvYqwtcT0Lh8uU2/4PyM8nVbChrW3uz9wqh7XB9rtvlhvdF6KaK0zO1kZO46YR46gihJTHPPxz8A== X-Received: by 2002:a1c:39d7:: with SMTP id g206mr1206443wma.99.1554161993026; Mon, 01 Apr 2019 16:39:53 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id r30sm27943044wrr.46.2019.04.01.16.39.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 16:39:52 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 00:39:38 +0100 Message-Id: <20190401233940.5941-7-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190401233940.5941-1-sw@jkqxz.net> References: <20190401233940.5941-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 7/9] cbs_av1: Fill context information for show-existing-frame 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" --- libavcodec/cbs_av1_syntax_template.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 76eb90b279..a9bf78e4ad 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1146,6 +1146,22 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, fb(3, frame_to_show_map_idx); frame = &priv->ref[current->frame_to_show_map_idx]; + if (!frame->valid) { + av_log(ctx->log_ctx, AV_LOG_ERROR, + "Missing reference frame needed to show existing frame " + "(frame_to_show_map_idx = %d).\n", + current->frame_to_show_map_idx); + return AVERROR_INVALIDDATA; + } + + priv->bit_depth = frame->bit_depth; + priv->frame_width = frame->frame_width; + priv->frame_height = frame->frame_height; + priv->upscaled_width = frame->upscaled_width; + priv->render_width = frame->render_width; + priv->render_height = frame->render_height; + + infer(frame_type, frame->frame_type); if (seq->decoder_model_info_present_flag && !seq->timing_info.equal_picture_interval) {