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

Commit 798580bf authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge changes Iaa3f64f7,I890d2e23 am: 7b86ff35 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1340014

Change-Id: If7ccfd8fdb54707a8c48afb21c187b5129f9103f
parents 1e1bc0ab 7b86ff35

media/libstagefright/Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -139,8 +139,10 @@ cc_library_static { 


    header_libs: [

        "libaudioclient_headers",

        "libmedia_headers",

        "libbase_headers",

        "libmedia_datasource_headers",

        "media_ndk_headers",

        "media_plugin_headers",

    ],



    cflags: [
@@ -157,6 +159,18 @@ cc_library_static { 
            "signed-integer-overflow",

        ],

    },



    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        },

        linux: {

            cflags: [

                "-DDISABLE_AUDIO_SYSTEM_OFFLOAD",

            ],

        }

    },

}



cc_library {

media/libstagefright/Utils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -2075,7 +2075,11 @@ bool canOffloadStream(const sp<MetaData>& meta, bool hasVideo, 
    }

    // Check if offload is possible for given format, stream type, sample rate,

    // bit rate, duration, video and streaming

#ifdef DISABLE_AUDIO_SYSTEM_OFFLOAD

    return false;

#else

    return AudioSystem::isOffloadSupported(info);

#endif

}



HLSTime::HLSTime(const sp<AMessage>& meta) :