Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace "pixel aspect ratio" with "pixel_aspect_ratio" in stream info msg 

Change-Id: Ia70b084df9b1b4bdf94a308bcc746f3ad2b5ad8e
This commit is contained in:
KongQun Yang 2015-12-09 15:54:02 -08:00
parent 2806dffb47
commit e7a4dde677
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packager/app/test/packager_test.py
View File

@ -50,7 +50,7 @@ class PackagerAppTest(unittest.TestCase):
' codec: H264\n' ' codec: H264\n'
' width: 640\n' ' width: 640\n'
' height: 360\n' ' height: 360\n'
' pixel aspect ratio: 1:1\n' ' pixel_aspect_ratio: 1:1\n'
' trick_play_rate: 0\n' ' trick_play_rate: 0\n'
' nalu_length_size: 4\n\n' ' nalu_length_size: 4\n\n'
'Stream [1] type: Audio\n' 'Stream [1] type: Audio\n'
@ -327,8 +327,7 @@ class PackagerAppTest(unittest.TestCase):
flags += ['--enable_fixed_key_encryption', flags += ['--enable_fixed_key_encryption',
'--key_id=31323334353637383930313233343536', '--key_id=31323334353637383930313233343536',
'--key=32333435363738393021323334353637', '--key=32333435363738393021323334353637',
'--pssh=31323334353637383930313233343536', '--pssh=31323334353637383930313233343536', '--clear_lead=1']
'--clear_lead=1']
if not random_iv: if not random_iv:
flags.append('--iv=3334353637383930') flags.append('--iv=3334353637383930')
if key_rotation: if key_rotation:

2
packager/media/base/video_stream_info.cc
View File

@ -91,7 +91,7 @@ bool VideoStreamInfo::IsValidConfig() const {
std::string VideoStreamInfo::ToString() const { std::string VideoStreamInfo::ToString() const {
return base::StringPrintf( 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", "trick_play_rate: %d\n nalu_length_size: %d\n",
StreamInfo::ToString().c_str(), VideoCodecToString(codec_).c_str(), StreamInfo::ToString().c_str(), VideoCodecToString(codec_).c_str(),
width_, height_, pixel_width_, pixel_height_, trick_play_rate_, width_, height_, pixel_width_, pixel_height_, trick_play_rate_,