From 57515f334bcc1f66f95e342bfcaa13bf9ca802ad Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Fri, 23 Oct 2009 09:55:10 -0700 Subject: Moving the individual extractor headers files to the private include directory. --- include/media/stagefright/AMRExtractor.h | 54 ----------------------- include/media/stagefright/MP3Extractor.h | 55 ------------------------ include/media/stagefright/MPEG4Extractor.h | 69 ------------------------------ 3 files changed, 178 deletions(-) delete mode 100644 include/media/stagefright/AMRExtractor.h delete mode 100644 include/media/stagefright/MP3Extractor.h delete mode 100644 include/media/stagefright/MPEG4Extractor.h (limited to 'include') diff --git a/include/media/stagefright/AMRExtractor.h b/include/media/stagefright/AMRExtractor.h deleted file mode 100644 index debf006..0000000 --- a/include/media/stagefright/AMRExtractor.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef AMR_EXTRACTOR_H_ - -#define AMR_EXTRACTOR_H_ - -#include - -namespace android { - -class String8; - -class AMRExtractor : public MediaExtractor { -public: - AMRExtractor(const sp &source); - - virtual size_t countTracks(); - virtual sp getTrack(size_t index); - virtual sp getTrackMetaData(size_t index, uint32_t flags); - - static sp makeAMRFormat(bool isWide); - -protected: - virtual ~AMRExtractor(); - -private: - sp mDataSource; - status_t mInitCheck; - bool mIsWide; - - AMRExtractor(const AMRExtractor &); - AMRExtractor &operator=(const AMRExtractor &); -}; - -bool SniffAMR( - const sp &source, String8 *mimeType, float *confidence); - -} // namespace android - -#endif // AMR_EXTRACTOR_H_ diff --git a/include/media/stagefright/MP3Extractor.h b/include/media/stagefright/MP3Extractor.h deleted file mode 100644 index 074973b..0000000 --- a/include/media/stagefright/MP3Extractor.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MP3_EXTRACTOR_H_ - -#define MP3_EXTRACTOR_H_ - -#include - -namespace android { - -class DataSource; -class String8; - -class MP3Extractor : public MediaExtractor { -public: - // Extractor assumes ownership of "source". - MP3Extractor(const sp &source); - - virtual size_t countTracks(); - virtual sp getTrack(size_t index); - virtual sp getTrackMetaData(size_t index, uint32_t flags); - -protected: - virtual ~MP3Extractor(); - -private: - sp mDataSource; - off_t mFirstFramePos; - sp mMeta; - uint32_t mFixedHeader; - - MP3Extractor(const MP3Extractor &); - MP3Extractor &operator=(const MP3Extractor &); -}; - -bool SniffMP3( - const sp &source, String8 *mimeType, float *confidence); - -} // namespace android - -#endif // MP3_EXTRACTOR_H_ diff --git a/include/media/stagefright/MPEG4Extractor.h b/include/media/stagefright/MPEG4Extractor.h deleted file mode 100644 index ce4736d..0000000 --- a/include/media/stagefright/MPEG4Extractor.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MPEG4_EXTRACTOR_H_ - -#define MPEG4_EXTRACTOR_H_ - -#include - -namespace android { - -class DataSource; -class SampleTable; -class String8; - -class MPEG4Extractor : public MediaExtractor { -public: - // Extractor assumes ownership of "source". - MPEG4Extractor(const sp &source); - - size_t countTracks(); - sp getTrack(size_t index); - sp getTrackMetaData(size_t index, uint32_t flags); - -protected: - virtual ~MPEG4Extractor(); - -private: - struct Track { - Track *next; - sp meta; - uint32_t timescale; - sp sampleTable; - bool includes_expensive_metadata; - }; - - sp mDataSource; - bool mHaveMetadata; - - Track *mFirstTrack, *mLastTrack; - - uint32_t mHandlerType; - - status_t readMetaData(); - status_t parseChunk(off_t *offset, int depth); - - MPEG4Extractor(const MPEG4Extractor &); - MPEG4Extractor &operator=(const MPEG4Extractor &); -}; - -bool SniffMPEG4( - const sp &source, String8 *mimeType, float *confidence); - -} // namespace android - -#endif // MPEG4_EXTRACTOR_H_ -- cgit v1.1