Change all numerical string inputs to int and remove unused stderr

webrtc/tools/video_analysis.py

 #!/usr/bin/env python
 # Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import glob
@@ skipping 23 matching lines @@
 
 class CompareVideosError(Error):
   pass
 
 
 def _ParseArgs():
   """Registers the command-line options."""
   usage = 'usage: %prog [options]'
   parser = optparse.OptionParser(usage=usage)
 
-  parser.add_option('--frame_width', type='string', default='1280',
+  parser.add_option('--frame_width', type='int', default=1280,
                     help='Width of the recording. Default: %default')
-  parser.add_option('--frame_height', type='string', default='720',
+  parser.add_option('--frame_height', type='int', default=720,
                     help='Height of the recording. Default: %default')
-  parser.add_option('--framerate', type='string', default='60',
+  parser.add_option('--framerate', type='int', default=60,
                     help='Recording framerate. Default: %default')
-  parser.add_option('--ref_duration', type='string', default='20',
+  parser.add_option('--ref_duration', type='int', default=20,
                     help='Reference recording duration. Default: %default')
-  parser.add_option('--test_duration', type='string', default='10',
+  parser.add_option('--test_duration', type='int', default=10,
                     help='Test recording duration. Default: %default')
-  parser.add_option('--time_between_recordings', type=float, default=5,
+  parser.add_option('--time_between_recordings', type='int', default=5,
                     help='Time between starting test recording after ref.'
                     'Default: %default')
   parser.add_option('--ref_video_device', type='string', default='/dev/video0',
                     help='Reference recording device. Default: %default')
   parser.add_option('--test_video_device', type='string', default='/dev/video1',
                     help='Test recording device. Default: %default')
   parser.add_option('--app_name', type='string',
                     help='Name of the app under test.')
   parser.add_option('--recording_api', type='string', default='Video4Linux2',
                     help='Recording API to use. Default: %default')
@@ skipping 207 matching lines @@
   ref_file = os.path.join(ref_file_location, ref_file_name)
 
   test_file_name = '%s_%s_test.%s' % (options.app_name, CURRENT_TIME,
     options.video_container)
   test_file = os.path.join(test_file_location, test_file_name)
 
   # Reference video recorder command line.
   ref_cmd = [
     options.ffmpeg,
     '-v', 'error',
-    '-s', options.frame_width + 'x' + options.frame_height,
-    '-framerate', options.framerate,
-    '-f', options.recording_api,
-    '-i', options.ref_video_device,
-    '-pix_fmt', options.pixel_format,
-    '-s', options.frame_width + 'x' + options.frame_height,
-    '-t', options.ref_duration,
-    '-framerate', options.framerate,
+    '-s', '%dx%d' % (options.frame_width, options.frame_height),
+    '-r', '%d' % options.framerate,
+    '-f', '%s' % options.recording_api,
+    '-i', '%s' % options.ref_video_device,
+    '-pix_fmt', '%s' % options.pixel_format,
+    '-s', '%dx%d' % (options.frame_width, options.frame_height),
+    '-t', '%d' % options.ref_duration,
+    '-r', '%d' % options.framerate,
     ref_file
   ]
 
   # Test video recorder command line.
   test_cmd = [
     options.ffmpeg,
     '-v', 'error',
-    '-s', options.frame_width + 'x' + options.frame_height,
-    '-framerate', options.framerate,
-    '-f', options.recording_api,
-    '-i', options.test_video_device,
-    '-pix_fmt', options.pixel_format,
-    '-s', options.frame_width + 'x' + options.frame_height,
-    '-t', options.test_duration,
-    '-framerate', options.framerate,
+    '-s', '%dx%d' % (options.frame_width, options.frame_height),
+    '-r', '%d' % options.framerate,
+    '-f', '%s' % options.recording_api,
+    '-i', '%s' % options.test_video_device,
+    '-pix_fmt', '%s' % options.pixel_format,
+    '-s', '%dx%d' % (options.frame_width, options.frame_height),
+    '-t', '%d' % options.test_duration,
+    '-r', '%d' % options.framerate,
     test_file
   ]
   print 'Trying to record from reference recorder...'
-  ref_recorder = subprocess.Popen(ref_cmd, stderr=sys.stderr)
+  ref_recorder = subprocess.Popen(ref_cmd)
 
   # Start the 2nd recording a little later to ensure the 1st one has started.
   # TODO(jansson) Check that the ref_recorder output file exists rather than
   # using sleep.
   time.sleep(options.time_between_recordings)
   print 'Trying to record from test recorder...'
-  test_recorder = subprocess.Popen(test_cmd, stderr=sys.stderr)
+  test_recorder = subprocess.Popen(test_cmd)
   test_recorder.wait()
   ref_recorder.wait()
 
   # ffmpeg does not abort when it fails, need to check return code.
   if ref_recorder.returncode != 0 or test_recorder.returncode != 0:
     # Cleanup recording directories.
     shutil.rmtree(ref_file_location)
     shutil.rmtree(test_file_location)
     raise FfmpegError('Recording failed, check ffmpeg output.')
   else:
@@ skipping 28 matching lines @@
   print 'Trying to crop videos...'
 
   # Ref file cropping.
   cropped_ref_file_name = 'cropped_' + ref_file_name
   cropped_ref_file = os.path.abspath(
       os.path.join(ref_file_location, cropped_ref_file_name))
 
   ref_video_crop_cmd = [
     options.ffmpeg,
     '-v', 'error',
-    '-s', options.frame_width + 'x' + options.frame_height,
-    '-i', os.path.join(ref_file_location, ref_file_name),
-    '-vf', options.ref_crop_parameters,
+    '-s', '%dx%d' % (options.frame_width, options.frame_height),
+    '-i', '%s' % os.path.join(ref_file_location, ref_file_name),
+    '-vf', '%s' % options.ref_crop_parameters,
     '-c:a', 'copy',
     cropped_ref_file
   ]
 
   # Test file cropping.
   cropped_test_file_name = 'cropped_' + test_file_name
   cropped_test_file = os.path.abspath(
       os.path.join(test_file_location, cropped_test_file_name))
 
   test_video_crop_cmd = [
     options.ffmpeg,
     '-v', 'error',
-    '-s', options.frame_width + 'x' + options.frame_height,
-    '-i', os.path.join(test_file_location, test_file_name),
-    '-vf', options.test_crop_parameters,
+    '-s', '%dx%d' % (options.frame_width, options.frame_height),
+    '-i', '%s' % os.path.join(test_file_location, test_file_name),
+    '-vf', '%s' % options.test_crop_parameters,
     '-c:a', 'copy',
     cropped_test_file
   ]
 
   ref_crop = subprocess.Popen(ref_video_crop_cmd)
   ref_crop.wait()
   test_crop = subprocess.Popen(test_video_crop_cmd)
   test_crop.wait()
 
   # ffmpeg does not abort when it fails, need to check return code.
@@ skipping 35 matching lines @@
   compare_videos_script = os.path.abspath(options.compare_videos_script)
   rec_path = os.path.abspath(os.path.join(
     os.path.dirname(cropped_test_file)))
   result_file_name = os.path.join(rec_path, '%s_%s_result.txt') % (
     options.app_name, CURRENT_TIME)
 
   # Find the crop dimensions (e.g. 950 and 420) in the ref crop parameter
   # string: 'hflip, crop=950:420:130:56'
   for param in options.ref_crop_parameters.split('crop'):
     if param[0] == '=':
-      crop_width = param.split(':')[0].split('=')[1]
-      crop_height = param.split(':')[1]
+      crop_width = int(param.split(':')[0].split('=')[1])
+      crop_height = int(param.split(':')[1])
 
   compare_cmd = [
     compare_videos_script,
-    '--ref_video', cropped_ref_file,
-    '--test_video', cropped_test_file,
-    '--frame_analyzer', os.path.abspath(options.frame_analyzer),
-    '--zxing_path', options.zxing_path,
-    '--ffmpeg_path', options.ffmpeg,
-    '--stats_file_ref', os.path.join(os.path.dirname(cropped_ref_file),
-        cropped_ref_file + '_stats.txt'),
-    '--stats_file_test', os.path.join(os.path.dirname(cropped_test_file),
-        cropped_test_file + '_stats.txt'),
-    '--yuv_frame_height', crop_height,
-    '--yuv_frame_width', crop_width
+    '--ref_video=%s' % cropped_ref_file,
+    '--test_video=%s' % cropped_test_file,
+    '--frame_analyzer=%s' % os.path.abspath(options.frame_analyzer),
+    '--zxing_path=%s' % options.zxing_path,
+    '--ffmpeg_path=%s' % options.ffmpeg,
+    '--stats_file_ref=%s_stats.txt' %
+        os.path.join(os.path.dirname(cropped_ref_file), cropped_ref_file),
+    '--stats_file_test=%s_stats.txt' %
+        os.path.join(os.path.dirname(cropped_test_file), cropped_test_file),
+    '--yuv_frame_height=%d' % crop_height,
+    '--yuv_frame_width=%d' % crop_width
   ]
 
   with open(result_file_name, 'w') as f:
     try:
       compare_video_recordings = subprocess.check_output(compare_cmd)
       f.write(compare_video_recordings)
     except subprocess.CalledProcessError as error:
       raise CompareVideosError('Failed to perform comparison: %s' % error)
     else:
       print 'Result recorded to: %s' % os.path.abspath(result_file_name)
@@ skipping 38 matching lines @@
   if options.compare_videos_script:
     CompareVideos(options, recording_result['cropped_ref_file'],
                   recording_result['cropped_test_file'])
   else:
     print ('Skipping compare videos step due to compare_videos flag were not '
            'passed.')
 
 
 if __name__ == '__main__':
   sys.exit(main())