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

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: Back to the original approach, but with working splicer timestamps. 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
« no previous file with comments | « no previous file | media/base/audio_buffer_converter.h » ('j') | media/base/audio_buffer_converter.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 filter_collection->SetDemuxer(demuxer_.get()); 1158 filter_collection->SetDemuxer(demuxer_.get());
1158 1159
1159 media::SetDecryptorReadyCB set_decryptor_ready_cb = 1160 media::SetDecryptorReadyCB set_decryptor_ready_cb =
1160 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB); 1161 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB);
1161 1162
1162 // Create our audio decoders and renderer. 1163 // Create our audio decoders and renderer.
1163 ScopedVector<media::AudioDecoder> audio_decoders; 1164 ScopedVector<media::AudioDecoder> audio_decoders;
1164 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_)); 1165 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_));
1165 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_)); 1166 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_));
1166 1167
1167 scoped_ptr<media::AudioRenderer> audio_renderer( 1168 scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl(
1168 new media::AudioRendererImpl(media_loop_, 1169 media_loop_,
1169 audio_source_provider_.get(), 1170 audio_source_provider_.get(),
1170 audio_decoders.Pass(), 1171 audio_decoders.Pass(),
1171 set_decryptor_ready_cb)); 1172 set_decryptor_ready_cb,
1173 *RenderThreadImpl::current()->GetAudioHardwareConfig()));
1172 filter_collection->SetAudioRenderer(audio_renderer.Pass()); 1174 filter_collection->SetAudioRenderer(audio_renderer.Pass());
1173 1175
1174 // Create our video decoders and renderer. 1176 // Create our video decoders and renderer.
1175 ScopedVector<media::VideoDecoder> video_decoders; 1177 ScopedVector<media::VideoDecoder> video_decoders;
1176 1178
1177 if (gpu_factories_.get()) { 1179 if (gpu_factories_.get()) {
1178 video_decoders.push_back( 1180 video_decoders.push_back(
1179 new media::GpuVideoDecoder(gpu_factories_, media_log_)); 1181 new media::GpuVideoDecoder(gpu_factories_, media_log_));
1180 } 1182 }
1181 1183
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 1314
1313 if (web_cdm_) { 1315 if (web_cdm_) {
1314 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); 1316 decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
1315 return; 1317 return;
1316 } 1318 }
1317 1319
1318 decryptor_ready_cb_ = decryptor_ready_cb; 1320 decryptor_ready_cb_ = decryptor_ready_cb;
1319 } 1321 }
1320 1322
1321 } // namespace content 1323 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/audio_buffer_converter.h » ('j') | media/base/audio_buffer_converter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698