chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc - Issue 1228843003: Revert of Change the video color space default.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc

Issue 1228843003: Revert of Change the video color space default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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 | « chromecast/common/media/cma_param_traits_macros.h ('k') | chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc

diff --git a/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc b/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc

index bf3e405870198081f28e8a023b653bd4e541c870..d6ec43e23b08afdc0b8df465d8b28fa04ecac444 100644

--- a/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc

+++ b/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc

@@ -59,7 +59,6 @@

CHECK(msg->WritePod(config.codec()));

CHECK(msg->WritePod(config.profile()));

CHECK(msg->WritePod(config.format()));

- CHECK(msg->WritePod(config.color_space()));

SizeMarshaller::Write(config.coded_size(), msg);

RectMarshaller::Write(config.visible_rect(), msg);

SizeMarshaller::Write(config.natural_size(), msg);

@@ -75,7 +74,6 @@

::media::VideoCodec codec;

::media::VideoCodecProfile profile;

::media::VideoFrame::Format format;

- ::media::VideoFrame::ColorSpace color_space;

gfx::Size coded_size;

gfx::Rect visible_rect;

gfx::Size natural_size;

@@ -86,7 +84,6 @@

CHECK(msg->ReadPod(&codec));

CHECK(msg->ReadPod(&profile));

CHECK(msg->ReadPod(&format));

- CHECK(msg->ReadPod(&color_space));

coded_size = SizeMarshaller::Read(msg);

visible_rect = RectMarshaller::Read(msg);

natural_size = SizeMarshaller::Read(msg);

@@ -99,8 +96,6 @@

CHECK_LE(profile, ::media::VIDEO_CODEC_PROFILE_MAX);

CHECK_GE(format, ::media::VideoFrame::UNKNOWN);

CHECK_LE(format, ::media::VideoFrame::FORMAT_MAX);

- CHECK_GE(color_space, ::media::VideoFrame::COLOR_SPACE_UNSPECIFIED);

- CHECK_LE(color_space, ::media::VideoFrame::COLOR_SPACE_MAX);

CHECK_LT(extra_data_size, kMaxExtraDataSize);

if (extra_data_size > 0) {

extra_data.reset(new uint8[extra_data_size]);

@@ -108,7 +103,7 @@

}

return ::media::VideoDecoderConfig(

- codec, profile, format, color_space,

+ codec, profile, format,

coded_size, visible_rect, natural_size,

extra_data.get(), extra_data_size,

is_encrypted);