Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Side by Side Diff: media/remoting/rpc/proto_enum_utils.cc

Issue 2571163002: Add PIXEL_FORMAT_I422. (Closed)
Patch Set: fix compilation error in video_frame_unittest.cc Created 4 years 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 unified diff | Download patch
OLDNEW
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/rpc/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) \
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
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<::media::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 = ::media::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_I422);
erickung1 2016/12/14 19:42:26 any reason to add it here rather than add it at th
jcliang 2016/12/15 04:28:43 Nope. I put it here only because the name was simi
313 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12); 314 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12);
314 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16); 315 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16);
315 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A); 316 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A);
316 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24); 317 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24);
317 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12); 318 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12);
318 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21); 319 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21);
319 CASE_RETURN_OTHER(PIXEL_FORMAT_UYVY); 320 CASE_RETURN_OTHER(PIXEL_FORMAT_UYVY);
320 CASE_RETURN_OTHER(PIXEL_FORMAT_YUY2); 321 CASE_RETURN_OTHER(PIXEL_FORMAT_YUY2);
321 CASE_RETURN_OTHER(PIXEL_FORMAT_ARGB); 322 CASE_RETURN_OTHER(PIXEL_FORMAT_ARGB);
322 CASE_RETURN_OTHER(PIXEL_FORMAT_XRGB); 323 CASE_RETURN_OTHER(PIXEL_FORMAT_XRGB);
(...skipping 16 matching lines...) Expand all
339 return base::nullopt; // Not a 'default' to ensure compile-time checks. 340 return base::nullopt; // Not a 'default' to ensure compile-time checks.
340 } 341 }
341 342
342 base::Optional<pb::VideoDecoderConfig::Format> ToProtoVideoDecoderConfigFormat( 343 base::Optional<pb::VideoDecoderConfig::Format> ToProtoVideoDecoderConfigFormat(
343 ::media::VideoPixelFormat value) { 344 ::media::VideoPixelFormat value) {
344 using OriginType = ::media::VideoPixelFormat; 345 using OriginType = ::media::VideoPixelFormat;
345 using OtherType = pb::VideoDecoderConfig; 346 using OtherType = pb::VideoDecoderConfig;
346 switch (value) { 347 switch (value) {
347 CASE_RETURN_OTHER(PIXEL_FORMAT_UNKNOWN); 348 CASE_RETURN_OTHER(PIXEL_FORMAT_UNKNOWN);
348 CASE_RETURN_OTHER(PIXEL_FORMAT_I420); 349 CASE_RETURN_OTHER(PIXEL_FORMAT_I420);
350 CASE_RETURN_OTHER(PIXEL_FORMAT_I422);
349 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12); 351 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12);
350 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16); 352 CASE_RETURN_OTHER(PIXEL_FORMAT_YV16);
351 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A); 353 CASE_RETURN_OTHER(PIXEL_FORMAT_YV12A);
352 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24); 354 CASE_RETURN_OTHER(PIXEL_FORMAT_YV24);
353 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12); 355 CASE_RETURN_OTHER(PIXEL_FORMAT_NV12);
354 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21); 356 CASE_RETURN_OTHER(PIXEL_FORMAT_NV21);
355 CASE_RETURN_OTHER(PIXEL_FORMAT_UYVY); 357 CASE_RETURN_OTHER(PIXEL_FORMAT_UYVY);
356 CASE_RETURN_OTHER(PIXEL_FORMAT_YUY2); 358 CASE_RETURN_OTHER(PIXEL_FORMAT_YUY2);
357 CASE_RETURN_OTHER(PIXEL_FORMAT_ARGB); 359 CASE_RETURN_OTHER(PIXEL_FORMAT_ARGB);
358 CASE_RETURN_OTHER(PIXEL_FORMAT_XRGB); 360 CASE_RETURN_OTHER(PIXEL_FORMAT_XRGB);
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 switch (value) { 582 switch (value) {
581 CASE_RETURN_OTHER(kOk); 583 CASE_RETURN_OTHER(kOk);
582 CASE_RETURN_OTHER(kAborted); 584 CASE_RETURN_OTHER(kAborted);
583 CASE_RETURN_OTHER(kConfigChanged); 585 CASE_RETURN_OTHER(kConfigChanged);
584 } 586 }
585 return base::nullopt; // Not a 'default' to ensure compile-time checks. 587 return base::nullopt; // Not a 'default' to ensure compile-time checks.
586 } 588 }
587 589
588 } // namespace remoting 590 } // namespace remoting
589 } // namespace media 591 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698