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

Side by Side Diff: content/renderer/media/webmediaplayer_ms_compositor.h

Issue 2751353003: Bug Fix: Data Race For WebMediaPlayerMS' Frame Count Variable (Closed)
Patch Set: Remove const Created 3 years, 9 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
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_ms_compositor.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 WebMediaPlayerMSCompositor( 57 WebMediaPlayerMSCompositor(
58 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 58 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
59 const blink::WebMediaStream& web_stream, 59 const blink::WebMediaStream& web_stream,
60 const base::WeakPtr<WebMediaPlayerMS>& player); 60 const base::WeakPtr<WebMediaPlayerMS>& player);
61 61
62 void EnqueueFrame(scoped_refptr<media::VideoFrame> frame); 62 void EnqueueFrame(scoped_refptr<media::VideoFrame> frame);
63 63
64 // Statistical data 64 // Statistical data
65 gfx::Size GetCurrentSize(); 65 gfx::Size GetCurrentSize();
66 base::TimeDelta GetCurrentTime(); 66 base::TimeDelta GetCurrentTime();
67 size_t total_frame_count() const; 67 size_t total_frame_count();
68 size_t dropped_frame_count() const; 68 size_t dropped_frame_count();
69 69
70 // VideoFrameProvider implementation. 70 // VideoFrameProvider implementation.
71 void SetVideoFrameProviderClient( 71 void SetVideoFrameProviderClient(
72 cc::VideoFrameProvider::Client* client) override; 72 cc::VideoFrameProvider::Client* client) override;
73 bool UpdateCurrentFrame(base::TimeTicks deadline_min, 73 bool UpdateCurrentFrame(base::TimeTicks deadline_min,
74 base::TimeTicks deadline_max) override; 74 base::TimeTicks deadline_max) override;
75 bool HasCurrentFrame() override; 75 bool HasCurrentFrame() override;
76 scoped_refptr<media::VideoFrame> GetCurrentFrame() override; 76 scoped_refptr<media::VideoFrame> GetCurrentFrame() override;
77 void PutCurrentFrame() override; 77 void PutCurrentFrame() override;
78 78
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 // |current_frame_lock_| protects |current_frame_used_by_compositor_|, 162 // |current_frame_lock_| protects |current_frame_used_by_compositor_|,
163 // |current_frame_|, and |rendering_frame_buffer_|. 163 // |current_frame_|, and |rendering_frame_buffer_|.
164 base::Lock current_frame_lock_; 164 base::Lock current_frame_lock_;
165 165
166 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMSCompositor); 166 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMSCompositor);
167 }; 167 };
168 } // namespace content 168 } // namespace content
169 169
170 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H_ 170 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_ms_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698