chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc - Issue 1786733004: Revert of media config: expand is_encrypted to a struct.

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 1786733004: Revert of media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/media/cma/ipc_streamer/encryption_scheme_marshaller.cc ('k') | chromecast/media/cma/pipeline/audio_decoder_software_wrapper.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 a471eb63af09cdf69ee66ec4ce1e4c08be67b5ab..b2e9aaa467f90bddc061ffe939dfd03b8aa5631c 100644

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

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

@@ -11,7 +11,6 @@

#include "base/logging.h"

#include "chromecast/media/cma/ipc/media_message.h"

-#include "chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.h"

#include "media/base/video_decoder_config.h"

#include "ui/gfx/geometry/rect.h"

#include "ui/gfx/geometry/size.h"

@@ -68,7 +67,7 @@

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

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

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

- EncryptionSchemeMarshaller::Write(config.encryption_scheme(), msg);

+ CHECK(msg->WritePod(config.is_encrypted()));

CHECK(msg->WritePod(config.extra_data().size()));

if (!config.extra_data().empty())

CHECK(msg->WriteBuffer(&config.extra_data()[0],

@@ -85,8 +84,8 @@

gfx::Size coded_size;

gfx::Rect visible_rect;

gfx::Size natural_size;

+ bool is_encrypted;

size_t extra_data_size;

- ::media::EncryptionScheme encryption_scheme;

std::vector<uint8_t> extra_data;

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

@@ -96,7 +95,7 @@

coded_size = SizeMarshaller::Read(msg);

visible_rect = RectMarshaller::Read(msg);

natural_size = SizeMarshaller::Read(msg);

- encryption_scheme = EncryptionSchemeMarshaller::Read(msg);

+ CHECK(msg->ReadPod(&is_encrypted));

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

CHECK_GE(codec, ::media::kUnknownVideoCodec);

@@ -116,7 +115,7 @@

return ::media::VideoDecoderConfig(

codec, profile, format, color_space,

coded_size, visible_rect, natural_size,

- extra_data, encryption_scheme);

+ extra_data, is_encrypted);

}

} // namespace media