diff options
| author | Dongwon Kang <dwkang@google.com> | 2017-10-11 11:52:33 -0700 |
|---|---|---|
| committer | Dongwon Kang <dwkang@google.com> | 2017-10-12 21:44:30 -0700 |
| commit | 70d2ba3c06829dd8d7316bea7bd1b8bfbf4b8123 (patch) | |
| tree | c449d2471688080fd4ce26b0fa0f94a432db1bfb /media/jni/android_media_MediaExtractor.cpp | |
| parent | 1b904bb00b386ef6ebb3d7839094d5e7dda114f9 (diff) | |
Remove libmedia and libstagefright dependency from extractors
- MediaSource, DataSource and MediaExtractor are moved to
libmediaextractor so that they can be used by extractor
implementations without depending on libmedia and libstagefright.
- XXXFactory classes has been added in order not to expose CreateXXX
methods in libmediaextractor.
- avc_utils is moved to libstagefright_foundation since most of
extractor implementations are relying on that.
Test: build
Bug: 65851881
Change-Id: Idba410c3dc0abbfb4d73c186d44b5069cdb5780f
Diffstat (limited to 'media/jni/android_media_MediaExtractor.cpp')
| -rw-r--r-- | media/jni/android_media_MediaExtractor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp index d2fa8f5f4c2a..5c90d0020d61 100644 --- a/media/jni/android_media_MediaExtractor.cpp +++ b/media/jni/android_media_MediaExtractor.cpp @@ -37,7 +37,8 @@ #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> -#include <media/stagefright/DataSource.h> +#include <media/DataSource.h> +#include <media/stagefright/InterfaceUtils.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/NuMediaExtractor.h> @@ -744,7 +745,7 @@ static void android_media_MediaExtractor_setDataSourceCallback( } sp<DataSource> bridge = - DataSource::CreateFromIDataSource(new JMediaDataSource(env, callbackObj)); + CreateDataSourceFromIDataSource(new JMediaDataSource(env, callbackObj)); status_t err = extractor->setDataSource(bridge); if (err != OK) { |