diff options
Diffstat (limited to 'media/libaah_rtp')
| -rw-r--r-- | media/libaah_rtp/aah_decoder_pump.cpp | 5 | ||||
| -rw-r--r-- | media/libaah_rtp/aah_decoder_pump.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/media/libaah_rtp/aah_decoder_pump.cpp b/media/libaah_rtp/aah_decoder_pump.cpp index 28b8c7b..bebba54 100644 --- a/media/libaah_rtp/aah_decoder_pump.cpp +++ b/media/libaah_rtp/aah_decoder_pump.cpp @@ -105,9 +105,8 @@ void AAH_DecoderPump::queueToRenderer(MediaBuffer* decoded_sample) { AudioTrack::getMinFrameCount(&frameCount, AUDIO_STREAM_DEFAULT, static_cast<int>(format_sample_rate_)); - int ch_format = (format_channels_ == 1) - ? AUDIO_CHANNEL_OUT_MONO - : AUDIO_CHANNEL_OUT_STEREO; + audio_channel_mask_t ch_format = + audio_channel_out_mask_from_count(format_channels_); res = renderer_->set(AUDIO_STREAM_DEFAULT, format_sample_rate_, diff --git a/media/libaah_rtp/aah_decoder_pump.h b/media/libaah_rtp/aah_decoder_pump.h index f5a6529..4d57e49 100644 --- a/media/libaah_rtp/aah_decoder_pump.h +++ b/media/libaah_rtp/aah_decoder_pump.h @@ -75,7 +75,7 @@ class AAH_DecoderPump : public MediaSource { void stopAndCleanupRenderer(); sp<MetaData> format_; - int32_t format_channels_; + int32_t format_channels_; // channel count, not channel mask int32_t format_sample_rate_; sp<MediaSource> decoder_; |