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

Unified Diff: media/filters/skcanvas_video_renderer.cc

Issue 934263002: Update VideoImageGenerator to match new API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/skcanvas_video_renderer.cc
diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc
index b505b60949200cf3b2c7afcbf0fb516a7007cc62..e4f50164505169a57ed40a56a47208881bf55a42 100644
--- a/media/filters/skcanvas_video_renderer.cc
+++ b/media/filters/skcanvas_video_renderer.cc
@@ -186,19 +186,18 @@ class VideoImageGenerator : public SkImageGenerator {
return true;
}
- bool onGetPixels(const SkImageInfo& info,
+ // TODO (scroggo): Rename to onGetPixels once Skia is updated.
+ Result onGetPixelsEnum(const SkImageInfo& info,
void* pixels,
size_t row_bytes,
SkPMColor ctable[],
int* ctable_count) override {
if (!frame_.get())
- return false;
- if (!pixels)
- return false;
+ return kInvalidInput;
// If skia couldn't do the YUV conversion on GPU, we will on CPU.
SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
frame_, pixels, row_bytes);
- return true;
+ return kSuccess;
}
bool onGetYUV8Planes(SkISize sizes[3],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698