diff options
author | Amit Shekhar <ashekhar@codeaurora.org> | 2015-12-08 20:41:24 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-12-19 02:46:24 -0500 |
commit | d5dee706a6f0a0b5a4a65e8e128131f06d572e6b (patch) | |
tree | 1baacd9444cdea696002528d9b50831d84743afb /media/libstagefright/Utils.cpp | |
parent | e93c7cc0c6df169119fd59d20fab0182fb6406f6 (diff) | |
download | frameworks_av-d5dee706a6f0a0b5a4a65e8e128131f06d572e6b.zip frameworks_av-d5dee706a6f0a0b5a4a65e8e128131f06d572e6b.tar.gz frameworks_av-d5dee706a6f0a0b5a4a65e8e128131f06d572e6b.tar.bz2 |
frameworks/av: fix channelmask and source format for pcm files
-Update channel mask from channel count if parser reports channel mask to be 0
-Update source format for each buffer by extending call to setPcmFormat when
aggregation is not done
Change-Id: I1f4ce07e3e784d85e63be03a69ac1395bfa913e2
CRs-Fixed: 948222
Diffstat (limited to 'media/libstagefright/Utils.cpp')
-rw-r--r-- | media/libstagefright/Utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp index e9d585f..592510b 100644 --- a/media/libstagefright/Utils.cpp +++ b/media/libstagefright/Utils.cpp @@ -893,7 +893,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) || 0 == cmask) { ALOGV("track of type '%s' does not publish channel mask", mime); // Try a channel count instead |