From 386d609dc513e838c7e7c4c46c604493ccd560be Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 19 May 2011 08:37:39 -0700 Subject: Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams. Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5 --- media/libstagefright/mpeg2ts/ATSParser.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'media/libstagefright/mpeg2ts/ATSParser.h') diff --git a/media/libstagefright/mpeg2ts/ATSParser.h b/media/libstagefright/mpeg2ts/ATSParser.h index 3936f05..1e6451d 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.h +++ b/media/libstagefright/mpeg2ts/ATSParser.h @@ -48,8 +48,8 @@ struct ATSParser : public RefBase { void signalEOS(status_t finalResult); enum SourceType { - AVC_VIDEO, - MPEG2ADTS_AUDIO + VIDEO, + AUDIO }; sp getSource(SourceType type); @@ -59,6 +59,17 @@ protected: virtual ~ATSParser(); private: + enum { + // From ISO/IEC 13818-1: 2000 (E), Table 2-29 + STREAMTYPE_MPEG1_VIDEO = 0x01, + STREAMTYPE_MPEG2_VIDEO = 0x02, + STREAMTYPE_MPEG1_AUDIO = 0x03, + STREAMTYPE_MPEG2_AUDIO = 0x04, + STREAMTYPE_MPEG2_AUDIO_ATDS = 0x0f, + STREAMTYPE_MPEG4_VIDEO = 0x10, + STREAMTYPE_H264 = 0x1b, + }; + struct Program; struct Stream; -- cgit v1.1