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

Side by Side Diff: media/video/capture/screen/screen_capture_frame_queue.cc

Issue 13983010: Use webrtc::DesktopCapturer for screen capturer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
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 "media/video/capture/screen/screen_capture_frame_queue.h" 5 #include "media/video/capture/screen/screen_capture_frame_queue.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "media/video/capture/screen/screen_capture_frame.h" 10 #include "base/logging.h"
11 #include "base/threading/non_thread_safe.h"
12 #include "media/video/capture/screen/shared_desktop_frame.h"
13 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
11 14
12 namespace media { 15 namespace media {
13 16
14 ScreenCaptureFrameQueue::ScreenCaptureFrameQueue() 17 ScreenCaptureFrameQueue::ScreenCaptureFrameQueue() : current_(0) {}
15 : current_(0), 18 ScreenCaptureFrameQueue::~ScreenCaptureFrameQueue() {}
alexeypa (please no reviews) 2013/05/13 17:02:00 nit: Add a black line between the constructor and
Sergey Ulanov 2013/05/13 21:16:52 Done.
16 previous_(NULL) {
17 SetAllFramesNeedUpdate();
18 }
19 19
20 ScreenCaptureFrameQueue::~ScreenCaptureFrameQueue() { 20 void ScreenCaptureFrameQueue::MoveToNextFrame() {
21 } 21 current_ = (current_ + 1) % kQueueLength;
22 22
23 void ScreenCaptureFrameQueue::DoneWithCurrentFrame() { 23 // Verify that the frame is not shared, i.e. that consumer has released it
24 previous_ = current_frame(); 24 // before attempting to capture again.
25 current_ = (current_ + 1) % kQueueLength; 25 if (frames_[current_])
26 DCHECK(frames_[current_]->IsNotShared());
alexeypa (please no reviews) 2013/05/13 17:02:00 nit: DCHECK(!frames_[current_] || frames_[current_
Sergey Ulanov 2013/05/13 21:16:52 Done.
26 } 27 }
27 28
28 void ScreenCaptureFrameQueue::ReplaceCurrentFrame( 29 void ScreenCaptureFrameQueue::ReplaceCurrentFrame(
29 scoped_ptr<ScreenCaptureFrame> frame) { 30 scoped_ptr<webrtc::DesktopFrame> frame) {
30 frames_[current_] = frame.Pass(); 31 frames_[current_].reset(SharedDesktopFrame::Wrap(frame.release()));
31 needs_update_[current_] = false;
32 } 32 }
33 33
34 void ScreenCaptureFrameQueue::SetAllFramesNeedUpdate() { 34 void ScreenCaptureFrameQueue::Reset() {
35 std::fill(needs_update_, needs_update_ + arraysize(needs_update_), true); 35 for (int i = 0; i < kQueueLength; ++i)
36 previous_ = NULL; 36 frames_[i].reset();
37 } 37 }
38 38
39 } // namespace media 39 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698