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

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

Issue 19534002: Make RendererGpuVideoDecoderFactories live on arbitrary threads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review comments Created 7 years, 5 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 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 new media::AudioRendererImpl(media_loop_, 1091 new media::AudioRendererImpl(media_loop_,
1092 audio_source_provider_.get(), 1092 audio_source_provider_.get(),
1093 audio_decoders.Pass(), 1093 audio_decoders.Pass(),
1094 set_decryptor_ready_cb, 1094 set_decryptor_ready_cb,
1095 increase_preroll_on_underflow)); 1095 increase_preroll_on_underflow));
1096 filter_collection->SetAudioRenderer(audio_renderer.Pass()); 1096 filter_collection->SetAudioRenderer(audio_renderer.Pass());
1097 1097
1098 // Create our video decoders and renderer. 1098 // Create our video decoders and renderer.
1099 ScopedVector<media::VideoDecoder> video_decoders; 1099 ScopedVector<media::VideoDecoder> video_decoders;
1100 1100
1101 if (gpu_factories_.get()) { 1101 if (gpu_factories_.get())
1102 video_decoders.push_back(new media::GpuVideoDecoder( 1102 video_decoders.push_back(new media::GpuVideoDecoder(gpu_factories_));
1103 media_loop_, gpu_factories_));
1104 }
1105 1103
1106 // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released 1104 // TODO(phajdan.jr): Remove ifdefs when libvpx with vp9 support is released
1107 // (http://crbug.com/174287) . 1105 // (http://crbug.com/174287) .
1108 #if !defined(MEDIA_DISABLE_LIBVPX) 1106 #if !defined(MEDIA_DISABLE_LIBVPX)
1109 video_decoders.push_back(new media::VpxVideoDecoder(media_loop_)); 1107 video_decoders.push_back(new media::VpxVideoDecoder(media_loop_));
1110 #endif // !defined(MEDIA_DISABLE_LIBVPX) 1108 #endif // !defined(MEDIA_DISABLE_LIBVPX)
1111 1109
1112 video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_)); 1110 video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_));
1113 1111
1114 scoped_ptr<media::VideoRenderer> video_renderer( 1112 scoped_ptr<media::VideoRenderer> video_renderer(
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 1235
1238 if (pending_repaint_) 1236 if (pending_repaint_)
1239 return; 1237 return;
1240 1238
1241 pending_repaint_ = true; 1239 pending_repaint_ = true;
1242 main_loop_->PostTask(FROM_HERE, base::Bind( 1240 main_loop_->PostTask(FROM_HERE, base::Bind(
1243 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); 1241 &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
1244 } 1242 }
1245 1243
1246 } // namespace content 1244 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698