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

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

Issue 111463009: Replace parts of WebMediaPlayerParams with WebMediaPlayerImpl accessing RenderThreadImpl directly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove MediaLog Created 7 years 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 | content/renderer/media/webmediaplayer_params.h » ('j') | no next file with comments »
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>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/debug/crash_logging.h" 15 #include "base/debug/crash_logging.h"
16 #include "base/debug/trace_event.h" 16 #include "base/debug/trace_event.h"
17 #include "base/message_loop/message_loop_proxy.h" 17 #include "base/message_loop/message_loop_proxy.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/synchronization/waitable_event.h" 20 #include "base/synchronization/waitable_event.h"
21 #include "cc/layers/video_layer.h" 21 #include "cc/layers/video_layer.h"
22 #include "content/public/common/content_switches.h" 22 #include "content/public/common/content_switches.h"
23 #include "content/renderer/media/buffered_data_source.h" 23 #include "content/renderer/media/buffered_data_source.h"
24 #include "content/renderer/media/crypto/key_systems.h" 24 #include "content/renderer/media/crypto/key_systems.h"
25 #include "content/renderer/media/render_media_log.h"
25 #include "content/renderer/media/texttrack_impl.h" 26 #include "content/renderer/media/texttrack_impl.h"
26 #include "content/renderer/media/webaudiosourceprovider_impl.h" 27 #include "content/renderer/media/webaudiosourceprovider_impl.h"
27 #include "content/renderer/media/webinbandtexttrack_impl.h" 28 #include "content/renderer/media/webinbandtexttrack_impl.h"
28 #include "content/renderer/media/webmediaplayer_delegate.h" 29 #include "content/renderer/media/webmediaplayer_delegate.h"
29 #include "content/renderer/media/webmediaplayer_params.h" 30 #include "content/renderer/media/webmediaplayer_params.h"
30 #include "content/renderer/media/webmediaplayer_util.h" 31 #include "content/renderer/media/webmediaplayer_util.h"
31 #include "content/renderer/media/webmediasource_impl.h" 32 #include "content/renderer/media/webmediasource_impl.h"
32 #include "content/renderer/pepper/pepper_webplugin_impl.h" 33 #include "content/renderer/pepper/pepper_webplugin_impl.h"
34 #include "content/renderer/render_thread_impl.h"
33 #include "gpu/GLES2/gl2extchromium.h" 35 #include "gpu/GLES2/gl2extchromium.h"
34 #include "media/audio/null_audio_sink.h" 36 #include "media/audio/null_audio_sink.h"
35 #include "media/base/bind_to_loop.h" 37 #include "media/base/bind_to_loop.h"
36 #include "media/base/filter_collection.h" 38 #include "media/base/filter_collection.h"
37 #include "media/base/limits.h" 39 #include "media/base/limits.h"
38 #include "media/base/media_log.h" 40 #include "media/base/media_log.h"
39 #include "media/base/media_switches.h" 41 #include "media/base/media_switches.h"
40 #include "media/base/pipeline.h" 42 #include "media/base/pipeline.h"
41 #include "media/base/text_renderer.h" 43 #include "media/base/text_renderer.h"
42 #include "media/base/video_frame.h" 44 #include "media/base/video_frame.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 content::RenderView* render_view, 135 content::RenderView* render_view,
134 blink::WebFrame* frame, 136 blink::WebFrame* frame,
135 blink::WebMediaPlayerClient* client, 137 blink::WebMediaPlayerClient* client,
136 base::WeakPtr<WebMediaPlayerDelegate> delegate, 138 base::WeakPtr<WebMediaPlayerDelegate> delegate,
137 const WebMediaPlayerParams& params) 139 const WebMediaPlayerParams& params)
138 : content::RenderViewObserver(render_view), 140 : content::RenderViewObserver(render_view),
139 frame_(frame), 141 frame_(frame),
140 network_state_(WebMediaPlayer::NetworkStateEmpty), 142 network_state_(WebMediaPlayer::NetworkStateEmpty),
141 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), 143 ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
142 main_loop_(base::MessageLoopProxy::current()), 144 main_loop_(base::MessageLoopProxy::current()),
143 media_loop_(params.message_loop_proxy()), 145 media_loop_(
146 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy()),
144 paused_(true), 147 paused_(true),
145 seeking_(false), 148 seeking_(false),
146 playback_rate_(0.0f), 149 playback_rate_(0.0f),
147 pending_seek_(false), 150 pending_seek_(false),
148 pending_seek_seconds_(0.0f), 151 pending_seek_seconds_(0.0f),
149 client_(client), 152 client_(client),
150 delegate_(delegate), 153 delegate_(delegate),
151 defer_load_cb_(params.defer_load_cb()), 154 defer_load_cb_(params.defer_load_cb()),
152 media_log_(params.media_log()), 155 media_log_(new RenderMediaLog()),
153 accelerated_compositing_reported_(false), 156 accelerated_compositing_reported_(false),
154 incremented_externally_allocated_memory_(false), 157 incremented_externally_allocated_memory_(false),
155 gpu_factories_(params.gpu_factories()), 158 gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()),
156 is_local_source_(false), 159 is_local_source_(false),
157 supports_save_(true), 160 supports_save_(true),
158 starting_(false), 161 starting_(false),
159 chunk_demuxer_(NULL), 162 chunk_demuxer_(NULL),
160 current_frame_painted_(false), 163 current_frame_painted_(false),
161 frames_dropped_before_paint_(0), 164 frames_dropped_before_paint_(0),
162 pending_repaint_(false), 165 pending_repaint_(false),
163 pending_size_change_(false), 166 pending_size_change_(false),
164 video_frame_provider_client_(NULL), 167 video_frame_provider_client_(NULL),
165 text_track_index_(0) { 168 text_track_index_(0) {
(...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 // The |current_frame_| wasn't painted, it is being replaced, and we haven't 1312 // The |current_frame_| wasn't painted, it is being replaced, and we haven't
1310 // even gotten the chance to request a repaint for it yet. Mark it as dropped. 1313 // even gotten the chance to request a repaint for it yet. Mark it as dropped.
1311 TRACE_EVENT0("media", "WebMediaPlayerImpl:frameDropped"); 1314 TRACE_EVENT0("media", "WebMediaPlayerImpl:frameDropped");
1312 DVLOG(1) << "Frame dropped before being painted: " 1315 DVLOG(1) << "Frame dropped before being painted: "
1313 << current_frame_->GetTimestamp().InSecondsF(); 1316 << current_frame_->GetTimestamp().InSecondsF();
1314 if (frames_dropped_before_paint_ < kuint32max) 1317 if (frames_dropped_before_paint_ < kuint32max)
1315 frames_dropped_before_paint_++; 1318 frames_dropped_before_paint_++;
1316 } 1319 }
1317 1320
1318 } // namespace content 1321 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698