ITS: centralize ffmpeg logging
files affected:
tests/scene4/test_preview_aspect_ratio_and_crop.py
tests/scene4/test_preview_stabilization_fov.py
tests/scene4/test_video_aspect_ratio_and_crop.py
tests/sensor_fusion/test_preview_stabilization.py
tests/sensor_fusion/test_video_stabilization.py
utils/video_processing_utils.py
bug: 269360962
Change-Id: Iec9e060dd3864a1deaf8b1ca3c34927d716e0ae8
diff --git a/apps/CameraITS/tests/scene4/test_preview_aspect_ratio_and_crop.py b/apps/CameraITS/tests/scene4/test_preview_aspect_ratio_and_crop.py
index 5d7ed9a..2ee1cf4 100644
--- a/apps/CameraITS/tests/scene4/test_preview_aspect_ratio_and_crop.py
+++ b/apps/CameraITS/tests/scene4/test_preview_aspect_ratio_and_crop.py
@@ -137,9 +137,7 @@
def test_preview_aspect_ratio_and_crop(self):
log_path = self.log_path
- # Get ffmpeg version being used.
- ffmpeg_version = video_processing_utils.get_ffmpeg_version()
- logging.debug('ffmpeg_version: %s', ffmpeg_version)
+ video_processing_utils.log_ffmpeg_version()
with its_session_utils.ItsSession(
device_id=self.dut.serial,
diff --git a/apps/CameraITS/tests/scene4/test_preview_stabilization_fov.py b/apps/CameraITS/tests/scene4/test_preview_stabilization_fov.py
index 2028d6f..f594c7c 100644
--- a/apps/CameraITS/tests/scene4/test_preview_stabilization_fov.py
+++ b/apps/CameraITS/tests/scene4/test_preview_stabilization_fov.py
@@ -151,9 +151,8 @@
'First API level should be {} or higher. Found {}.'.format(
its_session_utils.ANDROID13_API_LEVEL, first_api_level))
- # Get ffmpeg version being used.
- ffmpeg_version = video_processing_utils.get_ffmpeg_version()
- logging.debug('ffmpeg_version: %s', ffmpeg_version)
+ # Log ffmpeg version being used
+ video_processing_utils.log_ffmpeg_version()
supported_stabilization_modes = props[
'android.control.availableVideoStabilizationModes'
diff --git a/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py b/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
index 52121d8..7fbeff0 100644
--- a/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
+++ b/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
@@ -184,9 +184,8 @@
run_crop_test = full_or_better and raw_avlb
- # Get ffmpeg version being used.
- ffmpeg_version = video_processing_utils.get_ffmpeg_version()
- logging.debug('ffmpeg_version: %s', ffmpeg_version)
+ # Log ffmpeg version being used.
+ video_processing_utils.log_ffmpeg_version()
for quality_profile_id_pair in supported_video_qualities:
quality = quality_profile_id_pair.split(':')[0]
diff --git a/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py b/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py
index d865168..88967de 100644
--- a/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py
+++ b/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py
@@ -133,9 +133,8 @@
# Calculate camera FoV and convert from string to float
camera_fov = float(cam.calc_camera_fov(props))
- # Get ffmpeg version being used
- ffmpeg_version = video_processing_utils.get_ffmpeg_version()
- logging.debug('ffmpeg_version: %s', ffmpeg_version)
+ # Log ffmpeg version being used
+ video_processing_utils.log_ffmpeg_version()
# Raise error if not FRONT or REAR facing camera
facing = props['android.lens.facing']
diff --git a/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py b/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py
index 2e98179..f587027 100644
--- a/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py
+++ b/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py
@@ -126,9 +126,8 @@
# Calculate camera FoV and convert from string to float
camera_fov = float(cam.calc_camera_fov(props))
- # Get ffmpeg version being used
- ffmpeg_version = video_processing_utils.get_ffmpeg_version()
- logging.debug('ffmpeg_version: %s', ffmpeg_version)
+ # Log ffmpeg version being used
+ video_processing_utils.log_ffmpeg_version()
# Raise error if not FRONT or REAR facing camera
facing = props['android.lens.facing']
diff --git a/apps/CameraITS/utils/video_processing_utils.py b/apps/CameraITS/utils/video_processing_utils.py
index f19efa9..5717150c 100644
--- a/apps/CameraITS/utils/video_processing_utils.py
+++ b/apps/CameraITS/utils/video_processing_utils.py
@@ -50,8 +50,8 @@
}
-def get_ffmpeg_version():
- """Returns the ffmpeg version being used."""
+def log_ffmpeg_version():
+ """Logs the ffmpeg version being used."""
ffmpeg_version_cmd = ('ffmpeg -version')
p = subprocess.Popen(ffmpeg_version_cmd, shell=True, stdout=subprocess.PIPE)
@@ -59,7 +59,7 @@
if p.poll() != 0:
raise error_util.CameraItsError('Error running ffmpeg version cmd.')
decoded_output = output.decode('utf-8')
- return decoded_output.split(' ')[2]
+ logging.debug('ffmpeg version: %s', decoded_output.split(' ')[2])
def extract_key_frames_from_video(log_path, video_file_name):
