commit 3d33752706b026629132f4ef2d1f0e7c1c38bd94
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:27:08 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:27:08 2020 +0000
tree d073c5f6f285c85dd7100ae92ad035c0d10160c5
parent 5fceb86925dfdd7bb0418caf11a3d6791ca8c16c
parent 1ddc48b76a494bb1a346db3ac21ee9a10f4fe24f

Snap for 6439596 from 1ddc48b76a494bb1a346db3ac21ee9a10f4fe24f to qt-aml-tzdata-release

Change-Id: I7b962bf3c0ee35c54a6ac742e9b3a179b1bd58a2

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index 6502fca..b97b66d 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -214,11 +214,10 @@
         "liblog",
         "libutils",
         "libmedia",
-        "libmedia_codeclist",
+        "libmedia_omx",
         "libaudioclient",
         "libaudiomanager",
         "libbinder",
-        "libdatasource",
         "libstagefright",
         "libstagefright_foundation",
         "libgui",

src/android/android_AudioSfDecoder.cpp

diff --git a/src/android/android_AudioSfDecoder.cpp b/src/android/android_AudioSfDecoder.cpp
index 0accb80..8620bf0 100644
--- a/src/android/android_AudioSfDecoder.cpp
+++ b/src/android/android_AudioSfDecoder.cpp
@@ -21,17 +21,13 @@
 #include "android/channels.h"
 
 #include <binder/IServiceManager.h>
-#include <datasource/DataSourceFactory.h>
-#include <datasource/FileSource.h>
-#include <datasource/NuCachedSource2.h>
 #include <media/IMediaHTTPService.h>
 #include <media/stagefright/foundation/ADebug.h>
+#include <media/stagefright/DataSourceFactory.h>
 #include <media/stagefright/InterfaceUtils.h>
 #include <media/stagefright/MediaBuffer.h>
 #include <media/stagefright/MediaExtractorFactory.h>
-#include <media/stagefright/MetaData.h>
 #include <media/stagefright/SimpleDecodingSource.h>
-#include <media/stagefright/foundation/MediaDefs.h>
 
 
 #define SIZE_CACHED_HIGH_BYTES 1000000
@@ -200,7 +196,7 @@
         return;
 
     case kDataLocatorUri:
-        dataSource = DataSourceFactory::getInstance()->CreateFromURI(
+        dataSource = DataSourceFactory::CreateFromURI(
                 NULL /* XXX httpService */, mDataLocator.uriRef);
         if (dataSource == NULL) {
             SL_LOGE("AudioSfDecoder::onPrepare(): Error opening %s", mDataLocator.uriRef);

src/android/android_AudioSfDecoder.h

diff --git a/src/android/android_AudioSfDecoder.h b/src/android/android_AudioSfDecoder.h
index 3a75644..0043539 100644
--- a/src/android/android_AudioSfDecoder.h
+++ b/src/android/android_AudioSfDecoder.h
@@ -19,6 +19,11 @@
 
 #include <media/DataSource.h>
 #include <media/MediaSource.h>
+#include <media/stagefright/FileSource.h>
+#include <media/stagefright/MediaDefs.h>
+#include <media/stagefright/MetaData.h>
+#include "NuCachedSource2.h"
+#include "ThrottledSource.h"
 
 #include "android_GenericPlayer.h"