Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(826)

Unified Diff: media/base/audio_buffer.cc

Issue 1422113002: Enable pcm_s32le audio decoding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: DEPS roll Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromecast/public/media/decoder_config.h ('k') | media/base/audio_buffer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_buffer.cc
diff --git a/media/base/audio_buffer.cc b/media/base/audio_buffer.cc
index 564cff156bbb7f5defa7067439731a1efa44c500..115efa51f3fb4f9c0236d56b3b85c63a88d22e33 100644
--- a/media/base/audio_buffer.cc
+++ b/media/base/audio_buffer.cc
@@ -317,6 +317,7 @@ void ReadFramesInterleaved(const std::vector<uint8*>& channel_data,
InterleaveAndConvert<int16, Dest>(
channel_data, frames_to_copy * channel_count, trim_start, dest_data);
break;
+ case kSampleFormatS24:
case kSampleFormatS32:
InterleaveAndConvert<int32, Dest>(
channel_data, frames_to_copy * channel_count, trim_start, dest_data);
@@ -404,6 +405,7 @@ void AudioBuffer::TrimRange(int start, int end) {
break;
case kSampleFormatU8:
case kSampleFormatS16:
+ case kSampleFormatS24:
case kSampleFormatS32:
case kSampleFormatF32: {
// Interleaved data can be shifted all at once.
« no previous file with comments | « chromecast/public/media/decoder_config.h ('k') | media/base/audio_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698