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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 22875030: Run |demuxer_| related tasks in the media thread in GTV. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Aaron's comments. Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3035 matching lines...) Expand 10 before | Expand all | Expand 10 after
3046 } 3046 }
3047 3047
3048 scoped_ptr<WebMediaPlayerAndroid> web_media_player_android( 3048 scoped_ptr<WebMediaPlayerAndroid> web_media_player_android(
3049 new WebMediaPlayerAndroid( 3049 new WebMediaPlayerAndroid(
3050 frame, 3050 frame,
3051 client, 3051 client,
3052 AsWeakPtr(), 3052 AsWeakPtr(),
3053 media_player_manager_.get(), 3053 media_player_manager_.get(),
3054 media_player_proxy_, 3054 media_player_proxy_,
3055 stream_texture_factory.release(), 3055 stream_texture_factory.release(),
3056 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
3056 new RenderMediaLog())); 3057 new RenderMediaLog()));
3057 #if defined(ENABLE_WEBRTC) && defined(GOOGLE_TV) 3058 #if defined(ENABLE_WEBRTC) && defined(GOOGLE_TV)
3058 if (media_stream_client_->IsMediaStream(url)) { 3059 if (media_stream_client_->IsMediaStream(url)) {
3059 RTCVideoDecoderFactoryTv* factory = RenderThreadImpl::current() 3060 RTCVideoDecoderFactoryTv* factory = RenderThreadImpl::current()
3060 ->GetMediaStreamDependencyFactory()->decoder_factory_tv(); 3061 ->GetMediaStreamDependencyFactory()->decoder_factory_tv();
3061 // |media_stream_client| and |factory| outlives |web_media_player_android|. 3062 // |media_stream_client| and |factory| outlives |web_media_player_android|.
3062 if (!factory->AcquireDemuxer() || 3063 if (!factory->AcquireDemuxer() ||
3063 !web_media_player_android->InjectMediaStream( 3064 !web_media_player_android->InjectMediaStream(
3064 media_stream_client_, 3065 media_stream_client_,
3065 factory, 3066 factory,
(...skipping 3471 matching lines...) Expand 10 before | Expand all | Expand 10 after
6537 WebURL url = icon_urls[i].iconURL(); 6538 WebURL url = icon_urls[i].iconURL();
6538 if (!url.isEmpty()) 6539 if (!url.isEmpty())
6539 urls.push_back(FaviconURL(url, 6540 urls.push_back(FaviconURL(url,
6540 ToFaviconType(icon_urls[i].iconType()))); 6541 ToFaviconType(icon_urls[i].iconType())));
6541 } 6542 }
6542 SendUpdateFaviconURL(urls); 6543 SendUpdateFaviconURL(urls);
6543 } 6544 }
6544 6545
6545 6546
6546 } // namespace content 6547 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698