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

Commit 4a3d8d84 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "libmedia: Fix channelMaskFromString function" into oc-mr1-dev 

am: 0a182255

Change-Id: I3f37ea5a40c722de384fa6a72067544a890954fb
parents 77211cbb 0a182255

media/libmedia/TypeConverter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ audio_format_t formatFromString(const std::string &literalFormat, audio_format_t 
audio_channel_mask_t channelMaskFromString(const std::string &literalChannels)

{

    audio_channel_mask_t channels;

    if (!OutputChannelConverter::fromString(literalChannels, channels) ||

    if (!OutputChannelConverter::fromString(literalChannels, channels) &&

            !InputChannelConverter::fromString(literalChannels, channels)) {

        return AUDIO_CHANNEL_INVALID;

    }