ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Apr 15 17:51:49 2019 -0300| [137c0fcad15139921279038351048970e99838f4] | committer: James Almer
avcodec/cbs_h265: fix storage type for time_offset_value in Time Code SEI
The spec defines it as an array of signed values, inferred to 0 when not
present.
Reviewed-by: Mark Thompson <sw at jkqxz.net>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=137c0fcad15139921279038351048970e99838f4
---
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);
}
}