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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 177333003: Add support for midstream audio configuration changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ABS
Patch Set: Created 6 years, 9 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webmediaplayer_impl.h" 5 #include "content/renderer/media/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 22 matching lines...) Expand all
33 #include "content/renderer/media/webinbandtexttrack_impl.h" 33 #include "content/renderer/media/webinbandtexttrack_impl.h"
34 #include "content/renderer/media/webmediaplayer_delegate.h" 34 #include "content/renderer/media/webmediaplayer_delegate.h"
35 #include "content/renderer/media/webmediaplayer_params.h" 35 #include "content/renderer/media/webmediaplayer_params.h"
36 #include "content/renderer/media/webmediaplayer_util.h" 36 #include "content/renderer/media/webmediaplayer_util.h"
37 #include "content/renderer/media/webmediasource_impl.h" 37 #include "content/renderer/media/webmediasource_impl.h"
38 #include "content/renderer/pepper/pepper_webplugin_impl.h" 38 #include "content/renderer/pepper/pepper_webplugin_impl.h"
39 #include "content/renderer/render_thread_impl.h" 39 #include "content/renderer/render_thread_impl.h"
40 #include "gpu/GLES2/gl2extchromium.h" 40 #include "gpu/GLES2/gl2extchromium.h"
41 #include "gpu/command_buffer/common/mailbox_holder.h" 41 #include "gpu/command_buffer/common/mailbox_holder.h"
42 #include "media/audio/null_audio_sink.h" 42 #include "media/audio/null_audio_sink.h"
43 #include "media/base/audio_hardware_config.h"
43 #include "media/base/bind_to_current_loop.h" 44 #include "media/base/bind_to_current_loop.h"
44 #include "media/base/filter_collection.h" 45 #include "media/base/filter_collection.h"
45 #include "media/base/limits.h" 46 #include "media/base/limits.h"
46 #include "media/base/media_log.h" 47 #include "media/base/media_log.h"
47 #include "media/base/media_switches.h" 48 #include "media/base/media_switches.h"
48 #include "media/base/pipeline.h" 49 #include "media/base/pipeline.h"
49 #include "media/base/text_renderer.h" 50 #include "media/base/text_renderer.h"
50 #include "media/base/video_frame.h" 51 #include "media/base/video_frame.h"
51 #include "media/filters/audio_renderer_impl.h" 52 #include "media/filters/audio_renderer_impl.h"
52 #include "media/filters/chunk_demuxer.h" 53 #include "media/filters/chunk_demuxer.h"
(...skipping 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 filter_collection->SetDemuxer(demuxer_.get()); 1167 filter_collection->SetDemuxer(demuxer_.get());
1167 1168
1168 media::SetDecryptorReadyCB set_decryptor_ready_cb = 1169 media::SetDecryptorReadyCB set_decryptor_ready_cb =
1169 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB); 1170 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB);
1170 1171
1171 // Create our audio decoders and renderer. 1172 // Create our audio decoders and renderer.
1172 ScopedVector<media::AudioDecoder> audio_decoders; 1173 ScopedVector<media::AudioDecoder> audio_decoders;
1173 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_)); 1174 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_));
1174 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_)); 1175 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_));
1175 1176
1176 scoped_ptr<media::AudioRenderer> audio_renderer( 1177 scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl(
1177 new media::AudioRendererImpl(media_loop_, 1178 media_loop_,
1178 audio_source_provider_.get(), 1179 audio_source_provider_.get(),
1179 audio_decoders.Pass(), 1180 audio_decoders.Pass(),
1180 set_decryptor_ready_cb)); 1181 set_decryptor_ready_cb,
1182 *RenderThreadImpl::current()->GetAudioHardwareConfig()));
1181 filter_collection->SetAudioRenderer(audio_renderer.Pass()); 1183 filter_collection->SetAudioRenderer(audio_renderer.Pass());
1182 1184
1183 // Create our video decoders and renderer. 1185 // Create our video decoders and renderer.
1184 ScopedVector<media::VideoDecoder> video_decoders; 1186 ScopedVector<media::VideoDecoder> video_decoders;
1185 1187
1186 if (gpu_factories_.get()) { 1188 if (gpu_factories_.get()) {
1187 video_decoders.push_back( 1189 video_decoders.push_back(
1188 new media::GpuVideoDecoder(gpu_factories_, media_log_)); 1190 new media::GpuVideoDecoder(gpu_factories_, media_log_));
1189 } 1191 }
1190 1192
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 1325
1324 if (web_cdm_) { 1326 if (web_cdm_) {
1325 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); 1327 decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
1326 return; 1328 return;
1327 } 1329 }
1328 1330
1329 decryptor_ready_cb_ = decryptor_ready_cb; 1331 decryptor_ready_cb_ = decryptor_ready_cb;
1330 } 1332 }
1331 1333
1332 } // namespace content 1334 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/audio_buffer_converter.h » ('j') | media/base/audio_buffer_converter_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698