From patchwork Mon Apr 15 21:17:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12758 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 67B1C4492F7 for ; Tue, 16 Apr 2019 00:18:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A32B68A958; Tue, 16 Apr 2019 00:18:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD58068A16A for ; Tue, 16 Apr 2019 00:17:51 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id v20so20894776qtv.12 for ; Mon, 15 Apr 2019 14:17:51 -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=ns4GnPWcv92Xaqx6UBTC8yJRaBlcnMLEKdq1yorTRyA=; b=An6TXN+V1nYfoYcHgBgg39MgMenCAUMqW3+wipQCSPsrydTgVRbAM/dlOsQ2noiiA+ lLogSDXhHRQY5xOm6rZhme9hf4XamI5hJB3rJISasTlEND+jEj/Q53OPfFAT3mSjkX4K S3ZtAFrv1+JinZTmwEShxXOPNiTZEyEvm4WdyQxrvIWWCOZXVmQ/9O5VUNe97+EaSRyP 8bZcwh5BmhHMkf81nyvJO+1o9wxgyqjRWrkNd9BtcRkHBKOj/1yd4Biv37UCD6kCI3Ti 8hpwvxTQUgBAdSeKaep8zFdhMjIrmf94zjZ9aMsFocirPy34IFVLAg7wOEaGI/4fmjbz 9AjA== 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=ns4GnPWcv92Xaqx6UBTC8yJRaBlcnMLEKdq1yorTRyA=; b=c9efJgtnfZzgK3WAYyep/5AgC9O3qNIQqKlaAICQGPnCzaqm4AakoNXt5iDGzlkpaM ev3L4bFCz1KzLLOS2i948/4p8+xn4M8a3u9kg85U+BOgl6hhZaYtZ9XGfrXbNZxz9IpH OP93aX0ik6vsO+2h/AEdOyj2q0/6TToiKhRrw/92P2c4jnxoPUiwjAROzqXKOtfSPIrk cUFsmMy3S48pq6e1bNa9GU+cZ+rhBUnp0Ogn9c2/11RuYw7XERcLwSafWZ5NLZs58qDD DeE0nYHRBKXQS6/7VlbD3mVf3U60RHt9jhsgoNtFvdz91A3KjCJosYNo4+DwOLcqobZC 14lQ== X-Gm-Message-State: APjAAAWYHvtKVsblhUasRDuvrKCzKXtH2Gul9pX2buLyZJ2H64odlMDB Ei0+x3Uk0lV34jAq3XHnaFkqK04f X-Google-Smtp-Source: APXvYqypbMqWHtVoqqU64WplzaOaEjAJTocMzYA9ypC6CMHzbZhMwujjdzRs3bwUD5pduWZVe/WyUQ== X-Received: by 2002:aed:35e4:: with SMTP id d33mr62043140qte.58.1555363070565; Mon, 15 Apr 2019 14:17:50 -0700 (PDT) Received: from localhost.localdomain ([181.23.87.223]) by smtp.gmail.com with ESMTPSA id g12sm28478315qkk.85.2019.04.15.14.17.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 14:17:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2019 18:17:33 -0300 Message-Id: <20190415211734.3968-4-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415211734.3968-1-jamrial@gmail.com> References: <20190415211734.3968-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/cbs_h265: fix storage type for time_offset_value in Time Code SEI 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" The spec defines it as an array of signed values, inferred to 0 when not present. Signed-off-by: James Almer --- Couldn't find any sample using it. libavcodec/cbs_h265.h | 2 +- libavcodec/cbs_h265_syntax_template.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index d216caca2b..0c0e4f84b0 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -659,7 +659,7 @@ typedef struct H265RawSEITimeCode { uint8_t minutes_flag[3]; uint8_t hours_flag[3]; uint8_t time_offset_length[3]; - uint32_t time_offset_value[3]; + int32_t time_offset_value[3]; } H265RawSEITimeCode; typedef struct H265RawSEIMasteringDisplayColourVolume { diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index f1e1bb0e7e..bbd363a389 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1986,8 +1986,11 @@ static int FUNC(sei_time_code)(CodedBitstreamContext *ctx, RWContext *rw, us(5, time_offset_length[i], 0, 31, 1, i); if (current->time_offset_length[i] > 0) - us(current->time_offset_length[i], time_offset_value[i], - 0, MAX_UINT_BITS(current->time_offset_length[i]), 1, i); + is(current->time_offset_length[i], time_offset_value[i], + MIN_INT_BITS(current->time_offset_length[i]), + MAX_INT_BITS(current->time_offset_length[i]), 1, i); + else + infer(time_offset_value[i], 0); } }