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

Unified Diff: media/filters/skcanvas_video_renderer.cc

Issue 591313008: Add support for Rec709 color space videos in software YUV convert path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« media/base/video_frame.h ('K') | « media/filters/ffmpeg_video_decoder.cc ('k') | 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 9bdd393e56c31c368b926de08be9e4e42a993382..c14b1d6ae372c1fb5c900b116b3a3e9c25943100 100644
--- a/media/filters/skcanvas_video_renderer.cc
+++ b/media/filters/skcanvas_video_renderer.cc
@@ -35,6 +35,7 @@ static bool IsYUV(media::VideoFrame::Format format) {
case VideoFrame::I420:
case VideoFrame::YV12A:
case VideoFrame::YV12J:
+ case VideoFrame::YV12HD:
case VideoFrame::YV24:
case VideoFrame::NV12:
return true;
@@ -54,6 +55,7 @@ static bool IsJPEGColorSpace(media::VideoFrame::Format format) {
case VideoFrame::YV12J:
return true;
case VideoFrame::YV12:
+ case VideoFrame::YV12HD:
case VideoFrame::YV16:
case VideoFrame::I420:
case VideoFrame::YV12A:
@@ -132,6 +134,20 @@ static void ConvertVideoFrameToRGBPixels(
media::YV12J);
break;
+ case media::VideoFrame::YV12HD:
+ media::ConvertYUVToRGB32(
+ video_frame->data(media::VideoFrame::kYPlane) + y_offset,
+ video_frame->data(media::VideoFrame::kUPlane) + uv_offset,
+ video_frame->data(media::VideoFrame::kVPlane) + uv_offset,
+ static_cast<uint8*>(rgb_pixels),
+ video_frame->visible_rect().width(),
+ video_frame->visible_rect().height(),
+ video_frame->stride(media::VideoFrame::kYPlane),
+ video_frame->stride(media::VideoFrame::kUPlane),
+ row_bytes,
+ media::YV12HD);
+ break;
+
case media::VideoFrame::YV16:
LIBYUV_I422_TO_ARGB(
video_frame->data(media::VideoFrame::kYPlane) + y_offset,
@@ -199,9 +215,9 @@ static void ConvertVideoFrameToRGBPixels(
video_frame->ReadPixelsFromNativeTexture(tmp);
break;
}
- default:
+ case VideoFrame::UNKNOWN:
+ case VideoFrame::NV12:
NOTREACHED();
- break;
}
}
@@ -241,8 +257,10 @@ class VideoImageGenerator : public SkImageGenerator {
void* planes[3],
size_t row_bytes[3],
SkYUVColorSpace* color_space) OVERRIDE {
- if (!frame_.get() || !IsYUV(frame_->format()))
+ if (!frame_.get() || !IsYUV(frame_->format()) ||
+ frame_->format() == VideoFrame::YV12HD) {
return false;
+ }
if (color_space) {
if (IsJPEGColorSpace(frame_->format()))
« media/base/video_frame.h ('K') | « media/filters/ffmpeg_video_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698