Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9069aa31 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I57515f33 into eclair-mr2 

* changes:
  Moving the individual extractor headers files to the private include directory.
parents f0990646 57515f33

cmds/stagefright/record.cpp

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/MPEG4Extractor.h>

#include <media/stagefright/MediaExtractor.h>

#include <media/stagefright/MPEG4Writer.h>

#include <media/stagefright/MmapSource.h>

#include <media/stagefright/OMXClient.h>
@@ -88,8 +88,8 @@ private: 
sp<MediaSource> createSource(const char *filename) {

    sp<MediaSource> source;



    sp<MPEG4Extractor> extractor =

        new MPEG4Extractor(new MmapSource(filename));

    sp<MediaExtractor> extractor =

        MediaExtractor::Create(new MmapSource(filename));



    size_t num_tracks = extractor->countTracks();

media/libstagefright/AMRExtractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
#define LOG_TAG "AMRExtractor"

#include <utils/Log.h>



#include <media/stagefright/AMRExtractor.h>

#include "include/AMRExtractor.h"



#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDebug.h>

media/libstagefright/DataSource.cpp

+4 −3
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
 * limitations under the License.

 */



#include <media/stagefright/AMRExtractor.h>

#include "include/AMRExtractor.h"

#include "include/MP3Extractor.h"

#include "include/MPEG4Extractor.h"



#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MP3Extractor.h>

#include <media/stagefright/MPEG4Extractor.h>

#include <utils/String8.h>



namespace android {

media/libstagefright/MP3Extractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
#define LOG_TAG "MP3Extractor"

#include <utils/Log.h>



#include "include/MP3Extractor.h"



#include <media/stagefright/DataSource.h>

#include <media/stagefright/MP3Extractor.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDebug.h>

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define LOG_TAG "MPEG4Extractor"

#include <utils/Log.h>



#include "include/MPEG4Extractor.h"

#include "include/SampleTable.h"



#include <arpa/inet.h>
@@ -27,7 +28,6 @@ 
#include <string.h>



#include <media/stagefright/DataSource.h>

#include <media/stagefright/MPEG4Extractor.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDebug.h>