commit 5292654d7b7cbe4a7abe408a049aeca373cd856f
author Magnus Jedvert <magjed@webrtc.org> Mon Sep 03 13:49:07 2018
committer Commit Bot <commit-bot@chromium.org> Tue Sep 04 07:39:13 2018
tree fb0752e6f34627c5059883abad2948108aa7acb2
parent a421775a6d4f78f7aa9c3ea020a8834e049efbcc

Reland "Fix a bug in barcode_decoder.py"

This is a reland of 5c2de6b3ce079cff52c411a2c02ce6553a38dc79

Original change's description:
> 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.
>
> 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}

Bug: webrtc:9642
Change-Id: Iea6aad249839f9b1dad830bdf194cef2cc7dcfa6
Reviewed-on: https://webrtc-review.googlesource.com/97441
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24542}

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..078e47f 100755
--- a/rtc_tools/barcode_tools/barcode_decoder.py
+++ b/rtc_tools/barcode_tools/barcode_decoder.py
@@ -22,7 +22,7 @@
 
 
 def ConvertYuvToPngFiles(yuv_file_name, yuv_frame_width, yuv_frame_height,
-                             output_directory, ffmpeg_path):
+                         output_directory, ffmpeg_path):
   """Converts a YUV video file into PNG frames.
 
   The function uses ffmpeg to convert the YUV file. The output of ffmpeg is in
@@ -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)