commit fcc4e616260c4d286be4a0876df6596469a5a910
author Andy Hung <hunga@google.com> Thu Nov 15 15:07:19 2018 -0800
committer Andy Hung <hunga@google.com> Thu Nov 15 15:09:51 2018 -0800
tree 28a776ba6ee2fe7358a9b564d6fbaebe64d1c6c4
parent 2b674bbdfb1b30e5e10b42e776e5e44993d012b4

MediaExtractor: Update to use ndk binder

Test: HD Audio playback
Bug: 63770882
Bug: 110480091
Change-Id: I46c5cfe4fa7b485c352ec122bf2463a948ea5ddb

media/extractors/flac/Android.bp

diff --git a/media/extractors/flac/Android.bp b/media/extractors/flac/Android.bp
index 15feb4b..4d0a4cc 100644
--- a/media/extractors/flac/Android.bp
+++ b/media/extractors/flac/Android.bp
@@ -8,7 +8,7 @@
     ],
 
     shared_libs: [
-        "libbinder",
+        "libbinder_ndk",
         "liblog",
         "libmediaextractor",
         "libmediandk",

media/extractors/flac/FLACExtractor.cpp

diff --git a/media/extractors/flac/FLACExtractor.cpp b/media/extractors/flac/FLACExtractor.cpp
index 432486e..d54aaef 100644
--- a/media/extractors/flac/FLACExtractor.cpp
+++ b/media/extractors/flac/FLACExtractor.cpp
@@ -24,8 +24,8 @@
 // libFLAC parser
 #include "FLAC/stream_decoder.h"
 
+#include <android/binder_ibinder.h> // for AIBinder_getCallingUid
 #include <audio_utils/primitives.h>
-#include <binder/IPCThreadState.h> // for IPCThreadState
 #include <media/MediaExtractorPluginApi.h>
 #include <media/NdkMediaFormat.h>
 #include <media/stagefright/foundation/ABuffer.h>
@@ -48,7 +48,7 @@
 // (Note: duplicated with WAVExtractor.cpp)
 static inline bool shouldExtractorOutputFloat(int bitsPerSample)
 {
-    return bitsPerSample > 16 && IPCThreadState::self()->getCallingUid() == AID_MEDIA;
+    return bitsPerSample > 16 && AIBinder_getCallingUid() == AID_MEDIA;
 }
 
 class FLACParser;

media/extractors/wav/Android.bp

diff --git a/media/extractors/wav/Android.bp b/media/extractors/wav/Android.bp
index fdc05a8..185bb32 100644
--- a/media/extractors/wav/Android.bp
+++ b/media/extractors/wav/Android.bp
@@ -7,7 +7,7 @@
     ],
 
     shared_libs: [
-        "libbinder",
+        "libbinder_ndk",
         "liblog",
         "libmediaextractor",
         "libmediandk",

media/extractors/wav/WAVExtractor.cpp

diff --git a/media/extractors/wav/WAVExtractor.cpp b/media/extractors/wav/WAVExtractor.cpp
index 12fa7c9..86500ef 100644
--- a/media/extractors/wav/WAVExtractor.cpp
+++ b/media/extractors/wav/WAVExtractor.cpp
@@ -20,8 +20,8 @@
 
 #include "WAVExtractor.h"
 
+#include <android/binder_ibinder.h> // for AIBinder_getCallingUid
 #include <audio_utils/primitives.h>
-#include <binder/IPCThreadState.h> // for IPCThreadState
 #include <media/DataSourceBase.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <media/stagefright/MediaBufferGroup.h>
@@ -45,7 +45,7 @@
 // (Note: duplicated with FLACExtractor.cpp)
 static inline bool shouldExtractorOutputFloat(int bitsPerSample)
 {
-    return bitsPerSample > 16 && IPCThreadState::self()->getCallingUid() == AID_MEDIA;
+    return bitsPerSample > 16 && AIBinder_getCallingUid() == AID_MEDIA;
 }
 
 enum {