| OLD | NEW |
| 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 Loading... |
| 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 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1158 filter_collection->SetDemuxer(demuxer_.get()); | 1159 filter_collection->SetDemuxer(demuxer_.get()); |
| 1159 | 1160 |
| 1160 media::SetDecryptorReadyCB set_decryptor_ready_cb = | 1161 media::SetDecryptorReadyCB set_decryptor_ready_cb = |
| 1161 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB); | 1162 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB); |
| 1162 | 1163 |
| 1163 // Create our audio decoders and renderer. | 1164 // Create our audio decoders and renderer. |
| 1164 ScopedVector<media::AudioDecoder> audio_decoders; | 1165 ScopedVector<media::AudioDecoder> audio_decoders; |
| 1165 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_)); | 1166 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_)); |
| 1166 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_)); | 1167 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_)); |
| 1167 | 1168 |
| 1168 scoped_ptr<media::AudioRenderer> audio_renderer( | 1169 scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl( |
| 1169 new media::AudioRendererImpl(media_loop_, | 1170 media_loop_, |
| 1170 audio_source_provider_.get(), | 1171 audio_source_provider_.get(), |
| 1171 audio_decoders.Pass(), | 1172 audio_decoders.Pass(), |
| 1172 set_decryptor_ready_cb)); | 1173 set_decryptor_ready_cb, |
| 1174 RenderThreadImpl::current()->GetAudioHardwareConfig())); |
| 1173 filter_collection->SetAudioRenderer(audio_renderer.Pass()); | 1175 filter_collection->SetAudioRenderer(audio_renderer.Pass()); |
| 1174 | 1176 |
| 1175 // Create our video decoders and renderer. | 1177 // Create our video decoders and renderer. |
| 1176 ScopedVector<media::VideoDecoder> video_decoders; | 1178 ScopedVector<media::VideoDecoder> video_decoders; |
| 1177 | 1179 |
| 1178 if (gpu_factories_.get()) { | 1180 if (gpu_factories_.get()) { |
| 1179 video_decoders.push_back( | 1181 video_decoders.push_back( |
| 1180 new media::GpuVideoDecoder(gpu_factories_, media_log_)); | 1182 new media::GpuVideoDecoder(gpu_factories_, media_log_)); |
| 1181 } | 1183 } |
| 1182 | 1184 |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1313 | 1315 |
| 1314 if (web_cdm_) { | 1316 if (web_cdm_) { |
| 1315 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); | 1317 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); |
| 1316 return; | 1318 return; |
| 1317 } | 1319 } |
| 1318 | 1320 |
| 1319 decryptor_ready_cb_ = decryptor_ready_cb; | 1321 decryptor_ready_cb_ = decryptor_ready_cb; |
| 1320 } | 1322 } |
| 1321 | 1323 |
| 1322 } // namespace content | 1324 } // namespace content |
| OLD | NEW |