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

Unified Diff: media/filters/skcanvas_video_renderer.cc

Issue 809883004: Revert hardware decoder changes causing ChromeOS HW test crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « media/blink/video_frame_compositor.cc ('k') | media/mojo/interfaces/media_types.mojom » ('j') | 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 51af5f29abc6cf848a20424ae38b5f73639b7687..2243445d459e903f6d230604a757f6c36cc4c0cb 100644
--- a/media/filters/skcanvas_video_renderer.cc
+++ b/media/filters/skcanvas_video_renderer.cc
@@ -52,7 +52,6 @@ bool IsYUV(media::VideoFrame::Format format) {
#if defined(VIDEO_HOLE)
case VideoFrame::HOLE:
#endif // defined(VIDEO_HOLE)
- case VideoFrame::ARGB:
return false;
}
NOTREACHED() << "Invalid videoframe format provided: " << format;
@@ -74,7 +73,6 @@ bool IsJPEGColorSpace(media::VideoFrame::Format format) {
#if defined(VIDEO_HOLE)
case VideoFrame::HOLE:
#endif // defined(VIDEO_HOLE)
- case VideoFrame::ARGB:
return false;
}
NOTREACHED() << "Invalid videoframe format provided: " << format;
@@ -200,6 +198,7 @@ void ConvertVideoFrameToRGBPixels(
break;
case media::VideoFrame::NATIVE_TEXTURE: {
+ DCHECK_EQ(video_frame->format(), media::VideoFrame::NATIVE_TEXTURE);
SkBitmap tmp;
tmp.installPixels(
SkImageInfo::MakeN32Premul(video_frame->visible_rect().width(),
@@ -209,8 +208,6 @@ void ConvertVideoFrameToRGBPixels(
video_frame->ReadPixelsFromNativeTexture(tmp);
break;
}
-
- case media::VideoFrame::ARGB:
default:
NOTREACHED();
break;
« no previous file with comments | « media/blink/video_frame_compositor.cc ('k') | media/mojo/interfaces/media_types.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698