diff options
| author | Andreas Huber <andih@google.com> | 2011-05-26 08:52:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-26 08:52:55 -0700 |
| commit | 8d91237333c60c4a6839358109265e8847df23f3 (patch) | |
| tree | 85f6a3b1c12b1b5785d8889923e72e10f9b71746 /media/libstagefright/include | |
| parent | ecc0840163093942f3418aa4b27e9279c187b173 (diff) | |
| parent | 386d609dc513e838c7e7c4c46c604493ccd560be (diff) | |
| download | frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.zip frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.tar.gz frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.tar.bz2 | |
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/MP3Extractor.h | 5 | ||||
| -rw-r--r-- | media/libstagefright/include/avc_utils.h | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/media/libstagefright/include/MP3Extractor.h b/media/libstagefright/include/MP3Extractor.h index cf1146b..c83d9e8 100644 --- a/media/libstagefright/include/MP3Extractor.h +++ b/media/libstagefright/include/MP3Extractor.h @@ -39,11 +39,6 @@ public: virtual sp<MetaData> getMetaData(); - static bool get_mp3_frame_size( - uint32_t header, size_t *frame_size, - int *out_sampling_rate = NULL, int *out_channels = NULL, - int *out_bitrate = NULL, int *out_num_samples = NULL); - private: status_t mInitCheck; diff --git a/media/libstagefright/include/avc_utils.h b/media/libstagefright/include/avc_utils.h index afff824..15cd4d4 100644 --- a/media/libstagefright/include/avc_utils.h +++ b/media/libstagefright/include/avc_utils.h @@ -57,6 +57,16 @@ sp<MetaData> MakeAACCodecSpecificData( unsigned profile, unsigned sampling_freq_index, unsigned channel_configuration); +// Given an MPEG4 video VOL-header chunk (starting with 0x00 0x00 0x01 0x2?) +// parse it and fill in dimensions, returns true iff successful. +bool ExtractDimensionsFromVOLHeader( + const uint8_t *data, size_t size, int32_t *width, int32_t *height); + +bool GetMPEGAudioFrameSize( + uint32_t header, size_t *frame_size, + int *out_sampling_rate = NULL, int *out_channels = NULL, + int *out_bitrate = NULL, int *out_num_samples = NULL); + } // namespace android #endif // AVC_UTILS_H_ |