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

Unified Diff: remoting/codec/video_encoder_vp8.cc

Issue 12047101: Move screen capturers from remoting/capturer to media/video/capturer/screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/codec/video_encoder_vp8.h ('k') | remoting/codec/video_encoder_vp8_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/codec/video_encoder_vp8.cc
diff --git a/remoting/codec/video_encoder_vp8.cc b/remoting/codec/video_encoder_vp8.cc
index ace549bbba5993107fae7ffb3ba24fbcea05e927..a4e4d1a1132d1f76c88db7bb1020cb19edb98b3f 100644
--- a/remoting/codec/video_encoder_vp8.cc
+++ b/remoting/codec/video_encoder_vp8.cc
@@ -8,8 +8,8 @@
#include "base/sys_info.h"
#include "base/time.h"
#include "media/base/yuv_convert.h"
+#include "media/video/capture/screen/screen_capture_data.h"
#include "remoting/base/util.h"
-#include "remoting/capturer/capture_data.h"
#include "remoting/proto/video.pb.h"
extern "C" {
@@ -146,8 +146,9 @@ bool VideoEncoderVp8::Init(const SkISize& size) {
return true;
}
-void VideoEncoderVp8::PrepareImage(scoped_refptr<CaptureData> capture_data,
- SkRegion* updated_region) {
+void VideoEncoderVp8::PrepareImage(
+ scoped_refptr<media::ScreenCaptureData> capture_data,
+ SkRegion* updated_region) {
const SkRegion& region = capture_data->dirty_region();
if (region.isEmpty()) {
updated_region->setEmpty();
@@ -212,7 +213,7 @@ void VideoEncoderVp8::PrepareActiveMap(const SkRegion& updated_region) {
}
void VideoEncoderVp8::Encode(
- scoped_refptr<CaptureData> capture_data,
+ scoped_refptr<media::ScreenCaptureData> capture_data,
bool key_frame,
const DataAvailableCallback& data_available_callback) {
DCHECK_LE(32, capture_data->size().width());
« no previous file with comments | « remoting/codec/video_encoder_vp8.h ('k') | remoting/codec/video_encoder_vp8_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698