From d192dce1c5f736e2453cd8f8567b1ce36822d00d Mon Sep 17 00:00:00 2001 From: mandermo Date: Wed, 2 Nov 2016 09:15:41 -0700 Subject: [PATCH] More tolerant format name for FileVideoCapturer Before only C420 as format name was accepted, now C420mpeg2 is also accepted. Both means the same thing. BUG=webrtc:6545 NOTRY=True Review-Url: https://codereview.webrtc.org/2468943002 Cr-Commit-Position: refs/heads/master@{#14897} --- .../api/android/java/src/org/webrtc/FileVideoCapturer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webrtc/api/android/java/src/org/webrtc/FileVideoCapturer.java b/webrtc/api/android/java/src/org/webrtc/FileVideoCapturer.java index 3796b698f4..a0552247c9 100644 --- a/webrtc/api/android/java/src/org/webrtc/FileVideoCapturer.java +++ b/webrtc/api/android/java/src/org/webrtc/FileVideoCapturer.java @@ -87,8 +87,9 @@ public class FileVideoCapturer implements VideoCapturer { } } Logging.d(TAG, "Color space: " + colorSpace); - if (!colorSpace.equals("420")) { - throw new IllegalArgumentException("Does not support any other color space than I420"); + if (!colorSpace.equals("420") && !colorSpace.equals("420mpeg2")) { + throw new IllegalArgumentException( + "Does not support any other color space than I420 or I420mpeg2"); } if ((w % 2) == 1 || (h % 2) == 1) { throw new IllegalArgumentException("Does not support odd width or height");