admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More tolerant format name for FileVideoCapturer

Browse Source 
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}
This commit is contained in:
mandermo 2016-11-02 09:15:41 -07:00 committed by Commit bot
parent d0a151c698
commit d192dce1c5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/api/android/java/src/org/webrtc/FileVideoCapturer.java
View File

@ -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");