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

Unified Diff: media/capture/video/file_video_capture_device.cc

Issue 2593673003: Support 420mpeg2 Y4M input in FileVideoCaptureDevice (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/file_video_capture_device.cc
diff --git a/media/capture/video/file_video_capture_device.cc b/media/capture/video/file_video_capture_device.cc
index b52f352c3fa346f8ca7f2e3d049e77945ea021eb..bdac8fbfe0bae6edb2cb5a07dced625f77c99bfc 100644
--- a/media/capture/video/file_video_capture_device.cc
+++ b/media/capture/video/file_video_capture_device.cc
@@ -91,7 +91,8 @@ void ParseY4MTags(const std::string& file_header,
// Pixel aspect ratio ignored.
break;
case 'C':
- CHECK(token == "420" || token == "420jpeg" || token == "420paldv")
+ CHECK(token == "420" || token == "420jpeg" || token == "420mpeg2" ||
+ token == "420paldv")
mcasas 2016/12/20 19:57:19 Funny formatting, but if git cl format media is ok
<< token; // Only I420 is supported, and we fudge the variants.
break;
default:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698