Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcc4e616 authored by Andy Hung's avatar Andy Hung
Browse files

MediaExtractor: Update to use ndk binder 

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

media/extractors/flac/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ cc_library_shared { 
    ],

    ],





    shared_libs: [

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "liblog",

        "liblog",

        "libmediaextractor",

        "libmediaextractor",

        "libmediandk",

        "libmediandk",

media/extractors/flac/FLACExtractor.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,8 @@ 
// libFLAC parser

// libFLAC parser

#include "FLAC/stream_decoder.h"

#include "FLAC/stream_decoder.h"





#include <android/binder_ibinder.h> // for AIBinder_getCallingUid

#include <audio_utils/primitives.h>

#include <audio_utils/primitives.h>

#include <binder/IPCThreadState.h> // for IPCThreadState

#include <media/MediaExtractorPluginApi.h>

#include <media/MediaExtractorPluginApi.h>

#include <media/NdkMediaFormat.h>

#include <media/NdkMediaFormat.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ABuffer.h>
@@ -48,7 +48,7 @@ namespace android { 
// (Note: duplicated with WAVExtractor.cpp)

// (Note: duplicated with WAVExtractor.cpp)

static inline bool shouldExtractorOutputFloat(int bitsPerSample)

static inline bool shouldExtractorOutputFloat(int bitsPerSample)

{

{

    return bitsPerSample > 16 && IPCThreadState::self()->getCallingUid() == AID_MEDIA;

    return bitsPerSample > 16 && AIBinder_getCallingUid() == AID_MEDIA;

}

}





class FLACParser;

class FLACParser;

media/extractors/wav/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ cc_library_shared { 
    ],

    ],





    shared_libs: [

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "liblog",

        "liblog",

        "libmediaextractor",

        "libmediaextractor",

        "libmediandk",

        "libmediandk",

media/extractors/wav/WAVExtractor.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -20,8 +20,8 @@ 




#include "WAVExtractor.h"

#include "WAVExtractor.h"





#include <android/binder_ibinder.h> // for AIBinder_getCallingUid

#include <audio_utils/primitives.h>

#include <audio_utils/primitives.h>

#include <binder/IPCThreadState.h> // for IPCThreadState

#include <media/DataSourceBase.h>

#include <media/DataSourceBase.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaBufferGroup.h>
@@ -45,7 +45,7 @@ namespace android { 
// (Note: duplicated with FLACExtractor.cpp)

// (Note: duplicated with FLACExtractor.cpp)

static inline bool shouldExtractorOutputFloat(int bitsPerSample)

static inline bool shouldExtractorOutputFloat(int bitsPerSample)

{

{

    return bitsPerSample > 16 && IPCThreadState::self()->getCallingUid() == AID_MEDIA;

    return bitsPerSample > 16 && AIBinder_getCallingUid() == AID_MEDIA;

}

}





enum {

enum {