summaryrefslogtreecommitdiffstats
path: root/media/mojo
diff options
context:
space:
mode:
authorrileya <rileya@chromium.org>2015-01-21 13:17:37 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-21 21:18:35 +0000
commit4e30d62669c312dd6788ba23376b1e8181be0a0c (patch)
tree5613dbfa647ef4d828a04ab90e882b55fc11bf69 /media/mojo
parentdf9798c024d53f227c6e009277e2cc0f1c3c1469 (diff)
downloadchromium_src-4e30d62669c312dd6788ba23376b1e8181be0a0c.zip
chromium_src-4e30d62669c312dd6788ba23376b1e8181be0a0c.tar.gz
chromium_src-4e30d62669c312dd6788ba23376b1e8181be0a0c.tar.bz2
Add support for Rec709 color space videos in software YUV convert path.
BUG=333619 Review URL: https://codereview.chromium.org/591313008 Cr-Commit-Position: refs/heads/master@{#312454}
Diffstat (limited to 'media/mojo')
-rw-r--r--media/mojo/interfaces/media_types.mojom3
-rw-r--r--media/mojo/services/media_type_converters.cc1
2 files changed, 3 insertions, 1 deletions
diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom
index c14a80e..032cb39 100644
--- a/media/mojo/interfaces/media_types.mojom
+++ b/media/mojo/interfaces/media_types.mojom
@@ -101,7 +101,8 @@ enum VideoFormat {
NV12,
YV24,
ARGB,
- FORMAT_MAX = ARGB,
+ YV12HD,
+ FORMAT_MAX = YV12HD,
};
// See media/base/video_decoder_config.h for descriptions.
diff --git a/media/mojo/services/media_type_converters.cc b/media/mojo/services/media_type_converters.cc
index 5bd548d..51b9fda 100644
--- a/media/mojo/services/media_type_converters.cc
+++ b/media/mojo/services/media_type_converters.cc
@@ -143,6 +143,7 @@ ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV12J, VIDEO_FORMAT_YV12J);
ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::NV12, VIDEO_FORMAT_NV12);
ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV24, VIDEO_FORMAT_YV24);
ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::ARGB, VIDEO_FORMAT_ARGB);
+ASSERT_ENUM_EQ_RAW(VideoFrame::Format, VideoFrame::YV12HD, VIDEO_FORMAT_YV12HD);
ASSERT_ENUM_EQ_RAW(VideoFrame::Format,
VideoFrame::FORMAT_MAX,
VIDEO_FORMAT_FORMAT_MAX);