OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/remoting/rpc/proto_enum_utils.h" | 5 #include "media/remoting/proto_enum_utils.h" |
6 | 6 |
7 namespace media { | 7 namespace media { |
8 namespace remoting { | 8 namespace remoting { |
9 | 9 |
10 #define CASE_RETURN_OTHER(x) \ | 10 #define CASE_RETURN_OTHER(x) \ |
11 case OriginType::x: \ | 11 case OriginType::x: \ |
12 return OtherType::x | 12 return OtherType::x |
13 | 13 |
14 base::Optional<::media::EncryptionScheme::CipherMode> | 14 base::Optional<EncryptionScheme::CipherMode> ToMediaEncryptionSchemeCipherMode( |
15 ToMediaEncryptionSchemeCipherMode(pb::EncryptionScheme::CipherMode value) { | 15 pb::EncryptionScheme::CipherMode value) { |
16 using OriginType = pb::EncryptionScheme; | 16 using OriginType = pb::EncryptionScheme; |
17 using OtherType = ::media::EncryptionScheme; | 17 using OtherType = EncryptionScheme; |
18 switch (value) { | 18 switch (value) { |
19 CASE_RETURN_OTHER(CIPHER_MODE_UNENCRYPTED); | 19 CASE_RETURN_OTHER(CIPHER_MODE_UNENCRYPTED); |
20 CASE_RETURN_OTHER(CIPHER_MODE_AES_CTR); | 20 CASE_RETURN_OTHER(CIPHER_MODE_AES_CTR); |
21 CASE_RETURN_OTHER(CIPHER_MODE_AES_CBC); | 21 CASE_RETURN_OTHER(CIPHER_MODE_AES_CBC); |
22 } | 22 } |
23 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 23 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
24 } | 24 } |
25 | 25 |
26 base::Optional<pb::EncryptionScheme::CipherMode> | 26 base::Optional<pb::EncryptionScheme::CipherMode> |
27 ToProtoEncryptionSchemeCipherMode(::media::EncryptionScheme::CipherMode value) { | 27 ToProtoEncryptionSchemeCipherMode(EncryptionScheme::CipherMode value) { |
28 using OriginType = ::media::EncryptionScheme; | 28 using OriginType = EncryptionScheme; |
29 using OtherType = pb::EncryptionScheme; | 29 using OtherType = pb::EncryptionScheme; |
30 switch (value) { | 30 switch (value) { |
31 CASE_RETURN_OTHER(CIPHER_MODE_UNENCRYPTED); | 31 CASE_RETURN_OTHER(CIPHER_MODE_UNENCRYPTED); |
32 CASE_RETURN_OTHER(CIPHER_MODE_AES_CTR); | 32 CASE_RETURN_OTHER(CIPHER_MODE_AES_CTR); |
33 CASE_RETURN_OTHER(CIPHER_MODE_AES_CBC); | 33 CASE_RETURN_OTHER(CIPHER_MODE_AES_CBC); |
34 } | 34 } |
35 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 35 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
36 } | 36 } |
37 | 37 |
38 base::Optional<::media::AudioCodec> ToMediaAudioCodec( | 38 base::Optional<AudioCodec> ToMediaAudioCodec( |
39 pb::AudioDecoderConfig::Codec value) { | 39 pb::AudioDecoderConfig::Codec value) { |
40 using OriginType = pb::AudioDecoderConfig; | 40 using OriginType = pb::AudioDecoderConfig; |
41 using OtherType = ::media::AudioCodec; | 41 using OtherType = AudioCodec; |
42 switch (value) { | 42 switch (value) { |
43 CASE_RETURN_OTHER(kUnknownAudioCodec); | 43 CASE_RETURN_OTHER(kUnknownAudioCodec); |
44 CASE_RETURN_OTHER(kCodecAAC); | 44 CASE_RETURN_OTHER(kCodecAAC); |
45 CASE_RETURN_OTHER(kCodecMP3); | 45 CASE_RETURN_OTHER(kCodecMP3); |
46 CASE_RETURN_OTHER(kCodecPCM); | 46 CASE_RETURN_OTHER(kCodecPCM); |
47 CASE_RETURN_OTHER(kCodecVorbis); | 47 CASE_RETURN_OTHER(kCodecVorbis); |
48 CASE_RETURN_OTHER(kCodecFLAC); | 48 CASE_RETURN_OTHER(kCodecFLAC); |
49 CASE_RETURN_OTHER(kCodecAMR_NB); | 49 CASE_RETURN_OTHER(kCodecAMR_NB); |
50 CASE_RETURN_OTHER(kCodecAMR_WB); | 50 CASE_RETURN_OTHER(kCodecAMR_WB); |
51 CASE_RETURN_OTHER(kCodecPCM_MULAW); | 51 CASE_RETURN_OTHER(kCodecPCM_MULAW); |
52 CASE_RETURN_OTHER(kCodecGSM_MS); | 52 CASE_RETURN_OTHER(kCodecGSM_MS); |
53 CASE_RETURN_OTHER(kCodecPCM_S16BE); | 53 CASE_RETURN_OTHER(kCodecPCM_S16BE); |
54 CASE_RETURN_OTHER(kCodecPCM_S24BE); | 54 CASE_RETURN_OTHER(kCodecPCM_S24BE); |
55 CASE_RETURN_OTHER(kCodecOpus); | 55 CASE_RETURN_OTHER(kCodecOpus); |
56 CASE_RETURN_OTHER(kCodecEAC3); | 56 CASE_RETURN_OTHER(kCodecEAC3); |
57 CASE_RETURN_OTHER(kCodecPCM_ALAW); | 57 CASE_RETURN_OTHER(kCodecPCM_ALAW); |
58 CASE_RETURN_OTHER(kCodecALAC); | 58 CASE_RETURN_OTHER(kCodecALAC); |
59 CASE_RETURN_OTHER(kCodecAC3); | 59 CASE_RETURN_OTHER(kCodecAC3); |
60 } | 60 } |
61 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 61 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
62 } | 62 } |
63 | 63 |
64 base::Optional<pb::AudioDecoderConfig::Codec> ToProtoAudioDecoderConfigCodec( | 64 base::Optional<pb::AudioDecoderConfig::Codec> ToProtoAudioDecoderConfigCodec( |
65 ::media::AudioCodec value) { | 65 AudioCodec value) { |
66 using OriginType = ::media::AudioCodec; | 66 using OriginType = AudioCodec; |
67 using OtherType = pb::AudioDecoderConfig; | 67 using OtherType = pb::AudioDecoderConfig; |
68 switch (value) { | 68 switch (value) { |
69 CASE_RETURN_OTHER(kUnknownAudioCodec); | 69 CASE_RETURN_OTHER(kUnknownAudioCodec); |
70 CASE_RETURN_OTHER(kCodecAAC); | 70 CASE_RETURN_OTHER(kCodecAAC); |
71 CASE_RETURN_OTHER(kCodecMP3); | 71 CASE_RETURN_OTHER(kCodecMP3); |
72 CASE_RETURN_OTHER(kCodecPCM); | 72 CASE_RETURN_OTHER(kCodecPCM); |
73 CASE_RETURN_OTHER(kCodecVorbis); | 73 CASE_RETURN_OTHER(kCodecVorbis); |
74 CASE_RETURN_OTHER(kCodecFLAC); | 74 CASE_RETURN_OTHER(kCodecFLAC); |
75 CASE_RETURN_OTHER(kCodecAMR_NB); | 75 CASE_RETURN_OTHER(kCodecAMR_NB); |
76 CASE_RETURN_OTHER(kCodecAMR_WB); | 76 CASE_RETURN_OTHER(kCodecAMR_WB); |
77 CASE_RETURN_OTHER(kCodecPCM_MULAW); | 77 CASE_RETURN_OTHER(kCodecPCM_MULAW); |
78 CASE_RETURN_OTHER(kCodecGSM_MS); | 78 CASE_RETURN_OTHER(kCodecGSM_MS); |
79 CASE_RETURN_OTHER(kCodecPCM_S16BE); | 79 CASE_RETURN_OTHER(kCodecPCM_S16BE); |
80 CASE_RETURN_OTHER(kCodecPCM_S24BE); | 80 CASE_RETURN_OTHER(kCodecPCM_S24BE); |
81 CASE_RETURN_OTHER(kCodecOpus); | 81 CASE_RETURN_OTHER(kCodecOpus); |
82 CASE_RETURN_OTHER(kCodecEAC3); | 82 CASE_RETURN_OTHER(kCodecEAC3); |
83 CASE_RETURN_OTHER(kCodecPCM_ALAW); | 83 CASE_RETURN_OTHER(kCodecPCM_ALAW); |
84 CASE_RETURN_OTHER(kCodecALAC); | 84 CASE_RETURN_OTHER(kCodecALAC); |
85 CASE_RETURN_OTHER(kCodecAC3); | 85 CASE_RETURN_OTHER(kCodecAC3); |
86 } | 86 } |
87 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 87 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
88 } | 88 } |
89 | 89 |
90 base::Optional<::media::SampleFormat> ToMediaSampleFormat( | 90 base::Optional<SampleFormat> ToMediaSampleFormat( |
91 pb::AudioDecoderConfig::SampleFormat value) { | 91 pb::AudioDecoderConfig::SampleFormat value) { |
92 using OriginType = pb::AudioDecoderConfig; | 92 using OriginType = pb::AudioDecoderConfig; |
93 using OtherType = ::media::SampleFormat; | 93 using OtherType = SampleFormat; |
94 switch (value) { | 94 switch (value) { |
95 CASE_RETURN_OTHER(kUnknownSampleFormat); | 95 CASE_RETURN_OTHER(kUnknownSampleFormat); |
96 CASE_RETURN_OTHER(kSampleFormatU8); | 96 CASE_RETURN_OTHER(kSampleFormatU8); |
97 CASE_RETURN_OTHER(kSampleFormatS16); | 97 CASE_RETURN_OTHER(kSampleFormatS16); |
98 CASE_RETURN_OTHER(kSampleFormatS32); | 98 CASE_RETURN_OTHER(kSampleFormatS32); |
99 CASE_RETURN_OTHER(kSampleFormatF32); | 99 CASE_RETURN_OTHER(kSampleFormatF32); |
100 CASE_RETURN_OTHER(kSampleFormatPlanarS16); | 100 CASE_RETURN_OTHER(kSampleFormatPlanarS16); |
101 CASE_RETURN_OTHER(kSampleFormatPlanarF32); | 101 CASE_RETURN_OTHER(kSampleFormatPlanarF32); |
102 CASE_RETURN_OTHER(kSampleFormatPlanarS32); | 102 CASE_RETURN_OTHER(kSampleFormatPlanarS32); |
103 CASE_RETURN_OTHER(kSampleFormatS24); | 103 CASE_RETURN_OTHER(kSampleFormatS24); |
104 CASE_RETURN_OTHER(kSampleFormatAc3); | 104 CASE_RETURN_OTHER(kSampleFormatAc3); |
105 CASE_RETURN_OTHER(kSampleFormatEac3); | 105 CASE_RETURN_OTHER(kSampleFormatEac3); |
106 } | 106 } |
107 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 107 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
108 } | 108 } |
109 | 109 |
110 base::Optional<pb::AudioDecoderConfig::SampleFormat> | 110 base::Optional<pb::AudioDecoderConfig::SampleFormat> |
111 ToProtoAudioDecoderConfigSampleFormat(::media::SampleFormat value) { | 111 ToProtoAudioDecoderConfigSampleFormat(SampleFormat value) { |
112 using OriginType = ::media::SampleFormat; | 112 using OriginType = SampleFormat; |
113 using OtherType = pb::AudioDecoderConfig; | 113 using OtherType = pb::AudioDecoderConfig; |
114 switch (value) { | 114 switch (value) { |
115 CASE_RETURN_OTHER(kUnknownSampleFormat); | 115 CASE_RETURN_OTHER(kUnknownSampleFormat); |
116 CASE_RETURN_OTHER(kSampleFormatU8); | 116 CASE_RETURN_OTHER(kSampleFormatU8); |
117 CASE_RETURN_OTHER(kSampleFormatS16); | 117 CASE_RETURN_OTHER(kSampleFormatS16); |
118 CASE_RETURN_OTHER(kSampleFormatS32); | 118 CASE_RETURN_OTHER(kSampleFormatS32); |
119 CASE_RETURN_OTHER(kSampleFormatF32); | 119 CASE_RETURN_OTHER(kSampleFormatF32); |
120 CASE_RETURN_OTHER(kSampleFormatPlanarS16); | 120 CASE_RETURN_OTHER(kSampleFormatPlanarS16); |
121 CASE_RETURN_OTHER(kSampleFormatPlanarF32); | 121 CASE_RETURN_OTHER(kSampleFormatPlanarF32); |
122 CASE_RETURN_OTHER(kSampleFormatPlanarS32); | 122 CASE_RETURN_OTHER(kSampleFormatPlanarS32); |
123 CASE_RETURN_OTHER(kSampleFormatS24); | 123 CASE_RETURN_OTHER(kSampleFormatS24); |
124 CASE_RETURN_OTHER(kSampleFormatAc3); | 124 CASE_RETURN_OTHER(kSampleFormatAc3); |
125 CASE_RETURN_OTHER(kSampleFormatEac3); | 125 CASE_RETURN_OTHER(kSampleFormatEac3); |
126 } | 126 } |
127 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 127 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
128 } | 128 } |
129 | 129 |
130 base::Optional<::media::ChannelLayout> ToMediaChannelLayout( | 130 base::Optional<ChannelLayout> ToMediaChannelLayout( |
131 pb::AudioDecoderConfig::ChannelLayout value) { | 131 pb::AudioDecoderConfig::ChannelLayout value) { |
132 using OriginType = pb::AudioDecoderConfig; | 132 using OriginType = pb::AudioDecoderConfig; |
133 using OtherType = ::media::ChannelLayout; | 133 using OtherType = ChannelLayout; |
134 switch (value) { | 134 switch (value) { |
135 CASE_RETURN_OTHER(CHANNEL_LAYOUT_NONE); | 135 CASE_RETURN_OTHER(CHANNEL_LAYOUT_NONE); |
136 CASE_RETURN_OTHER(CHANNEL_LAYOUT_UNSUPPORTED); | 136 CASE_RETURN_OTHER(CHANNEL_LAYOUT_UNSUPPORTED); |
137 CASE_RETURN_OTHER(CHANNEL_LAYOUT_MONO); | 137 CASE_RETURN_OTHER(CHANNEL_LAYOUT_MONO); |
138 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO); | 138 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO); |
139 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_1); | 139 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_1); |
140 CASE_RETURN_OTHER(CHANNEL_LAYOUT_SURROUND); | 140 CASE_RETURN_OTHER(CHANNEL_LAYOUT_SURROUND); |
141 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_0); | 141 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_0); |
142 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_2); | 142 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_2); |
143 CASE_RETURN_OTHER(CHANNEL_LAYOUT_QUAD); | 143 CASE_RETURN_OTHER(CHANNEL_LAYOUT_QUAD); |
(...skipping 18 matching lines...) Expand all Loading... |
162 CASE_RETURN_OTHER(CHANNEL_LAYOUT_7_1_WIDE_BACK); | 162 CASE_RETURN_OTHER(CHANNEL_LAYOUT_7_1_WIDE_BACK); |
163 CASE_RETURN_OTHER(CHANNEL_LAYOUT_OCTAGONAL); | 163 CASE_RETURN_OTHER(CHANNEL_LAYOUT_OCTAGONAL); |
164 CASE_RETURN_OTHER(CHANNEL_LAYOUT_DISCRETE); | 164 CASE_RETURN_OTHER(CHANNEL_LAYOUT_DISCRETE); |
165 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC); | 165 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC); |
166 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_1_QUAD_SIDE); | 166 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_1_QUAD_SIDE); |
167 } | 167 } |
168 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 168 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
169 } | 169 } |
170 | 170 |
171 base::Optional<pb::AudioDecoderConfig::ChannelLayout> | 171 base::Optional<pb::AudioDecoderConfig::ChannelLayout> |
172 ToProtoAudioDecoderConfigChannelLayout(::media::ChannelLayout value) { | 172 ToProtoAudioDecoderConfigChannelLayout(ChannelLayout value) { |
173 using OriginType = ::media::ChannelLayout; | 173 using OriginType = ChannelLayout; |
174 using OtherType = pb::AudioDecoderConfig; | 174 using OtherType = pb::AudioDecoderConfig; |
175 switch (value) { | 175 switch (value) { |
176 CASE_RETURN_OTHER(CHANNEL_LAYOUT_NONE); | 176 CASE_RETURN_OTHER(CHANNEL_LAYOUT_NONE); |
177 CASE_RETURN_OTHER(CHANNEL_LAYOUT_UNSUPPORTED); | 177 CASE_RETURN_OTHER(CHANNEL_LAYOUT_UNSUPPORTED); |
178 CASE_RETURN_OTHER(CHANNEL_LAYOUT_MONO); | 178 CASE_RETURN_OTHER(CHANNEL_LAYOUT_MONO); |
179 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO); | 179 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO); |
180 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_1); | 180 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_1); |
181 CASE_RETURN_OTHER(CHANNEL_LAYOUT_SURROUND); | 181 CASE_RETURN_OTHER(CHANNEL_LAYOUT_SURROUND); |
182 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_0); | 182 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_0); |
183 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_2); | 183 CASE_RETURN_OTHER(CHANNEL_LAYOUT_2_2); |
(...skipping 18 matching lines...) Expand all Loading... |
202 CASE_RETURN_OTHER(CHANNEL_LAYOUT_7_0_FRONT); | 202 CASE_RETURN_OTHER(CHANNEL_LAYOUT_7_0_FRONT); |
203 CASE_RETURN_OTHER(CHANNEL_LAYOUT_7_1_WIDE_BACK); | 203 CASE_RETURN_OTHER(CHANNEL_LAYOUT_7_1_WIDE_BACK); |
204 CASE_RETURN_OTHER(CHANNEL_LAYOUT_OCTAGONAL); | 204 CASE_RETURN_OTHER(CHANNEL_LAYOUT_OCTAGONAL); |
205 CASE_RETURN_OTHER(CHANNEL_LAYOUT_DISCRETE); | 205 CASE_RETURN_OTHER(CHANNEL_LAYOUT_DISCRETE); |
206 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC); | 206 CASE_RETURN_OTHER(CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC); |
207 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_1_QUAD_SIDE); | 207 CASE_RETURN_OTHER(CHANNEL_LAYOUT_4_1_QUAD_SIDE); |
208 } | 208 } |
209 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 209 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
210 } | 210 } |
211 | 211 |
212 base::Optional<::media::VideoCodec> ToMediaVideoCodec( | 212 base::Optional<VideoCodec> ToMediaVideoCodec( |
213 pb::VideoDecoderConfig::Codec value) { | 213 pb::VideoDecoderConfig::Codec value) { |
214 using OriginType = pb::VideoDecoderConfig; | 214 using OriginType = pb::VideoDecoderConfig; |
215 using OtherType = ::media::VideoCodec; | 215 using OtherType = VideoCodec; |
216 switch (value) { | 216 switch (value) { |
217 CASE_RETURN_OTHER(kUnknownVideoCodec); | 217 CASE_RETURN_OTHER(kUnknownVideoCodec); |
218 CASE_RETURN_OTHER(kCodecH264); | 218 CASE_RETURN_OTHER(kCodecH264); |
219 CASE_RETURN_OTHER(kCodecVC1); | 219 CASE_RETURN_OTHER(kCodecVC1); |
220 CASE_RETURN_OTHER(kCodecMPEG2); | 220 CASE_RETURN_OTHER(kCodecMPEG2); |
221 CASE_RETURN_OTHER(kCodecMPEG4); | 221 CASE_RETURN_OTHER(kCodecMPEG4); |
222 CASE_RETURN_OTHER(kCodecTheora); | 222 CASE_RETURN_OTHER(kCodecTheora); |
223 CASE_RETURN_OTHER(kCodecVP8); | 223 CASE_RETURN_OTHER(kCodecVP8); |
224 CASE_RETURN_OTHER(kCodecVP9); | 224 CASE_RETURN_OTHER(kCodecVP9); |
225 CASE_RETURN_OTHER(kCodecHEVC); | 225 CASE_RETURN_OTHER(kCodecHEVC); |
226 } | 226 } |
227 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 227 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
228 } | 228 } |
229 | 229 |
230 base::Optional<pb::VideoDecoderConfig::Codec> ToProtoVideoDecoderConfigCodec( | 230 base::Optional<pb::VideoDecoderConfig::Codec> ToProtoVideoDecoderConfigCodec( |
231 ::media::VideoCodec value) { | 231 VideoCodec value) { |
232 using OriginType = ::media::VideoCodec; | 232 using OriginType = VideoCodec; |
233 using OtherType = pb::VideoDecoderConfig; | 233 using OtherType = pb::VideoDecoderConfig; |
234 switch (value) { | 234 switch (value) { |
235 CASE_RETURN_OTHER(kUnknownVideoCodec); | 235 CASE_RETURN_OTHER(kUnknownVideoCodec); |
236 CASE_RETURN_OTHER(kCodecH264); | 236 CASE_RETURN_OTHER(kCodecH264); |
237 CASE_RETURN_OTHER(kCodecVC1); | 237 CASE_RETURN_OTHER(kCodecVC1); |
238 CASE_RETURN_OTHER(kCodecMPEG2); | 238 CASE_RETURN_OTHER(kCodecMPEG2); |
239 CASE_RETURN_OTHER(kCodecMPEG4); | 239 CASE_RETURN_OTHER(kCodecMPEG4); |
240 CASE_RETURN_OTHER(kCodecTheora); | 240 CASE_RETURN_OTHER(kCodecTheora); |
241 CASE_RETURN_OTHER(kCodecVP8); | 241 CASE_RETURN_OTHER(kCodecVP8); |
242 CASE_RETURN_OTHER(kCodecVP9); | 242 CASE_RETURN_OTHER(kCodecVP9); |
243 CASE_RETURN_OTHER(kCodecHEVC); | 243 CASE_RETURN_OTHER(kCodecHEVC); |
244 } | 244 } |
245 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 245 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
246 } | 246 } |
247 | 247 |
248 base::Optional<::media::VideoCodecProfile> ToMediaVideoCodecProfile( | 248 base::Optional<VideoCodecProfile> ToMediaVideoCodecProfile( |
249 pb::VideoDecoderConfig::Profile value) { | 249 pb::VideoDecoderConfig::Profile value) { |
250 using OriginType = pb::VideoDecoderConfig; | 250 using OriginType = pb::VideoDecoderConfig; |
251 using OtherType = ::media::VideoCodecProfile; | 251 using OtherType = VideoCodecProfile; |
252 switch (value) { | 252 switch (value) { |
253 CASE_RETURN_OTHER(VIDEO_CODEC_PROFILE_UNKNOWN); | 253 CASE_RETURN_OTHER(VIDEO_CODEC_PROFILE_UNKNOWN); |
254 CASE_RETURN_OTHER(H264PROFILE_BASELINE); | 254 CASE_RETURN_OTHER(H264PROFILE_BASELINE); |
255 CASE_RETURN_OTHER(H264PROFILE_MAIN); | 255 CASE_RETURN_OTHER(H264PROFILE_MAIN); |
256 CASE_RETURN_OTHER(H264PROFILE_EXTENDED); | 256 CASE_RETURN_OTHER(H264PROFILE_EXTENDED); |
257 CASE_RETURN_OTHER(H264PROFILE_HIGH); | 257 CASE_RETURN_OTHER(H264PROFILE_HIGH); |
258 CASE_RETURN_OTHER(H264PROFILE_HIGH10PROFILE); | 258 CASE_RETURN_OTHER(H264PROFILE_HIGH10PROFILE); |
259 CASE_RETURN_OTHER(H264PROFILE_HIGH422PROFILE); | 259 CASE_RETURN_OTHER(H264PROFILE_HIGH422PROFILE); |
260 CASE_RETURN_OTHER(H264PROFILE_HIGH444PREDICTIVEPROFILE); | 260 CASE_RETURN_OTHER(H264PROFILE_HIGH444PREDICTIVEPROFILE); |
261 CASE_RETURN_OTHER(H264PROFILE_SCALABLEBASELINE); | 261 CASE_RETURN_OTHER(H264PROFILE_SCALABLEBASELINE); |
262 CASE_RETURN_OTHER(H264PROFILE_SCALABLEHIGH); | 262 CASE_RETURN_OTHER(H264PROFILE_SCALABLEHIGH); |
263 CASE_RETURN_OTHER(H264PROFILE_STEREOHIGH); | 263 CASE_RETURN_OTHER(H264PROFILE_STEREOHIGH); |
264 CASE_RETURN_OTHER(H264PROFILE_MULTIVIEWHIGH); | 264 CASE_RETURN_OTHER(H264PROFILE_MULTIVIEWHIGH); |
265 CASE_RETURN_OTHER(VP8PROFILE_ANY); | 265 CASE_RETURN_OTHER(VP8PROFILE_ANY); |
266 CASE_RETURN_OTHER(VP9PROFILE_PROFILE0); | 266 CASE_RETURN_OTHER(VP9PROFILE_PROFILE0); |
267 CASE_RETURN_OTHER(VP9PROFILE_PROFILE1); | 267 CASE_RETURN_OTHER(VP9PROFILE_PROFILE1); |
268 CASE_RETURN_OTHER(VP9PROFILE_PROFILE2); | 268 CASE_RETURN_OTHER(VP9PROFILE_PROFILE2); |
269 CASE_RETURN_OTHER(VP9PROFILE_PROFILE3); | 269 CASE_RETURN_OTHER(VP9PROFILE_PROFILE3); |
270 CASE_RETURN_OTHER(HEVCPROFILE_MAIN); | 270 CASE_RETURN_OTHER(HEVCPROFILE_MAIN); |
271 CASE_RETURN_OTHER(HEVCPROFILE_MAIN10); | 271 CASE_RETURN_OTHER(HEVCPROFILE_MAIN10); |
272 CASE_RETURN_OTHER(HEVCPROFILE_MAIN_STILL_PICTURE); | 272 CASE_RETURN_OTHER(HEVCPROFILE_MAIN_STILL_PICTURE); |
273 } | 273 } |
274 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 274 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
275 } | 275 } |
276 | 276 |
277 base::Optional<pb::VideoDecoderConfig::Profile> | 277 base::Optional<pb::VideoDecoderConfig::Profile> |
278 ToProtoVideoDecoderConfigProfile(::media::VideoCodecProfile value) { | 278 ToProtoVideoDecoderConfigProfile(VideoCodecProfile value) { |
279 using OriginType = ::media::VideoCodecProfile; | 279 using OriginType = VideoCodecProfile; |
280 using OtherType = pb::VideoDecoderConfig; | 280 using OtherType = pb::VideoDecoderConfig; |
281 switch (value) { | 281 switch (value) { |
282 CASE_RETURN_OTHER(VIDEO_CODEC_PROFILE_UNKNOWN); | 282 CASE_RETURN_OTHER(VIDEO_CODEC_PROFILE_UNKNOWN); |
283 CASE_RETURN_OTHER(H264PROFILE_BASELINE); | 283 CASE_RETURN_OTHER(H264PROFILE_BASELINE); |
284 CASE_RETURN_OTHER(H264PROFILE_MAIN); | 284 CASE_RETURN_OTHER(H264PROFILE_MAIN); |
285 CASE_RETURN_OTHER(H264PROFILE_EXTENDED); | 285 CASE_RETURN_OTHER(H264PROFILE_EXTENDED); |
286 CASE_RETURN_OTHER(H264PROFILE_HIGH); | 286 CASE_RETURN_OTHER(H264PROFILE_HIGH); |
287 CASE_RETURN_OTHER(H264PROFILE_HIGH10PROFILE); | 287 CASE_RETURN_OTHER(H264PROFILE_HIGH10PROFILE); |
288 CASE_RETURN_OTHER(H264PROFILE_HIGH422PROFILE); | 288 CASE_RETURN_OTHER(H264PROFILE_HIGH422PROFILE); |
289 CASE_RETURN_OTHER(H264PROFILE_HIGH444PREDICTIVEPROFILE); | 289 CASE_RETURN_OTHER(H264PROFILE_HIGH444PREDICTIVEPROFILE); |
290 CASE_RETURN_OTHER(H264PROFILE_SCALABLEBASELINE); | 290 CASE_RETURN_OTHER(H264PROFILE_SCALABLEBASELINE); |
291 CASE_RETURN_OTHER(H264PROFILE_SCALABLEHIGH); | 291 CASE_RETURN_OTHER(H264PROFILE_SCALABLEHIGH); |
292 CASE_RETURN_OTHER(H264PROFILE_STEREOHIGH); | 292 CASE_RETURN_OTHER(H264PROFILE_STEREOHIGH); |
293 CASE_RETURN_OTHER(H264PROFILE_MULTIVIEWHIGH); | 293 CASE_RETURN_OTHER(H264PROFILE_MULTIVIEWHIGH); |
294 CASE_RETURN_OTHER(VP8PROFILE_ANY); | 294 CASE_RETURN_OTHER(VP8PROFILE_ANY); |
295 CASE_RETURN_OTHER(VP9PROFILE_PROFILE0); | 295 CASE_RETURN_OTHER(VP9PROFILE_PROFILE0); |
296 CASE_RETURN_OTHER(VP9PROFILE_PROFILE1); | 296 CASE_RETURN_OTHER(VP9PROFILE_PROFILE1); |
297 CASE_RETURN_OTHER(VP9PROFILE_PROFILE2); | 297 CASE_RETURN_OTHER(VP9PROFILE_PROFILE2); |
298 CASE_RETURN_OTHER(VP9PROFILE_PROFILE3); | 298 CASE_RETURN_OTHER(VP9PROFILE_PROFILE3); |
299 CASE_RETURN_OTHER(HEVCPROFILE_MAIN); | 299 CASE_RETURN_OTHER(HEVCPROFILE_MAIN); |
300 CASE_RETURN_OTHER(HEVCPROFILE_MAIN10); | 300 CASE_RETURN_OTHER(HEVCPROFILE_MAIN10); |
301 CASE_RETURN_OTHER(HEVCPROFILE_MAIN_STILL_PICTURE); | 301 CASE_RETURN_OTHER(HEVCPROFILE_MAIN_STILL_PICTURE); |
302 } | 302 } |
303 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 303 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
304 } | 304 } |
305 | 305 |
306 base::Optional<::media::VideoPixelFormat> ToMediaVideoPixelFormat( | 306 base::Optional<VideoPixelFormat> ToMediaVideoPixelFormat( |
307 pb::VideoDecoderConfig::Format value) { | 307 pb::VideoDecoderConfig::Format value) { |
308 using OriginType = pb::VideoDecoderConfig; | 308 using OriginType = pb::VideoDecoderConfig; |
309 using OtherType = ::media::VideoPixelFormat; | 309 using OtherType = VideoPixelFormat; |
310 switch (value) { | 310 switch (value) { |
311 CASE_RETURN_OTHER(PIXEL_FORMAT_UNKNOWN); | 311 CASE_RETURN_OTHER(PIXEL_FORMAT_UNKNOWN); |
312 CASE_RETURN_OTHER(PIXEL_FORMAT_I420); | 312 CASE_RETURN_OTHER(PIXEL_FORMAT_I420); |
313 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12); | 313 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12); |
314 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16); | 314 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16); |
315 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A); | 315 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A); |
316 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24); | 316 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24); |
317 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12); | 317 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12); |
318 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21); | 318 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21); |
319 CASE_RETURN_OTHER(PIXEL_FORMAT_UYVY); | 319 CASE_RETURN_OTHER(PIXEL_FORMAT_UYVY); |
(...skipping 14 matching lines...) Expand all Loading... |
334 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV422P12); | 334 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV422P12); |
335 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12); | 335 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12); |
336 CASE_RETURN_OTHER(PIXEL_FORMAT_Y8); | 336 CASE_RETURN_OTHER(PIXEL_FORMAT_Y8); |
337 CASE_RETURN_OTHER(PIXEL_FORMAT_Y16); | 337 CASE_RETURN_OTHER(PIXEL_FORMAT_Y16); |
338 CASE_RETURN_OTHER(PIXEL_FORMAT_I422); | 338 CASE_RETURN_OTHER(PIXEL_FORMAT_I422); |
339 } | 339 } |
340 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 340 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
341 } | 341 } |
342 | 342 |
343 base::Optional<pb::VideoDecoderConfig::Format> ToProtoVideoDecoderConfigFormat( | 343 base::Optional<pb::VideoDecoderConfig::Format> ToProtoVideoDecoderConfigFormat( |
344 ::media::VideoPixelFormat value) { | 344 VideoPixelFormat value) { |
345 using OriginType = ::media::VideoPixelFormat; | 345 using OriginType = VideoPixelFormat; |
346 using OtherType = pb::VideoDecoderConfig; | 346 using OtherType = pb::VideoDecoderConfig; |
347 switch (value) { | 347 switch (value) { |
348 CASE_RETURN_OTHER(PIXEL_FORMAT_UNKNOWN); | 348 CASE_RETURN_OTHER(PIXEL_FORMAT_UNKNOWN); |
349 CASE_RETURN_OTHER(PIXEL_FORMAT_I420); | 349 CASE_RETURN_OTHER(PIXEL_FORMAT_I420); |
350 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12); | 350 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12); |
351 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16); | 351 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16); |
352 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A); | 352 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A); |
353 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24); | 353 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24); |
354 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12); | 354 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12); |
355 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21); | 355 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21); |
(...skipping 14 matching lines...) Expand all Loading... |
370 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV420P12); | 370 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV420P12); |
371 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV422P12); | 371 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV422P12); |
372 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12); | 372 CASE_RETURN_OTHER(PIXEL_FORMAT_YUV444P12); |
373 CASE_RETURN_OTHER(PIXEL_FORMAT_Y8); | 373 CASE_RETURN_OTHER(PIXEL_FORMAT_Y8); |
374 CASE_RETURN_OTHER(PIXEL_FORMAT_Y16); | 374 CASE_RETURN_OTHER(PIXEL_FORMAT_Y16); |
375 CASE_RETURN_OTHER(PIXEL_FORMAT_I422); | 375 CASE_RETURN_OTHER(PIXEL_FORMAT_I422); |
376 } | 376 } |
377 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 377 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
378 } | 378 } |
379 | 379 |
380 base::Optional<::media::ColorSpace> ToMediaColorSpace( | 380 base::Optional<ColorSpace> ToMediaColorSpace( |
381 pb::VideoDecoderConfig::ColorSpace value) { | 381 pb::VideoDecoderConfig::ColorSpace value) { |
382 using OriginType = pb::VideoDecoderConfig; | 382 using OriginType = pb::VideoDecoderConfig; |
383 using OtherType = ::media::ColorSpace; | 383 using OtherType = ColorSpace; |
384 switch (value) { | 384 switch (value) { |
385 CASE_RETURN_OTHER(COLOR_SPACE_UNSPECIFIED); | 385 CASE_RETURN_OTHER(COLOR_SPACE_UNSPECIFIED); |
386 CASE_RETURN_OTHER(COLOR_SPACE_JPEG); | 386 CASE_RETURN_OTHER(COLOR_SPACE_JPEG); |
387 CASE_RETURN_OTHER(COLOR_SPACE_HD_REC709); | 387 CASE_RETURN_OTHER(COLOR_SPACE_HD_REC709); |
388 CASE_RETURN_OTHER(COLOR_SPACE_SD_REC601); | 388 CASE_RETURN_OTHER(COLOR_SPACE_SD_REC601); |
389 } | 389 } |
390 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 390 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
391 } | 391 } |
392 | 392 |
393 base::Optional<pb::VideoDecoderConfig::ColorSpace> | 393 base::Optional<pb::VideoDecoderConfig::ColorSpace> |
394 ToProtoVideoDecoderConfigColorSpace(::media::ColorSpace value) { | 394 ToProtoVideoDecoderConfigColorSpace(ColorSpace value) { |
395 using OriginType = ::media::ColorSpace; | 395 using OriginType = ColorSpace; |
396 using OtherType = pb::VideoDecoderConfig; | 396 using OtherType = pb::VideoDecoderConfig; |
397 switch (value) { | 397 switch (value) { |
398 CASE_RETURN_OTHER(COLOR_SPACE_UNSPECIFIED); | 398 CASE_RETURN_OTHER(COLOR_SPACE_UNSPECIFIED); |
399 CASE_RETURN_OTHER(COLOR_SPACE_JPEG); | 399 CASE_RETURN_OTHER(COLOR_SPACE_JPEG); |
400 CASE_RETURN_OTHER(COLOR_SPACE_HD_REC709); | 400 CASE_RETURN_OTHER(COLOR_SPACE_HD_REC709); |
401 CASE_RETURN_OTHER(COLOR_SPACE_SD_REC601); | 401 CASE_RETURN_OTHER(COLOR_SPACE_SD_REC601); |
402 } | 402 } |
403 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 403 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
404 } | 404 } |
405 | 405 |
406 base::Optional<::media::BufferingState> ToMediaBufferingState( | 406 base::Optional<BufferingState> ToMediaBufferingState( |
407 pb::RendererClientOnBufferingStateChange::State value) { | 407 pb::RendererClientOnBufferingStateChange::State value) { |
408 using OriginType = pb::RendererClientOnBufferingStateChange; | 408 using OriginType = pb::RendererClientOnBufferingStateChange; |
409 using OtherType = ::media::BufferingState; | 409 using OtherType = BufferingState; |
410 switch (value) { | 410 switch (value) { |
411 CASE_RETURN_OTHER(BUFFERING_HAVE_NOTHING); | 411 CASE_RETURN_OTHER(BUFFERING_HAVE_NOTHING); |
412 CASE_RETURN_OTHER(BUFFERING_HAVE_ENOUGH); | 412 CASE_RETURN_OTHER(BUFFERING_HAVE_ENOUGH); |
413 } | 413 } |
414 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 414 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
415 } | 415 } |
416 | 416 |
417 base::Optional<pb::RendererClientOnBufferingStateChange::State> | 417 base::Optional<pb::RendererClientOnBufferingStateChange::State> |
418 ToProtoMediaBufferingState(::media::BufferingState value) { | 418 ToProtoMediaBufferingState(BufferingState value) { |
419 using OriginType = ::media::BufferingState; | 419 using OriginType = BufferingState; |
420 using OtherType = pb::RendererClientOnBufferingStateChange; | 420 using OtherType = pb::RendererClientOnBufferingStateChange; |
421 switch (value) { | 421 switch (value) { |
422 CASE_RETURN_OTHER(BUFFERING_HAVE_NOTHING); | 422 CASE_RETURN_OTHER(BUFFERING_HAVE_NOTHING); |
423 CASE_RETURN_OTHER(BUFFERING_HAVE_ENOUGH); | 423 CASE_RETURN_OTHER(BUFFERING_HAVE_ENOUGH); |
424 } | 424 } |
425 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 425 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
426 } | 426 } |
427 | 427 |
428 base::Optional<::media::CdmKeyInformation::KeyStatus> | 428 base::Optional<CdmKeyInformation::KeyStatus> ToMediaCdmKeyInformationKeyStatus( |
429 ToMediaCdmKeyInformationKeyStatus(pb::CdmKeyInformation::KeyStatus value) { | 429 pb::CdmKeyInformation::KeyStatus value) { |
430 using OriginType = pb::CdmKeyInformation; | 430 using OriginType = pb::CdmKeyInformation; |
431 using OtherType = ::media::CdmKeyInformation; | 431 using OtherType = CdmKeyInformation; |
432 switch (value) { | 432 switch (value) { |
433 CASE_RETURN_OTHER(USABLE); | 433 CASE_RETURN_OTHER(USABLE); |
434 CASE_RETURN_OTHER(INTERNAL_ERROR); | 434 CASE_RETURN_OTHER(INTERNAL_ERROR); |
435 CASE_RETURN_OTHER(EXPIRED); | 435 CASE_RETURN_OTHER(EXPIRED); |
436 CASE_RETURN_OTHER(OUTPUT_RESTRICTED); | 436 CASE_RETURN_OTHER(OUTPUT_RESTRICTED); |
437 CASE_RETURN_OTHER(OUTPUT_DOWNSCALED); | 437 CASE_RETURN_OTHER(OUTPUT_DOWNSCALED); |
438 CASE_RETURN_OTHER(KEY_STATUS_PENDING); | 438 CASE_RETURN_OTHER(KEY_STATUS_PENDING); |
439 CASE_RETURN_OTHER(RELEASED); | 439 CASE_RETURN_OTHER(RELEASED); |
440 } | 440 } |
441 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 441 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
442 } | 442 } |
443 | 443 |
444 base::Optional<pb::CdmKeyInformation::KeyStatus> ToProtoCdmKeyInformation( | 444 base::Optional<pb::CdmKeyInformation::KeyStatus> ToProtoCdmKeyInformation( |
445 ::media::CdmKeyInformation::KeyStatus value) { | 445 CdmKeyInformation::KeyStatus value) { |
446 using OriginType = ::media::CdmKeyInformation; | 446 using OriginType = CdmKeyInformation; |
447 using OtherType = pb::CdmKeyInformation; | 447 using OtherType = pb::CdmKeyInformation; |
448 switch (value) { | 448 switch (value) { |
449 CASE_RETURN_OTHER(USABLE); | 449 CASE_RETURN_OTHER(USABLE); |
450 CASE_RETURN_OTHER(INTERNAL_ERROR); | 450 CASE_RETURN_OTHER(INTERNAL_ERROR); |
451 CASE_RETURN_OTHER(EXPIRED); | 451 CASE_RETURN_OTHER(EXPIRED); |
452 CASE_RETURN_OTHER(OUTPUT_RESTRICTED); | 452 CASE_RETURN_OTHER(OUTPUT_RESTRICTED); |
453 CASE_RETURN_OTHER(OUTPUT_DOWNSCALED); | 453 CASE_RETURN_OTHER(OUTPUT_DOWNSCALED); |
454 CASE_RETURN_OTHER(KEY_STATUS_PENDING); | 454 CASE_RETURN_OTHER(KEY_STATUS_PENDING); |
455 CASE_RETURN_OTHER(RELEASED); | 455 CASE_RETURN_OTHER(RELEASED); |
456 } | 456 } |
457 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 457 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
458 } | 458 } |
459 | 459 |
460 base::Optional<::media::CdmPromise::Exception> ToCdmPromiseException( | 460 base::Optional<CdmPromise::Exception> ToCdmPromiseException( |
461 pb::CdmException value) { | 461 pb::CdmException value) { |
462 using OriginType = pb::CdmException; | 462 using OriginType = pb::CdmException; |
463 using OtherType = ::media::CdmPromise; | 463 using OtherType = CdmPromise; |
464 switch (value) { | 464 switch (value) { |
465 CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR); | 465 CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR); |
466 CASE_RETURN_OTHER(INVALID_STATE_ERROR); | 466 CASE_RETURN_OTHER(INVALID_STATE_ERROR); |
467 CASE_RETURN_OTHER(INVALID_ACCESS_ERROR); | 467 CASE_RETURN_OTHER(INVALID_ACCESS_ERROR); |
468 CASE_RETURN_OTHER(QUOTA_EXCEEDED_ERROR); | 468 CASE_RETURN_OTHER(QUOTA_EXCEEDED_ERROR); |
469 CASE_RETURN_OTHER(UNKNOWN_ERROR); | 469 CASE_RETURN_OTHER(UNKNOWN_ERROR); |
470 CASE_RETURN_OTHER(CLIENT_ERROR); | 470 CASE_RETURN_OTHER(CLIENT_ERROR); |
471 CASE_RETURN_OTHER(OUTPUT_ERROR); | 471 CASE_RETURN_OTHER(OUTPUT_ERROR); |
472 } | 472 } |
473 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 473 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
474 } | 474 } |
475 | 475 |
476 base::Optional<pb::CdmException> ToProtoCdmException( | 476 base::Optional<pb::CdmException> ToProtoCdmException( |
477 ::media::CdmPromise::Exception value) { | 477 CdmPromise::Exception value) { |
478 using OriginType = ::media::CdmPromise; | 478 using OriginType = CdmPromise; |
479 using OtherType = pb::CdmException; | 479 using OtherType = pb::CdmException; |
480 switch (value) { | 480 switch (value) { |
481 CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR); | 481 CASE_RETURN_OTHER(NOT_SUPPORTED_ERROR); |
482 CASE_RETURN_OTHER(INVALID_STATE_ERROR); | 482 CASE_RETURN_OTHER(INVALID_STATE_ERROR); |
483 CASE_RETURN_OTHER(INVALID_ACCESS_ERROR); | 483 CASE_RETURN_OTHER(INVALID_ACCESS_ERROR); |
484 CASE_RETURN_OTHER(QUOTA_EXCEEDED_ERROR); | 484 CASE_RETURN_OTHER(QUOTA_EXCEEDED_ERROR); |
485 CASE_RETURN_OTHER(UNKNOWN_ERROR); | 485 CASE_RETURN_OTHER(UNKNOWN_ERROR); |
486 CASE_RETURN_OTHER(CLIENT_ERROR); | 486 CASE_RETURN_OTHER(CLIENT_ERROR); |
487 CASE_RETURN_OTHER(OUTPUT_ERROR); | 487 CASE_RETURN_OTHER(OUTPUT_ERROR); |
488 } | 488 } |
489 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 489 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
490 } | 490 } |
491 | 491 |
492 base::Optional<::media::ContentDecryptionModule::MessageType> | 492 base::Optional<ContentDecryptionModule::MessageType> ToMediaCdmMessageType( |
493 ToMediaCdmMessageType(pb::CdmMessageType value) { | 493 pb::CdmMessageType value) { |
494 using OriginType = pb::CdmMessageType; | 494 using OriginType = pb::CdmMessageType; |
495 using OtherType = ::media::ContentDecryptionModule; | 495 using OtherType = ContentDecryptionModule; |
496 switch (value) { | 496 switch (value) { |
497 CASE_RETURN_OTHER(LICENSE_REQUEST); | 497 CASE_RETURN_OTHER(LICENSE_REQUEST); |
498 CASE_RETURN_OTHER(LICENSE_RENEWAL); | 498 CASE_RETURN_OTHER(LICENSE_RENEWAL); |
499 CASE_RETURN_OTHER(LICENSE_RELEASE); | 499 CASE_RETURN_OTHER(LICENSE_RELEASE); |
500 } | 500 } |
501 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 501 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
502 } | 502 } |
503 | 503 |
504 base::Optional<pb::CdmMessageType> ToProtoCdmMessageType( | 504 base::Optional<pb::CdmMessageType> ToProtoCdmMessageType( |
505 ::media::ContentDecryptionModule::MessageType value) { | 505 ContentDecryptionModule::MessageType value) { |
506 using OriginType = ::media::ContentDecryptionModule; | 506 using OriginType = ContentDecryptionModule; |
507 using OtherType = pb::CdmMessageType; | 507 using OtherType = pb::CdmMessageType; |
508 switch (value) { | 508 switch (value) { |
509 CASE_RETURN_OTHER(LICENSE_REQUEST); | 509 CASE_RETURN_OTHER(LICENSE_REQUEST); |
510 CASE_RETURN_OTHER(LICENSE_RENEWAL); | 510 CASE_RETURN_OTHER(LICENSE_RENEWAL); |
511 CASE_RETURN_OTHER(LICENSE_RELEASE); | 511 CASE_RETURN_OTHER(LICENSE_RELEASE); |
512 } | 512 } |
513 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 513 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
514 } | 514 } |
515 | 515 |
516 base::Optional<::media::CdmSessionType> ToCdmSessionType( | 516 base::Optional<CdmSessionType> ToCdmSessionType(pb::CdmSessionType value) { |
517 pb::CdmSessionType value) { | |
518 using OriginType = pb::CdmSessionType; | 517 using OriginType = pb::CdmSessionType; |
519 using OtherType = ::media::CdmSessionType; | 518 using OtherType = CdmSessionType; |
520 switch (value) { | 519 switch (value) { |
521 CASE_RETURN_OTHER(TEMPORARY_SESSION); | 520 CASE_RETURN_OTHER(TEMPORARY_SESSION); |
522 CASE_RETURN_OTHER(PERSISTENT_LICENSE_SESSION); | 521 CASE_RETURN_OTHER(PERSISTENT_LICENSE_SESSION); |
523 CASE_RETURN_OTHER(PERSISTENT_RELEASE_MESSAGE_SESSION); | 522 CASE_RETURN_OTHER(PERSISTENT_RELEASE_MESSAGE_SESSION); |
524 } | 523 } |
525 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 524 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
526 } | 525 } |
527 | 526 |
528 base::Optional<pb::CdmSessionType> ToProtoCdmSessionType( | 527 base::Optional<pb::CdmSessionType> ToProtoCdmSessionType(CdmSessionType value) { |
529 ::media::CdmSessionType value) { | 528 using OriginType = CdmSessionType; |
530 using OriginType = ::media::CdmSessionType; | |
531 using OtherType = pb::CdmSessionType; | 529 using OtherType = pb::CdmSessionType; |
532 switch (value) { | 530 switch (value) { |
533 CASE_RETURN_OTHER(TEMPORARY_SESSION); | 531 CASE_RETURN_OTHER(TEMPORARY_SESSION); |
534 CASE_RETURN_OTHER(PERSISTENT_LICENSE_SESSION); | 532 CASE_RETURN_OTHER(PERSISTENT_LICENSE_SESSION); |
535 CASE_RETURN_OTHER(PERSISTENT_RELEASE_MESSAGE_SESSION); | 533 CASE_RETURN_OTHER(PERSISTENT_RELEASE_MESSAGE_SESSION); |
536 } | 534 } |
537 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 535 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
538 } | 536 } |
539 | 537 |
540 base::Optional<::media::EmeInitDataType> ToMediaEmeInitDataType( | 538 base::Optional<EmeInitDataType> ToMediaEmeInitDataType( |
541 pb::CdmCreateSessionAndGenerateRequest::EmeInitDataType value) { | 539 pb::CdmCreateSessionAndGenerateRequest::EmeInitDataType value) { |
542 using OriginType = pb::CdmCreateSessionAndGenerateRequest; | 540 using OriginType = pb::CdmCreateSessionAndGenerateRequest; |
543 using OtherType = ::media::EmeInitDataType; | 541 using OtherType = EmeInitDataType; |
544 switch (value) { | 542 switch (value) { |
545 CASE_RETURN_OTHER(UNKNOWN); | 543 CASE_RETURN_OTHER(UNKNOWN); |
546 CASE_RETURN_OTHER(WEBM); | 544 CASE_RETURN_OTHER(WEBM); |
547 CASE_RETURN_OTHER(CENC); | 545 CASE_RETURN_OTHER(CENC); |
548 CASE_RETURN_OTHER(KEYIDS); | 546 CASE_RETURN_OTHER(KEYIDS); |
549 } | 547 } |
550 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 548 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
551 } | 549 } |
552 | 550 |
553 base::Optional<pb::CdmCreateSessionAndGenerateRequest::EmeInitDataType> | 551 base::Optional<pb::CdmCreateSessionAndGenerateRequest::EmeInitDataType> |
554 ToProtoMediaEmeInitDataType(::media::EmeInitDataType value) { | 552 ToProtoMediaEmeInitDataType(EmeInitDataType value) { |
555 using OriginType = ::media::EmeInitDataType; | 553 using OriginType = EmeInitDataType; |
556 using OtherType = pb::CdmCreateSessionAndGenerateRequest; | 554 using OtherType = pb::CdmCreateSessionAndGenerateRequest; |
557 switch (value) { | 555 switch (value) { |
558 CASE_RETURN_OTHER(UNKNOWN); | 556 CASE_RETURN_OTHER(UNKNOWN); |
559 CASE_RETURN_OTHER(WEBM); | 557 CASE_RETURN_OTHER(WEBM); |
560 CASE_RETURN_OTHER(CENC); | 558 CASE_RETURN_OTHER(CENC); |
561 CASE_RETURN_OTHER(KEYIDS); | 559 CASE_RETURN_OTHER(KEYIDS); |
562 } | 560 } |
563 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 561 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
564 } | 562 } |
565 | 563 |
566 base::Optional<::media::DemuxerStream::Status> ToDemuxerStreamStatus( | 564 base::Optional<DemuxerStream::Status> ToDemuxerStreamStatus( |
567 pb::DemuxerStreamReadUntilCallback::Status value) { | 565 pb::DemuxerStreamReadUntilCallback::Status value) { |
568 using OriginType = pb::DemuxerStreamReadUntilCallback; | 566 using OriginType = pb::DemuxerStreamReadUntilCallback; |
569 using OtherType = ::media::DemuxerStream; | 567 using OtherType = DemuxerStream; |
570 switch (value) { | 568 switch (value) { |
571 CASE_RETURN_OTHER(kOk); | 569 CASE_RETURN_OTHER(kOk); |
572 CASE_RETURN_OTHER(kAborted); | 570 CASE_RETURN_OTHER(kAborted); |
573 CASE_RETURN_OTHER(kConfigChanged); | 571 CASE_RETURN_OTHER(kConfigChanged); |
574 } | 572 } |
575 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 573 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
576 } | 574 } |
577 | 575 |
578 base::Optional<pb::DemuxerStreamReadUntilCallback::Status> | 576 base::Optional<pb::DemuxerStreamReadUntilCallback::Status> |
579 ToProtoDemuxerStreamStatus(::media::DemuxerStream::Status value) { | 577 ToProtoDemuxerStreamStatus(DemuxerStream::Status value) { |
580 using OriginType = ::media::DemuxerStream; | 578 using OriginType = DemuxerStream; |
581 using OtherType = pb::DemuxerStreamReadUntilCallback; | 579 using OtherType = pb::DemuxerStreamReadUntilCallback; |
582 switch (value) { | 580 switch (value) { |
583 CASE_RETURN_OTHER(kOk); | 581 CASE_RETURN_OTHER(kOk); |
584 CASE_RETURN_OTHER(kAborted); | 582 CASE_RETURN_OTHER(kAborted); |
585 CASE_RETURN_OTHER(kConfigChanged); | 583 CASE_RETURN_OTHER(kConfigChanged); |
586 } | 584 } |
587 return base::nullopt; // Not a 'default' to ensure compile-time checks. | 585 return base::nullopt; // Not a 'default' to ensure compile-time checks. |
588 } | 586 } |
589 | 587 |
590 } // namespace remoting | 588 } // namespace remoting |
591 } // namespace media | 589 } // namespace media |
OLD | NEW |