diff options
| author | rileya@chromium.org <rileya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 05:41:07 +0000 |
|---|---|---|
| committer | rileya@chromium.org <rileya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 05:41:07 +0000 |
| commit | 16ecd5f4f3edaf55179b1f3f3279fed9dc223bd3 (patch) | |
| tree | ce78115248e1cbf0c0b2204e5528cc72d1fd8838 /content/renderer/pepper | |
| parent | 923a2ab58248417ffa52c1291e28eaa0d5ae69ed (diff) | |
| download | chromium_src-16ecd5f4f3edaf55179b1f3f3279fed9dc223bd3.zip chromium_src-16ecd5f4f3edaf55179b1f3f3279fed9dc223bd3.tar.gz chromium_src-16ecd5f4f3edaf55179b1f3f3279fed9dc223bd3.tar.bz2 | |
Add channel_layout() and sample_rate() to AudioBuffer.
BUG=347270
Review URL: https://codereview.chromium.org/187023004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper')
| -rw-r--r-- | content/renderer/pepper/content_decryptor_delegate.cc | 5 | ||||
| -rw-r--r-- | content/renderer/pepper/content_decryptor_delegate.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc index 53ff21b..4cb4ddf 100644 --- a/content/renderer/pepper/content_decryptor_delegate.cc +++ b/content/renderer/pepper/content_decryptor_delegate.cc @@ -249,6 +249,7 @@ ContentDecryptorDelegate::ContentDecryptorDelegate( next_decryption_request_id_(1), audio_samples_per_second_(0), audio_channel_count_(0), + audio_channel_layout_(media::CHANNEL_LAYOUT_NONE), weak_ptr_factory_(this) { weak_this_ = weak_ptr_factory_.GetWeakPtr(); } @@ -418,6 +419,7 @@ bool ContentDecryptorDelegate::InitializeAudioDecoder( audio_samples_per_second_ = pp_decoder_config.samples_per_second; audio_channel_count_ = pp_decoder_config.channel_count; + audio_channel_layout_ = decoder_config.channel_layout(); scoped_refptr<PPB_Buffer_Impl> extra_data_resource; if (!MakeBufferResource(pp_instance_, @@ -1020,7 +1022,8 @@ bool ContentDecryptorDelegate::DeserializeAudioFrames( const int frame_count = frame_size / audio_bytes_per_frame; scoped_refptr<media::AudioBuffer> frame = media::AudioBuffer::CopyFrom( sample_format, - audio_channel_count_, + audio_channel_layout_, + audio_samples_per_second_, frame_count, &channel_ptrs[0], base::TimeDelta::FromMicroseconds(timestamp), diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h index c45351e..3fb1ee4 100644 --- a/content/renderer/pepper/content_decryptor_delegate.h +++ b/content/renderer/pepper/content_decryptor_delegate.h @@ -13,6 +13,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "media/base/channel_layout.h" #include "media/base/decryptor.h" #include "media/base/media_keys.h" #include "media/base/sample_format.h" @@ -211,6 +212,7 @@ class ContentDecryptorDelegate { // Keep track of audio parameters. int audio_samples_per_second_; int audio_channel_count_; + media::ChannelLayout audio_channel_layout_; base::WeakPtr<ContentDecryptorDelegate> weak_this_; base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_; |