diff options
| author | Marco Nelissen <marcone@google.com> | 2018-07-17 14:10:03 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2018-08-23 08:10:30 -0700 |
| commit | a70beb16195266900997f2f376d2f28017cd45a4 (patch) | |
| tree | ba0716f8eb0e1210e663bd48242c2b56deeee401 /cmds | |
| parent | 9985754cabf9d426bf95e3adfc27cea7fcc86e42 (diff) | |
| download | frameworks_av-a70beb16195266900997f2f376d2f28017cd45a4.tar.gz frameworks_av-a70beb16195266900997f2f376d2f28017cd45a4.tar.bz2 frameworks_av-a70beb16195266900997f2f376d2f28017cd45a4.zip | |
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
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/record.cpp | 2 | ||||
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 2 | ||||
| -rw-r--r-- | cmds/stagefright/stream.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index 44b0015f0f..95a16f3a04 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -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> diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index bddf9452ac..0d331df18d 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -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> diff --git a/cmds/stagefright/stream.cpp b/cmds/stagefright/stream.cpp index b0199d8cf5..b2f39dc7a8 100644 --- a/cmds/stagefright/stream.cpp +++ b/cmds/stagefright/stream.cpp @@ -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> |