diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-05-22 03:04:34 +0200 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2019-05-29 00:16:26 +0100 |
| commit | de5880383967f44927c599ab16fa0f4f96b38365 (patch) | |
| tree | f48c651638fc7c47790507532e0895a047427414 /libavcodec/cbs_mpeg2_syntax_template.c | |
| parent | 9c3f2a8894a66d6b5b9285caa25f91fbfca7b3bc (diff) | |
| download | ffmpeg-de5880383967f44927c599ab16fa0f4f96b38365.tar.gz | |
cbs_mpeg2: Fix storage type for frame_centre_*_offset
The frame_centre_horizontal/vertical_offset values contained in picture
display extensions are actually signed values (i.e. it is possible to
indicate that the display device should add black bars/pillars).
The files sony-ct3.bs and tcela-6.bits (which are both used in fate
tests for mpeg2_metadata) contain picture display extensions; the former
even contains a negative frame_centre_vertical_offset. Fortunately, the
old code did not damage the picture display extensions when one did a
cycle of reading and writing. For the same reason the fate tests needn't
be updated either.
Furthermore these fields now use the trace output for matrices.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/cbs_mpeg2_syntax_template.c')
| -rw-r--r-- | libavcodec/cbs_mpeg2_syntax_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index b9d53682fe..09487fe56d 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -299,9 +299,9 @@ static int FUNC(picture_display_extension)(CodedBitstreamContext *ctx, RWContext HEADER("Picture Display Extension"); for (i = 0; i < mpeg2->number_of_frame_centre_offsets; i++) { - ui(16, frame_centre_horizontal_offset[i]); + sis(16, frame_centre_horizontal_offset[i], 1, i); marker_bit(); - ui(16, frame_centre_vertical_offset[i]); + sis(16, frame_centre_vertical_offset[i], 1, i); marker_bit(); } |