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

Commit c25db930 authored by Tomoharu Kasahara's avatar Tomoharu Kasahara Committed by android-build-merger
Browse files

Merge "Use channel count for CHANNEL_MASK_USE_CHANNEL_ORDER" am: 413b0b22 am: 3cebe702 

am: 75efb617

Change-Id: Id8f4fab9c57d2621987b93a0755caad3bcef6aab
parents d3128388 75efb617

media/libstagefright/Utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1800,7 +1800,7 @@ bool canOffloadStream(const sp<MetaData>& meta, bool hasVideo, 
    info.sample_rate = srate;



    int32_t cmask = 0;

    if (!meta->findInt32(kKeyChannelMask, &cmask)) {

    if (!meta->findInt32(kKeyChannelMask, &cmask) || cmask == CHANNEL_MASK_USE_CHANNEL_ORDER) {

        ALOGV("track of type '%s' does not publish channel mask", mime);



        // Try a channel count instead