[FFmpeg-cvslog] cbs_mpeg2: Decompose Sequence End
Andreas Rheinhardt
git at videolan.org
Tue Jul 30 01:20:59 EEST 2019
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Jul 29 21:56:54 2019 +0200| [0e66e1b61ea2fd8fd85ebe3b86ff48dad78233dd] | committer: Mark Thompson
cbs_mpeg2: Decompose Sequence End
Sequence End units (or actually, sequence_end_codes) have up until now
not been decomposed; in fact due to a bug in cbs_mpeg2_split_fragment they
have mostly been treated as part of the preceding unit. So implement
decomposing them as preparation for fixing said bug.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e66e1b61ea2fd8fd85ebe3b86ff48dad78233dd
---
libavcodec/cbs_mpeg2.c | 3 +++
libavcodec/cbs_mpeg2.h | 4 ++++
libavcodec/cbs_mpeg2_syntax_template.c | 12 ++++++++++++
3 files changed, 19 insertions(+)
diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 3e6797bd42..9a584246c9 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -269,6 +269,8 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx,
extension_data, NULL);
START(MPEG2_START_GROUP, MPEG2RawGroupOfPicturesHeader,
group_of_pictures_header, NULL);
+ START(MPEG2_START_SEQUENCE_END, MPEG2RawSequenceEnd,
+ sequence_end, NULL);
#undef START
default:
return AVERROR(ENOSYS);
@@ -295,6 +297,7 @@ static int cbs_mpeg2_write_header(CodedBitstreamContext *ctx,
START(MPEG2_START_EXTENSION, MPEG2RawExtensionData, extension_data);
START(MPEG2_START_GROUP, MPEG2RawGroupOfPicturesHeader,
group_of_pictures_header);
+ START(MPEG2_START_SEQUENCE_END, MPEG2RawSequenceEnd, sequence_end);
#undef START
default:
av_log(ctx->log_ctx, AV_LOG_ERROR, "Write unimplemented for start "
diff --git a/libavcodec/cbs_mpeg2.h b/libavcodec/cbs_mpeg2.h
index 2befaab275..118e63d804 100644
--- a/libavcodec/cbs_mpeg2.h
+++ b/libavcodec/cbs_mpeg2.h
@@ -212,6 +212,10 @@ typedef struct MPEG2RawSlice {
AVBufferRef *data_ref;
} MPEG2RawSlice;
+typedef struct MPEG2RawSequenceEnd {
+ uint8_t sequence_end_code;
+} MPEG2RawSequenceEnd;
+
typedef struct CodedBitstreamMPEG2Context {
// Elements stored in headers which are required for other decoding.
diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c
index e7332abe6e..5165a14cd5 100644
--- a/libavcodec/cbs_mpeg2_syntax_template.c
+++ b/libavcodec/cbs_mpeg2_syntax_template.c
@@ -411,3 +411,15 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw,
return 0;
}
+
+static int FUNC(sequence_end)(CodedBitstreamContext *ctx, RWContext *rw,
+ MPEG2RawSequenceEnd *current)
+{
+ int err;
+
+ HEADER("Sequence End");
+
+ ui(8, sequence_end_code);
+
+ return 0;
+}
More information about the ffmpeg-cvslog
mailing list