Index: media/video/capture/screen/screen_capture_frame_queue.cc |
diff --git a/media/video/capture/screen/screen_capture_frame_queue.cc b/media/video/capture/screen/screen_capture_frame_queue.cc |
index 610a0628cfb753bf618d1779d003609c1ca2a79c..6ee3b31ec9bf77ab81c9ceb817efb366a0df0b42 100644 |
--- a/media/video/capture/screen/screen_capture_frame_queue.cc |
+++ b/media/video/capture/screen/screen_capture_frame_queue.cc |
@@ -7,33 +7,33 @@ |
#include <algorithm> |
#include "base/basictypes.h" |
-#include "media/video/capture/screen/screen_capture_frame.h" |
+#include "base/logging.h" |
+#include "base/threading/non_thread_safe.h" |
+#include "media/video/capture/screen/shared_desktop_frame.h" |
+#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" |
namespace media { |
-ScreenCaptureFrameQueue::ScreenCaptureFrameQueue() |
- : current_(0), |
- previous_(NULL) { |
- SetAllFramesNeedUpdate(); |
-} |
- |
-ScreenCaptureFrameQueue::~ScreenCaptureFrameQueue() { |
-} |
+ScreenCaptureFrameQueue::ScreenCaptureFrameQueue() : current_(0) {} |
+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.
|
-void ScreenCaptureFrameQueue::DoneWithCurrentFrame() { |
- previous_ = current_frame(); |
+void ScreenCaptureFrameQueue::MoveToNextFrame() { |
current_ = (current_ + 1) % kQueueLength; |
+ |
+ // Verify that the frame is not shared, i.e. that consumer has released it |
+ // before attempting to capture again. |
+ if (frames_[current_]) |
+ 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.
|
} |
void ScreenCaptureFrameQueue::ReplaceCurrentFrame( |
- scoped_ptr<ScreenCaptureFrame> frame) { |
- frames_[current_] = frame.Pass(); |
- needs_update_[current_] = false; |
+ scoped_ptr<webrtc::DesktopFrame> frame) { |
+ frames_[current_].reset(SharedDesktopFrame::Wrap(frame.release())); |
} |
-void ScreenCaptureFrameQueue::SetAllFramesNeedUpdate() { |
- std::fill(needs_update_, needs_update_ + arraysize(needs_update_), true); |
- previous_ = NULL; |
+void ScreenCaptureFrameQueue::Reset() { |
+ for (int i = 0; i < kQueueLength; ++i) |
+ frames_[i].reset(); |
} |
} // namespace media |