| 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 21 matching lines...) Expand all Loading... |
| 32 #include "content/renderer/media/webinbandtexttrack_impl.h" | 32 #include "content/renderer/media/webinbandtexttrack_impl.h" |
| 33 #include "content/renderer/media/webmediaplayer_delegate.h" | 33 #include "content/renderer/media/webmediaplayer_delegate.h" |
| 34 #include "content/renderer/media/webmediaplayer_params.h" | 34 #include "content/renderer/media/webmediaplayer_params.h" |
| 35 #include "content/renderer/media/webmediaplayer_util.h" | 35 #include "content/renderer/media/webmediaplayer_util.h" |
| 36 #include "content/renderer/media/webmediasource_impl.h" | 36 #include "content/renderer/media/webmediasource_impl.h" |
| 37 #include "content/renderer/pepper/pepper_webplugin_impl.h" | 37 #include "content/renderer/pepper/pepper_webplugin_impl.h" |
| 38 #include "content/renderer/render_thread_impl.h" | 38 #include "content/renderer/render_thread_impl.h" |
| 39 #include "gpu/GLES2/gl2extchromium.h" | 39 #include "gpu/GLES2/gl2extchromium.h" |
| 40 #include "gpu/command_buffer/common/mailbox_holder.h" | 40 #include "gpu/command_buffer/common/mailbox_holder.h" |
| 41 #include "media/audio/null_audio_sink.h" | 41 #include "media/audio/null_audio_sink.h" |
| 42 #include "media/base/audio_hardware_config.h" |
| 42 #include "media/base/bind_to_current_loop.h" | 43 #include "media/base/bind_to_current_loop.h" |
| 43 #include "media/base/filter_collection.h" | 44 #include "media/base/filter_collection.h" |
| 44 #include "media/base/limits.h" | 45 #include "media/base/limits.h" |
| 45 #include "media/base/media_log.h" | 46 #include "media/base/media_log.h" |
| 46 #include "media/base/media_switches.h" | 47 #include "media/base/media_switches.h" |
| 47 #include "media/base/pipeline.h" | 48 #include "media/base/pipeline.h" |
| 48 #include "media/base/text_renderer.h" | 49 #include "media/base/text_renderer.h" |
| 49 #include "media/base/video_frame.h" | 50 #include "media/base/video_frame.h" |
| 50 #include "media/filters/audio_renderer_impl.h" | 51 #include "media/filters/audio_renderer_impl.h" |
| 51 #include "media/filters/chunk_demuxer.h" | 52 #include "media/filters/chunk_demuxer.h" |
| (...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1171 ScopedVector<media::AudioDecoder> audio_decoders; | 1172 ScopedVector<media::AudioDecoder> audio_decoders; |
| 1172 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_)); | 1173 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_)); |
| 1173 if (!cmd_line->HasSwitch(switches::kDisableOpusPlayback)) { | 1174 if (!cmd_line->HasSwitch(switches::kDisableOpusPlayback)) { |
| 1174 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_)); | 1175 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_)); |
| 1175 } | 1176 } |
| 1176 | 1177 |
| 1177 scoped_ptr<media::AudioRenderer> audio_renderer( | 1178 scoped_ptr<media::AudioRenderer> audio_renderer( |
| 1178 new media::AudioRendererImpl(media_loop_, | 1179 new media::AudioRendererImpl(media_loop_, |
| 1179 audio_source_provider_.get(), | 1180 audio_source_provider_.get(), |
| 1180 audio_decoders.Pass(), | 1181 audio_decoders.Pass(), |
| 1181 set_decryptor_ready_cb)); | 1182 set_decryptor_ready_cb, |
| 1183 *RenderThreadImpl::current() |
| 1184 ->GetAudioHardwareConfig())); |
| 1182 filter_collection->SetAudioRenderer(audio_renderer.Pass()); | 1185 filter_collection->SetAudioRenderer(audio_renderer.Pass()); |
| 1183 | 1186 |
| 1184 // Create our video decoders and renderer. | 1187 // Create our video decoders and renderer. |
| 1185 ScopedVector<media::VideoDecoder> video_decoders; | 1188 ScopedVector<media::VideoDecoder> video_decoders; |
| 1186 | 1189 |
| 1187 if (gpu_factories_.get()) { | 1190 if (gpu_factories_.get()) { |
| 1188 video_decoders.push_back( | 1191 video_decoders.push_back( |
| 1189 new media::GpuVideoDecoder(gpu_factories_, media_log_)); | 1192 new media::GpuVideoDecoder(gpu_factories_, media_log_)); |
| 1190 } | 1193 } |
| 1191 | 1194 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1324 | 1327 |
| 1325 if (web_cdm_) { | 1328 if (web_cdm_) { |
| 1326 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); | 1329 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); |
| 1327 return; | 1330 return; |
| 1328 } | 1331 } |
| 1329 | 1332 |
| 1330 decryptor_ready_cb_ = decryptor_ready_cb; | 1333 decryptor_ready_cb_ = decryptor_ready_cb; |
| 1331 } | 1334 } |
| 1332 | 1335 |
| 1333 } // namespace content | 1336 } // namespace content |
| OLD | NEW |