From patchwork Mon Nov 11 13:36:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16208 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 329F1447D62 for ; Mon, 11 Nov 2019 15:45:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13DFA68A89E; Mon, 11 Nov 2019 15:45:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DEED689D3A for ; Mon, 11 Nov 2019 15:45:27 +0200 (EET) Received: by mail-qk1-f196.google.com with SMTP id 205so11188407qkk.1 for ; Mon, 11 Nov 2019 05:45:27 -0800 (PST) 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=AyNveMnMRBJwYEaV8phfieJ75rB0fUu6C7j5egdO96Y=; b=WG0rcUx4tRR1eI0DVQTgSw8O3n09LsVB88BHnhYP0UezwkVVmwPZblNKA9RRV2JPEJ mvasarntFvs0ybXz0GGGu0cPS/VYecN4J0MjBp7ghv7l2r7XV+CTp42wKbBSN1iOK8jZ hyM9r5Y8a27lrDPwP89wNABfPkkiTd4THO0ezr5CBYYIjxekt47s2rx/wGmNCI9ldJrn KpPCI0J+jmXor7WHXqDj51RrZqEkTPABoSlcBUPwO25bN5Y2kajfI7piCu7RrwMDmoHi KCcXVy7+NMEgJ8AVOL4/I1+0/ru6Qv4GZ9QCho3D6EaKUn6XYa1P45S3K3Q3FZXknqRJ kH4Q== 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=AyNveMnMRBJwYEaV8phfieJ75rB0fUu6C7j5egdO96Y=; b=jQC8s3EAYgEeNikKiHa6/Sznwc+xtP5j7xhZhhOrymH6JtUwt9/VesHucKc2vGDvw9 z4o0GLYP6q5n63ixj97HOpXBH+wgNTMkSqHRuXIsj7Oi9Su6CU2ob0OL5obt3oTGSsND TtSNNH5fLf3RW+sblS/5HCBtMBnsFWG71IIbY1E3lJ+1lxaExT7X9l2juRVYNtXClH9Q ygwfmlQvA1WoJ32UMpfQ/Xn/e37JH9bBw4TYOvvdQq+2ORCpoaUjOWrdDmeTw9CvXQ3s zsUNRZqKFgLuyZEVms07MS3yhWqz+Tbfrz4YPJwWdpQReg2tPCXK653C0rH+8ee6IL3G BM6A== X-Gm-Message-State: APjAAAUExJZjkl/hNFoQMDOZbDGiGTNlRjUwIrkinmSo6KN2Us4IHXuH d15mt2p4WoVfWog6y1kv+wlSlwVg X-Google-Smtp-Source: APXvYqyfZRCgFdK+JohyQfGMCq2IuKtE68lH5OsPydyIrdanvPK8tsXv6CwXSg8T2opL21VYIx1hHg== X-Received: by 2002:a37:a050:: with SMTP id j77mr914400qke.295.1573479426494; Mon, 11 Nov 2019 05:37:06 -0800 (PST) Received: from localhost.localdomain ([181.23.83.211]) by smtp.gmail.com with ESMTPSA id d139sm7547567qkb.36.2019.11.11.05.37.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 05:37:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Nov 2019 10:36:11 -0300 Message-Id: <20191111133615.543-2-jamrial@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191111133615.543-1-jamrial@gmail.com> References: <20191111133615.543-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/cbs_av1: support one byte long OBUs when the size is not set in the bitstream 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 was missed in 96717a42715fdcc2f93558206e24d6dfd26b8d58, and will be needed by the next commit, where packets with a single Temporal Delimiter OBU with no size need to be parsed. Signed-off-by: James Almer --- libavcodec/cbs_av1.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index c027933218..cca112ecf8 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -768,14 +768,13 @@ static int cbs_av1_split_fragment(CodedBitstreamContext *ctx, if (err < 0) goto fail; - if (get_bits_left(&gbc) < 8) { - av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment " - "too short (%"SIZE_SPECIFIER" bytes).\n", size); - err = AVERROR_INVALIDDATA; - goto fail; - } - if (header.obu_has_size_field) { + if (get_bits_left(&gbc) < 8) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment " + "too short (%"SIZE_SPECIFIER" bytes).\n", size); + err = AVERROR_INVALIDDATA; + goto fail; + } err = cbs_av1_read_leb128(ctx, &gbc, "obu_size", &obu_size); if (err < 0) goto fail;