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

Commit 97eccce3 authored by Marco Nelissen's avatar Marco Nelissen Committed by Automerger Merge Worker
Browse files

Merge "extractors: allow OEM to control output type for WAV/FLAC" into rvc-dev am: ea67cca9 

Change-Id: I2ecde38cb30b153850730abdb7f4ee22abcd9d2f
parents efc3f0fe ea67cca9

media/extractors/flac/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ cc_library { 
    ],



    shared_libs: [

        "libbase",

        "libbinder_ndk",

    ],

media/extractors/flac/FLACExtractor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
// libFLAC parser

#include "FLAC/stream_decoder.h"



#include <android-base/properties.h>

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

#include <audio_utils/primitives.h>

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

static inline bool shouldExtractorOutputFloat(int bitsPerSample)

{

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

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

                              && android::base::GetBoolProperty("media.extractor.float", true);

}



class FLACParser;

media/extractors/wav/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ cc_library { 
    ],



    shared_libs: [

        "libbase",

        "libbinder_ndk",

    ],

media/extractors/wav/WAVExtractor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "WAVExtractor.h"



#include <android-base/properties.h>

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

#include <audio_utils/primitives.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -43,7 +44,8 @@ namespace android { 
// (Note: duplicated with FLACExtractor.cpp)

static inline bool shouldExtractorOutputFloat(int bitsPerSample)

{

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

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

                              && android::base::GetBoolProperty("media.extractor.float", true);

}



enum {