From patchwork Wed Apr 17 15:48:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12781 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 5550B447B38 for ; Wed, 17 Apr 2019 18:49:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3291F689D24; Wed, 17 Apr 2019 18:49:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE43168827F for ; Wed, 17 Apr 2019 18:48:54 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id w20so14627567qka.7 for ; Wed, 17 Apr 2019 08:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=XXmzRPfGdtOqunFGqUAUtVkuIbqxpL/MEFjwqXSWNgo=; b=m1qQcnB+9BbrjfVK1PQon0Q9RTku8BG+PjPFqPm3iN/vAolIMY/Pfg+fwcPhHyb1dA jpZypo2UgKiI6SAbfLJW9b1lcfIexOeBpTYWELfQNJ+Fh6KFAeGniK1emWV88KN7c3oW vL+gyFoUAV39RYUvH6JzNp+i4kMtDx4u2yw4fIuHwRbdtExLa1sKxjFNEfQbxw8LnGPx 00AUrtscTmFVAH0dwMk2M4aQgeV0GpyCWI8fwxMgjx2wgOOAIhH3WRs20GHPWpPkpmHP zGLfwBUIFD3lMk20DxNq/yzP0Eogb3HFKPQ10uT1Yqp9TUmA6hPwC94vGTw8+bn3utzx OUlw== 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:mime-version :content-transfer-encoding; bh=XXmzRPfGdtOqunFGqUAUtVkuIbqxpL/MEFjwqXSWNgo=; b=qBPGj926G0X+Qy63lqiCBppGKnmHl9N3QNpqtJLhM5mPewMXjDDWGNnlT6Mg11sSU0 N/iTS3KXY1hUG4eFQowGiU69R5pJpOl8+FWZFb/K/D3/tPd+CDjMVe03O/fhcJxAAM/Q FfZLhA9LX5sWavBJGut7FMafv11VGgZhD13bDvX4hwGAXTUXWMKRgcEB6bj0U02MUqiA v7lRDdv9iMkRwvVBlLp6ZTz1jM0gi8O5nb1LKcwBrE7zmBNKzBHpw4erZTY1S63V6Xtb 6miR0lDd5xzVX8mvShNeB17j8w1cht2y8DtkW5PUSQwug9uz2Kw6XxxNRSmofn7wi7+/ RB/A== X-Gm-Message-State: APjAAAU4blhGdWOf3xGVVcBbTnQUIb6hs+ilJwgueurQAdYE0uAGqENk iI+aYLfUj+hv1oPkZjgYtqcHZlCT X-Google-Smtp-Source: APXvYqy5t+BipZg2C+OkIBcNWrAE/2LOmhZ+58K/kdLfJ53xo42V40O7Jhoho9nJP7Swe3mkFzmfdg== X-Received: by 2002:a37:6617:: with SMTP id a23mr66753513qkc.161.1555516133365; Wed, 17 Apr 2019 08:48:53 -0700 (PDT) Received: from localhost.localdomain ([181.23.87.223]) by smtp.gmail.com with ESMTPSA id s189sm33579605qkh.19.2019.04.17.08.48.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 08:48:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Apr 2019 12:48:24 -0300 Message-Id: <20190417154824.5516-1-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: add missing value range constrains to timecode Metadata OBU 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" Also infer the value time_offset_length as 0 when it's not present. Signed-off-by: James Almer --- Fun thing, this metadata OBU is clearly based on the H264/5 timecode SEI, yet time_offset_length is unsigned here :p libavcodec/cbs_av1_syntax_template.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 59a98b18c9..b04cd51d55 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1753,19 +1753,19 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, fb(9, n_frames); if (current->full_timestamp_flag) { - fb(6, seconds_value); - fb(6, minutes_value); - fb(5, hours_value); + fc(6, seconds_value, 0, 59); + fc(6, minutes_value, 0, 59); + fc(5, hours_value, 0, 23); } else { flag(seconds_flag); if (current->seconds_flag) { - fb(6, seconds_value); + fc(6, seconds_value, 0, 59); flag(minutes_flag); if (current->minutes_flag) { - fb(6, minutes_value); + fc(6, minutes_value, 0, 59); flag(hours_flag); if (current->hours_flag) - fb(5, hours_value); + fc(5, hours_value, 0, 23); } } } @@ -1773,6 +1773,8 @@ static int FUNC(metadata_timecode)(CodedBitstreamContext *ctx, RWContext *rw, fb(5, time_offset_length); if (current->time_offset_length > 0) fb(current->time_offset_length, time_offset_value); + else + infer(time_offset_length, 0); return 0; }