From patchwork Sat May 30 16:05:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19992 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 3D0FB44A6AD for ; Sat, 30 May 2020 19:06:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 252B868AB98; Sat, 30 May 2020 19:06:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A06B68AD9D for ; Sat, 30 May 2020 19:06:16 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id u13so6717160wml.1 for ; Sat, 30 May 2020 09:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wPWoPmd9DXbqrbjbcW9RPPlWFxsDfB3oJouoA4+iB5E=; b=hozG/1Li/TI1x/1bMlh5UWh90meKGvV7bKY7541jTVCbrKOUIWK/s4eEbwxNLro+/3 lU6/2rVchrKuNyOkRBaMgorGzNyz+8LuP96xnXDso0xV8HWU5zazR3UEEkw3oBRiUUPD eNUCBd5l4FWj/AD4KcszxckYe5ym8zJnfVopbxzV1R3il46frIdd2Xc89wZZ5ggzzoFA yQmsJpUV0ZaRwDU9cPwA5YAa8ByvSw4FmnwOTnwMb8IzPu4qO6bUnpDvty2WrjRCFN4W 7yCCXAd2P7xFeN0OV7Oz9KcquUarqTcdgQR93sn0w8kfWTLQH2SUajd8WUXPNMrqQ8Bq YQUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wPWoPmd9DXbqrbjbcW9RPPlWFxsDfB3oJouoA4+iB5E=; b=N80YoKu6ohRBXs5ichuPSpy6H5ezy1IBB7wAJ4qP2jgO2eo+j+QR5OUA9EQStvPyiw q/fR5ee9UR9NZagU7LZoUsaMEekvJ22tFMhgW1v6ufjJoqfDabj5/2ol/CRbbHRO1MtW 6kp1bHxY49TD2WHhm2/MD/ssutSs7Vp1r34qlLu99GFLbe2LrfXRp6ikMWmo3KywuBRL JUqafNjmcBWU+tbr/2IIEECJq82Psgq88WkuLtimQH3K+fxXX+H2BYGcpeDOn29EWEcx H6m+K+h3gLKc4vP6mqW9yBhngjg7lJgreN7FeImALXvK0XCABWWt/nMQdoWN0xRTvNds U5fQ== X-Gm-Message-State: AOAM531DZ/KmA0n3mVkww5300ghBIFGwPxXvhy8rwVEsj8Eki1zfI8bR jReFqNEIuRePw4ADrki88Z58GKB/ X-Google-Smtp-Source: ABdhPJxPcbssQhqi55rDbJeuhRfDAKXHUIe5XmJohPupS+hEHYWpQo9++H5DP/Rw7XU86F/SJp9D9A== X-Received: by 2002:a1c:29c4:: with SMTP id p187mr13637192wmp.73.1590854775153; Sat, 30 May 2020 09:06:15 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:14 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:10 +0200 Message-Id: <20200530160541.29517-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/36] avcodec/vp9_superframe_bsf: Allow up to eight frames in a superframe 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Up until now, the bsf errored out with a message that there were too many invisible frames if there were already seven frames cached even when the new frame was not invisible. This has been changed. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_superframe_bsf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index a8b58a7fd3..a7faad3abf 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -158,13 +158,15 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt) } else if ((!invisible || uses_superframe_syntax) && !s->n_cache) { // passthrough return 0; - } else if (s->n_cache + 1 >= MAX_CACHE) { + } else if (invisible && s->n_cache + 1 >= MAX_CACHE) { av_log(ctx, AV_LOG_ERROR, "Too many invisible frames\n"); res = AVERROR_INVALIDDATA; goto done; } + av_assert0(s->n_cache < MAX_CACHE); + av_packet_move_ref(s->cache[s->n_cache++], pkt); if (invisible) {