From e7a4dde677e051e5114497aca04d8028ca081d1e Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Wed, 9 Dec 2015 15:54:02 -0800 Subject: [PATCH] Replace "pixel aspect ratio" with "pixel_aspect_ratio" in stream info msg Change-Id: Ia70b084df9b1b4bdf94a308bcc746f3ad2b5ad8e --- packager/app/test/packager_test.py | 5 ++--- packager/media/base/video_stream_info.cc | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index f8b6d1d647..bbe7d6a328 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -50,7 +50,7 @@ class PackagerAppTest(unittest.TestCase): ' codec: H264\n' ' width: 640\n' ' height: 360\n' - ' pixel aspect ratio: 1:1\n' + ' pixel_aspect_ratio: 1:1\n' ' trick_play_rate: 0\n' ' nalu_length_size: 4\n\n' 'Stream [1] type: Audio\n' @@ -327,8 +327,7 @@ class PackagerAppTest(unittest.TestCase): flags += ['--enable_fixed_key_encryption', '--key_id=31323334353637383930313233343536', '--key=32333435363738393021323334353637', - '--pssh=31323334353637383930313233343536', - '--clear_lead=1'] + '--pssh=31323334353637383930313233343536', '--clear_lead=1'] if not random_iv: flags.append('--iv=3334353637383930') if key_rotation: diff --git a/packager/media/base/video_stream_info.cc b/packager/media/base/video_stream_info.cc index 2ec7fa51a2..48f32685c5 100644 --- a/packager/media/base/video_stream_info.cc +++ b/packager/media/base/video_stream_info.cc @@ -91,7 +91,7 @@ bool VideoStreamInfo::IsValidConfig() const { std::string VideoStreamInfo::ToString() const { return base::StringPrintf( - "%s codec: %s\n width: %d\n height: %d\n pixel aspect ratio: %d:%d\n " + "%s codec: %s\n width: %d\n height: %d\n pixel_aspect_ratio: %d:%d\n " "trick_play_rate: %d\n nalu_length_size: %d\n", StreamInfo::ToString().c_str(), VideoCodecToString(codec_).c_str(), width_, height_, pixel_width_, pixel_height_, trick_play_rate_,