commit 5c2de6b3ce079cff52c411a2c02ce6553a38dc79
author Magnus Jedvert <magjed@webrtc.org> Fri Aug 24 15:34:11 2018
committer Commit Bot <commit-bot@chromium.org> Fri Aug 24 15:36:46 2018
tree c68d263887f5389358248cbc5262217f5728b742
parent 85f20cbe4a536255c0bf5ec436a5f795ce14569c

Fix a bug in barcode_decoder.py

When converting from a .y4m file, it's illegal to pass a video_size
option since the resolution is already contained in the .y4m file.

TBR=phoglund@webrtc.org
NOTRY=TRUE

Bug: webrtc:9642
Change-Id: Iee7d2ba1332c45a1669af0fba43b0c3e7ce5846b
Reviewed-on: https://webrtc-review.googlesource.com/95949
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24431}

rtc_tools/barcode_tools/barcode_decoder.py

diff --git a/rtc_tools/barcode_tools/barcode_decoder.py b/rtc_tools/barcode_tools/barcode_decoder.py
index 2abd677..6be0f5d 100755
--- a/rtc_tools/barcode_tools/barcode_decoder.py
+++ b/rtc_tools/barcode_tools/barcode_decoder.py
@@ -44,9 +44,13 @@
   output_files_pattern = os.path.join(output_directory, 'frame_%04d.png')
   if not ffmpeg_path:
     ffmpeg_path = 'ffmpeg.exe' if sys.platform == 'win32' else 'ffmpeg'
-  command = [ffmpeg_path, '-s', '%s' % size_string, '-i', '%s'
-             % yuv_file_name, '-f', 'image2', '-vcodec', 'png',
-             '%s' % output_files_pattern]
+  if yuv_file_name.endswith('.yuv'):
+    command = [ffmpeg_path, '-s', '%s' % size_string, '-i', '%s'
+               % yuv_file_name, '-f', 'image2', '-vcodec', 'png',
+               '%s' % output_files_pattern]
+  else:
+    command = [ffmpeg_path, '-i', '%s' % yuv_file_name, '-f', 'image2',
+               '-vcodec', 'png', '%s' % output_files_pattern]
   try:
     print 'Converting YUV file to PNG images (may take a while)...'
     print ' '.join(command)