diff options
| author | Andreas Huber <andih@google.com> | 2011-11-28 12:36:11 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-11-28 16:45:13 -0800 |
| commit | 6e3d311b6631b12aac2879d1b08c3534aece78b1 (patch) | |
| tree | 001b5d677ee599a4d6f8d1ba636fbf4e5f0c6a4e /media/libstagefright/mpeg2ts/ATSParser.h | |
| parent | 7cafbb32999049873d4746ba83bd20c88abe6ce6 (diff) | |
| download | frameworks_av-6e3d311b6631b12aac2879d1b08c3534aece78b1.zip frameworks_av-6e3d311b6631b12aac2879d1b08c3534aece78b1.tar.gz frameworks_av-6e3d311b6631b12aac2879d1b08c3534aece78b1.tar.bz2 | |
Finer granularity discontinuity support.
No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.
Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug: 5553055
Diffstat (limited to 'media/libstagefright/mpeg2ts/ATSParser.h')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/media/libstagefright/mpeg2ts/ATSParser.h b/media/libstagefright/mpeg2ts/ATSParser.h index 878e534..c8038d1 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.h +++ b/media/libstagefright/mpeg2ts/ATSParser.h @@ -33,9 +33,18 @@ struct MediaSource; struct ATSParser : public RefBase { enum DiscontinuityType { - DISCONTINUITY_NONE, - DISCONTINUITY_SEEK, - DISCONTINUITY_FORMATCHANGE + DISCONTINUITY_NONE = 0, + DISCONTINUITY_TIME = 1, + DISCONTINUITY_AUDIO_FORMAT = 2, + DISCONTINUITY_VIDEO_FORMAT = 4, + + DISCONTINUITY_SEEK = DISCONTINUITY_TIME, + + // For legacy reasons this also implies a time discontinuity. + DISCONTINUITY_FORMATCHANGE = + DISCONTINUITY_AUDIO_FORMAT + | DISCONTINUITY_VIDEO_FORMAT + | DISCONTINUITY_TIME, }; enum Flags { @@ -71,7 +80,7 @@ struct ATSParser : public RefBase { STREAMTYPE_MPEG2_VIDEO = 0x02, STREAMTYPE_MPEG1_AUDIO = 0x03, STREAMTYPE_MPEG2_AUDIO = 0x04, - STREAMTYPE_MPEG2_AUDIO_ATDS = 0x0f, + STREAMTYPE_MPEG2_AUDIO_ADTS = 0x0f, STREAMTYPE_MPEG4_VIDEO = 0x10, STREAMTYPE_H264 = 0x1b, }; |