From 5c2de6b3ce079cff52c411a2c02ce6553a38dc79 Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Fri, 24 Aug 2018 17:34:11 +0200 Subject: [PATCH] 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 Commit-Queue: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#24431} --- rtc_tools/barcode_tools/barcode_decoder.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rtc_tools/barcode_tools/barcode_decoder.py b/rtc_tools/barcode_tools/barcode_decoder.py index 2abd677b4b..6be0f5d350 100755 --- a/rtc_tools/barcode_tools/barcode_decoder.py +++ b/rtc_tools/barcode_tools/barcode_decoder.py @@ -44,9 +44,13 @@ def ConvertYuvToPngFiles(yuv_file_name, yuv_frame_width, yuv_frame_height, 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)