gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move MediaExtractor back to libstagefright

Browse Source 
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
gugelfrei
Marco Nelissen 6 years ago
parent 9985754cab
commit a70beb1619
20 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
cmds/stagefright/record.cpp
Unescape View File

@ -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>

2
cmds/stagefright/stagefright.cpp
Unescape View File

@ -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>

2
cmds/stagefright/stream.cpp
Unescape View File

@ -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>

1
include/media/MediaExtractor.h
Unescape View File

@ -1 +0,0 @@
../../media/libmediaextractor/include/media/MediaExtractor.h

1
media/extractors/mpeg2/ExtractorBundle.cpp
Unescape View File

@ -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"

1
media/libmedia/IMediaExtractorService.cpp
Unescape View File

@ -23,7 +23,6 @@
#include <sys/types.h>
#include <binder/Parcel.h>
#include <media/IMediaExtractorService.h>
#include <media/MediaExtractor.h>
namespace android {

1
media/libmediaextractor/Android.bp
Unescape View File

@ -29,7 +29,6 @@ cc_library {
"MediaBufferGroup.cpp",
"MediaSource.cpp",
"MediaTrack.cpp",
"MediaExtractor.cpp",
"MetaData.cpp",
"MetaDataBase.cpp",
"VorbisComment.cpp",

1
media/libmediaplayer2/nuplayer2/GenericSource2.cpp
Unescape View File

@ -28,7 +28,6 @@
#include <media/IMediaExtractorService.h>
#include <media/IMediaSource.h>
#include <media/MediaHTTPService.h>
#include <media/MediaExtractor.h>
#include <media/MediaSource.h>
#include <media/NdkWrapper.h>
#include <media/stagefright/foundation/ABuffer.h>

2
media/libmediaplayerservice/nuplayer/GenericSource.cpp
Unescape View File

@ -25,7 +25,6 @@
#include <cutils/properties.h>
#include <media/DataSource.h>
#include <media/MediaBufferHolder.h>
#include <media/MediaExtractor.h>
#include <media/MediaSource.h>
#include <media/IMediaExtractorService.h>
#include <media/IMediaHTTPService.h>
@ -38,6 +37,7 @@
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaClock.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/MediaExtractorFactory.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/Utils.h>

2
media/libstagefright/Android.bp
Unescape View File

@ -120,6 +120,7 @@ cc_library_shared {
"MediaCodecList.cpp",
"MediaCodecListOverrides.cpp",
"MediaCodecSource.cpp",
"MediaExtractor.cpp",
"MediaExtractorFactory.cpp",
"MediaSync.cpp",
"http/ClearMediaHTTP.cpp",
@ -241,6 +242,7 @@ cc_library {
"HevcUtils.cpp",
"InterfaceUtils.cpp",
"MediaClock.cpp",
"MediaExtractor.cpp",
"MediaExtractorFactory.cpp",
"NdkUtils.cpp",
"NuCachedSource2.cpp",

2
media/libmediaextractor/MediaExtractor.cpp → media/libstagefright/MediaExtractor.cpp
Unescape View File

@ -19,8 +19,8 @@
#include <utils/Log.h>
#include <pwd.h>
#include <media/MediaExtractor.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/MetaData.h>
namespace android {

2
media/libstagefright/MediaExtractorFactory.cpp
Unescape View File

@ -21,9 +21,9 @@
#include <binder/IServiceManager.h>
#include <media/DataSource.h>
#include <media/MediaAnalyticsItem.h>
#include <media/MediaExtractor.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/InterfaceUtils.h>
#include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/MediaExtractorFactory.h>
#include <media/IMediaExtractor.h>
#include <media/IMediaExtractorService.h>

2
media/libstagefright/NuMediaExtractor.cpp
Unescape View File

@ -24,7 +24,6 @@
#include "include/NuCachedSource2.h"
#include <media/DataSource.h>
#include <media/MediaExtractor.h>
#include <media/MediaSource.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
@ -34,6 +33,7 @@
#include <media/stagefright/MediaBuffer.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/Utils.h>

1
media/libstagefright/StagefrightMetadataRetriever.cpp
Unescape View File

@ -32,6 +32,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/CharacterEncodingDetector.h>

1
media/libstagefright/include/StagefrightMetadataRetriever.h
Unescape View File

@ -26,7 +26,6 @@
namespace android {
class DataSource;
class MediaExtractor;
struct ImageDecoder;
struct FrameRect;

1
media/libstagefright/include/media/stagefright/InterfaceUtils.h
Unescape View File

@ -18,7 +18,6 @@
#define INTERFACE_UTILS_H_
#include <utils/RefBase.h>
#include <media/MediaExtractor.h>
#include <media/stagefright/RemoteMediaExtractor.h>
#include <media/MediaSource.h>
#include <media/IMediaExtractor.h>

0
media/libmediaextractor/include/media/MediaExtractor.h → media/libstagefright/include/media/stagefright/MediaExtractor.h
Unescape View File

1
media/libstagefright/include/media/stagefright/MediaExtractorFactory.h
Unescape View File

@ -21,7 +21,6 @@
#include <stdio.h>
#include <media/IMediaExtractor.h>
#include <media/MediaExtractor.h>
namespace android {

2
media/libstagefright/include/media/stagefright/RemoteMediaExtractor.h
Unescape View File

@ -18,7 +18,7 @@
#define REMOTE_MEDIA_EXTRACTOR_H_
#include <media/IMediaExtractor.h>
#include <media/MediaExtractor.h>
#include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/foundation/ABase.h>
namespace android {

1
services/mediaextractor/MediaExtractorService.cpp
Unescape View File

@ -21,7 +21,6 @@
#include <utils/Vector.h>
#include <media/DataSource.h>
#include <media/MediaExtractor.h>
#include <media/stagefright/DataSourceFactory.h>
#include <media/stagefright/InterfaceUtils.h>
#include <media/stagefright/MediaExtractorFactory.h>

Write Preview
Loading…
Cancel
Save