media/mojo/common/media_type_converters.cc - Issue 2075303002: [DO NOT COMMIT] Initial MediaPlayerRenderer plumbing and basic features

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: media/mojo/common/media_type_converters.cc

Issue 2075303002: [DO NOT COMMIT] Initial MediaPlayerRenderer plumbing and basic features (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/mojo/clients/mojo_renderer_factory.cc ('K') | « media/mojo/clients/mojo_renderer_impl.cc ('k') | media/mojo/interfaces/renderer.mojom » ('j') | media/mojo/interfaces/renderer.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/mojo/common/media_type_converters.cc

diff --git a/media/mojo/common/media_type_converters.cc b/media/mojo/common/media_type_converters.cc

index d809016a9a8255f185cb822711d8a8e41bd614d4..d253c8bd66c7f08184828d3f4b0a66bb5f3a7343 100644

--- a/media/mojo/common/media_type_converters.cc

+++ b/media/mojo/common/media_type_converters.cc

@@ -130,12 +130,13 @@ ASSERT_ENUM_EQ_RAW(DemuxerStream::Type,

ASSERT_ENUM_EQ_RAW(DemuxerStream::Type,

DemuxerStream::VIDEO,

DemuxerStream::Type::VIDEO);

+// TODO(tguilbert): Double check this is the right change to make.

static_assert(

media::DemuxerStream::NUM_TYPES ==

static_cast<media::DemuxerStream::Type>(

- static_cast<int>(media::mojom::DemuxerStream::Type::LAST_TYPE) + 2),

+ static_cast<int>(media::mojom::DemuxerStream::Type::LAST_TYPE) + 3),

"Mismatched enum: media::DemuxerStream::NUM_TYPES != "

- "media::mojom::DemuxerStream::Type::LAST_TYPE + 2");

+ "media::mojom::DemuxerStream::Type::LAST_TYPE + 3");

// DemuxerStream Status.

ASSERT_ENUM_EQ_RAW(DemuxerStream::Status,