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

Commit a70beb16 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Move MediaExtractor back to libstagefright 

It is no longer needed in libmediaextractor, and moving it back
to libstagefright will avoid a circular dependency later.

Bug: 111407253
Test: build, boot, play some files

Change-Id: I1373a9eedee27998e7733ea23ae1a375e45cc9c3
parent 9985754c

cmds/stagefright/record.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "SineSource.h"



#include <binder/ProcessState.h>

#include <media/MediaExtractor.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/ALooper.h>

#include <media/stagefright/foundation/AMessage.h>
@@ -28,6 +27,7 @@ 
#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaCodecSource.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/MediaExtractor.h>

#include <media/stagefright/MediaExtractorFactory.h>

#include <media/stagefright/MPEG4Writer.h>

#include <media/stagefright/SimpleDecodingSource.h>

cmds/stagefright/stagefright.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <binder/IServiceManager.h>

#include <binder/ProcessState.h>

#include <media/DataSource.h>

#include <media/MediaExtractor.h>

#include <media/MediaSource.h>

#include <media/ICrypto.h>

#include <media/IMediaHTTPService.h>
@@ -50,6 +49,7 @@ 
#include <media/stagefright/MediaCodecList.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MediaExtractor.h>

#include <media/stagefright/MediaExtractorFactory.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/SimpleDecodingSource.h>

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <media/DataSource.h>

#include <media/IMediaHTTPService.h>

#include <media/IStreamSource.h>

#include <media/MediaExtractor.h>

#include <media/mediaplayer.h>

#include <media/MediaSource.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -32,6 +31,7 @@ 
#include <media/stagefright/DataSourceFactory.h>

#include <media/stagefright/InterfaceUtils.h>

#include <media/stagefright/MPEG2TSWriter.h>

#include <media/stagefright/MediaExtractor.h>

#include <media/stagefright/MediaExtractorFactory.h>

#include <media/stagefright/MetaData.h>

include/media/MediaExtractor.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../media/libmediaextractor/include/media/MediaExtractor.h
 
 No newline at end of file

media/extractors/mpeg2/ExtractorBundle.cpp

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define LOG_TAG "MPEG2ExtractorBundle"

#include <utils/Log.h>



#include <media/MediaExtractor.h>

#include <media/MediaExtractorPluginHelper.h>

#include "MPEG2PSExtractor.h"

#include "MPEG2TSExtractor.h"