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

Unified Diff: content/renderer/media/video_track_recorder.cc

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/image_capture_frame_grabber.cc ('k') | content/renderer/media/webmediaplayer_ms.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/video_track_recorder.cc
diff --git a/content/renderer/media/video_track_recorder.cc b/content/renderer/media/video_track_recorder.cc
index 926d7e0612dcac24b8d532036870154fb985d746..486731605c6ae7d7b8d53b1d6686827ac2434346 100644
--- a/content/renderer/media/video_track_recorder.cc
+++ b/content/renderer/media/video_track_recorder.cc
@@ -23,6 +23,7 @@
#include "media/base/video_util.h"
#include "media/filters/context_3d.h"
#include "media/renderers/skcanvas_video_renderer.h"
+#include "skia/ext/cdl_surface.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/libyuv/include/libyuv.h"
#include "third_party/skia/include/core/SkCanvas.h"
@@ -187,7 +188,7 @@ class VideoTrackRecorder::Encoder : public base::RefCountedThreadSafe<Encoder> {
// Used to retrieve incoming opaque VideoFrames (i.e. VideoFrames backed by
// textures). Created on-demand on |main_task_runner_|.
std::unique_ptr<media::SkCanvasVideoRenderer> video_renderer_;
- sk_sp<SkSurface> surface_;
+ sk_sp<CdlSurface> surface_;
DISALLOW_COPY_AND_ASSIGN(Encoder);
};
@@ -260,7 +261,7 @@ void VideoTrackRecorder::Encoder::RetrieveFrameOnMainThread(
// Create |surface_| if it doesn't exist or incoming resolution has changed.
if (!surface_ || surface_->width() != info.width() ||
surface_->height() != info.height()) {
- surface_ = SkSurface::MakeRaster(info);
+ surface_ = CdlSurface::MakeRaster(info);
}
if (!video_renderer_)
video_renderer_.reset(new media::SkCanvasVideoRenderer);
« no previous file with comments | « content/renderer/media/image_capture_frame_grabber.cc ('k') | content/renderer/media/webmediaplayer_ms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698