From 72c3a7669930d0fa153c0335d9453a33183a56f7 Mon Sep 17 00:00:00 2001 From: Kongqun Yang Date: Fri, 20 May 2016 14:28:13 -0700 Subject: [PATCH] Update repo url in version string Issue #103 Change-Id: Iec7db3d155c81cf989f1078ed32692f8e037aa65 --- packager/app/packager_main.cc | 2 +- packager/app/test/packager_app.py | 2 +- packager/app/test/packager_test.py | 2 +- .../testdata/bear-320x240-opus-golden.webm | Bin 26604 -> 26604 bytes .../testdata/bear-320x240-vorbis-golden.webm | Bin 23999 -> 23999 bytes .../bear-320x240-vorbis-webm-golden.mpd | 2 +- .../testdata/bear-320x240-vp9-cenc-golden.mp4 | Bin 71866 -> 71866 bytes .../testdata/bear-320x240-vp9-cenc-golden.mpd | 2 +- .../test/testdata/bear-320x240-vp9-golden.mp4 | Bin 70684 -> 70684 bytes .../testdata/bear-320x240-vp9-golden.webm | Bin 69533 -> 69533 bytes .../bear-320x240-vp9-opus-webm-golden.mpd | 2 +- .../testdata/bear-640x360-a-cbc1-golden.mp4 | Bin 44600 -> 44600 bytes .../testdata/bear-640x360-a-cenc-golden.mp4 | Bin 44600 -> 44600 bytes .../test/testdata/bear-640x360-a-golden.mp4 | Bin 43688 -> 43688 bytes .../bear-640x360-a-live-cenc-golden-init.mp4 | Bin 939 -> 939 bytes ...0x360-a-live-cenc-rotation-golden-init.mp4 | Bin 891 -> 891 bytes .../bear-640x360-a-live-golden-init.mp4 | Bin 733 -> 733 bytes .../testdata/bear-640x360-av-cbc1-golden.mpd | 2 +- .../testdata/bear-640x360-av-cbcs-golden.mpd | 2 +- .../testdata/bear-640x360-av-cenc-golden.mpd | 2 +- .../bear-640x360-av-cenc-iop-golden.mpd | 2 +- .../testdata/bear-640x360-av-cens-golden.mpd | 2 +- .../test/testdata/bear-640x360-av-golden.mpd | 2 +- .../bear-640x360-av-live-cenc-golden.mpd | 2 +- .../bear-640x360-av-live-cenc-iop-golden.mpd | 2 +- ...r-640x360-av-live-cenc-rotation-golden.mpd | 2 +- ...0x360-av-live-cenc-rotation-iop-golden.mpd | 2 +- .../testdata/bear-640x360-av-live-golden.mpd | 2 +- .../test/testdata/bear-640x360-avt-golden.mpd | 2 +- .../bear-640x360-hevc-cenc-golden.mp4 | Bin 92793 -> 92793 bytes .../bear-640x360-hevc-cenc-golden.mpd | 2 +- .../testdata/bear-640x360-hevc-golden.mp4 | Bin 90515 -> 90515 bytes .../testdata/bear-640x360-v-cbc1-golden.mp4 | Bin 302867 -> 302867 bytes .../testdata/bear-640x360-v-cbcs-golden.mp4 | Bin 302460 -> 302460 bytes .../testdata/bear-640x360-v-cenc-golden.mp4 | Bin 302867 -> 302867 bytes .../testdata/bear-640x360-v-cens-golden.mp4 | Bin 302867 -> 302867 bytes .../test/testdata/bear-640x360-v-golden.mp4 | Bin 301665 -> 301665 bytes .../test/testdata/bear-640x360-v-golden.mpd | 2 +- .../bear-640x360-v-live-cenc-golden-init.mp4 | Bin 1063 -> 1063 bytes ...0x360-v-live-cenc-rotation-golden-init.mp4 | Bin 1015 -> 1015 bytes .../bear-640x360-v-live-golden-init.mp4 | Bin 799 -> 799 bytes .../testdata/bear-640x360-vp8-cenc-golden.mp4 | Bin 117020 -> 117020 bytes .../testdata/bear-640x360-vp8-cenc-golden.mpd | 2 +- .../bear-640x360-vp8-cenc-golden.webm | Bin 115275 -> 115275 bytes .../bear-640x360-vp8-cenc-webm-golden.mpd | 2 +- .../test/testdata/bear-640x360-vp8-golden.mp4 | Bin 115854 -> 115854 bytes .../testdata/bear-640x360-vp8-golden.webm | Bin 114725 -> 114725 bytes .../testdata/bear-640x360-vp8-webm-golden.mpd | 2 +- .../testdata/subtitle-english-vtt-golden.mpd | 2 +- packager/media/base/http_key_fetcher.cc | 2 +- .../formats/mp4/box_definitions_unittest.cc | 2 +- packager/media/formats/mp4/segmenter.cc | 2 +- .../webm/encrypted_segmenter_unittest.cc | 4 ++-- .../webm/multi_segment_segmenter_unittest.cc | 4 ++-- packager/media/formats/webm/segmenter.cc | 2 +- .../webm/single_segment_segmenter_unittest.cc | 4 ++-- .../base/dash_iop_mpd_notifier_unittest.cc | 2 +- packager/mpd/base/mpd_builder.cc | 2 +- packager/mpd/base/mpd_builder_unittest.cc | 2 +- .../mpd/base/simple_mpd_notifier_unittest.cc | 2 +- 60 files changed, 38 insertions(+), 38 deletions(-) diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc index 76d954199b..456b83ab18 100644 --- a/packager/app/packager_main.cc +++ b/packager/app/packager_main.cc @@ -463,7 +463,7 @@ int PackagerMain(int argc, char** argv) { google::ParseCommandLineFlags(&argc, &argv, true); if (argc < 2) { std::string version_string = - base::StringPrintf("edash-packager version %s", kPackagerVersion); + base::StringPrintf("shaka-packager version %s", kPackagerVersion); google::ShowUsageWithFlags(version_string.c_str()); return kSuccess; } diff --git a/packager/app/test/packager_app.py b/packager/app/test/packager_app.py index a5e9cd2c49..9502a246a0 100644 --- a/packager/app/test/packager_app.py +++ b/packager/app/test/packager_app.py @@ -31,7 +31,7 @@ class PackagerApp(object): def Version(self): output = subprocess.check_output([self.binary]) # The output should of the form: - # edash-packager version xxx: Description... + # shaka-packager version xxx: Description... # We consider everything before ':' part of version. return output.split(':')[0] diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index 544883a54d..ce220eef10 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -37,7 +37,7 @@ class PackagerAppTest(unittest.TestCase): def testVersion(self): self.assertRegexpMatches( - self.packager.Version(), '^edash-packager version ' + self.packager.Version(), '^shaka-packager version ' r'((?P[\w\.]+)-)?(?P[a-f\d]+)-(debug|release)$') def testDumpStreamInfo(self): diff --git a/packager/app/test/testdata/bear-320x240-opus-golden.webm b/packager/app/test/testdata/bear-320x240-opus-golden.webm index de4355db2d8f4ea715f4587336fed4ed7e8e972e..3dc7e7e532b5d25aedf907ab135d49be6a62064a 100644 GIT binary patch delta 18 acmaEJp7G6j#tElci!&0l6E|LvNe2L1g9zmS delta 18 acmaEJp7G6j#tElcQ&SR)Gd5n3Ne2L1I0)hZ diff --git a/packager/app/test/testdata/bear-320x240-vorbis-golden.webm b/packager/app/test/testdata/bear-320x240-vorbis-golden.webm index 8d7a28c92e0ff4f53856b2d34642d01652937a02..57b0b1e60509c244ebae7c7139e871862d41792f 100644 GIT binary patch delta 18 acmdnLn{oec#tElci!&0l6E|LX9|HhX - + diff --git a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4 b/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4 index cc8c3f07a1ca48290fd9ae9f5b4dea72204c087b..4b8bca54b0daa5a668fc2df8cf361467fd7a9187 100644 GIT binary patch delta 21 dcmdnBk!9CLmI*&ti!&0l6C3|-{mZyl8~}5~3V8qk delta 21 dcmdnBk!9CLmI*&tQ&SR)GaCPH{mZyl8~}503U&Yh diff --git a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mpd b/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mpd index 6b89c5ccc3..babaa3ea54 100644 --- a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-320x240-vp9-golden.mp4 b/packager/app/test/testdata/bear-320x240-vp9-golden.mp4 index 1c13d17b70f58c0755c83ed099f3054bdaecac6d..712923f77de729619cc4aea5c3496abc273b739b 100644 GIT binary patch delta 21 dcmbQUf@RJMmI*&ti!&0l6C3|-{mUpX3;=AU35fsz delta 21 dcmbQUf@RJMmI*&tQ&SR)GaCPH{mUpX3;=9V35Eaw diff --git a/packager/app/test/testdata/bear-320x240-vp9-golden.webm b/packager/app/test/testdata/bear-320x240-vp9-golden.webm index 97deeefd2cc3b6ff33d7f46ade5f74b31c65da7c..b6d4bb46fa8ef6058b2708505e70d263ac96bae2 100644 GIT binary patch delta 21 dcmbO`pJncRmIi!&0l6B{pVy})>u4*+PM37Y@_ delta 21 dcmbO`pJncRmIQ&SR)Ga4^!y})>u4*+ON377x? diff --git a/packager/app/test/testdata/bear-320x240-vp9-opus-webm-golden.mpd b/packager/app/test/testdata/bear-320x240-vp9-opus-webm-golden.mpd index 1f08a94a71..7b0802b23f 100644 --- a/packager/app/test/testdata/bear-320x240-vp9-opus-webm-golden.mpd +++ b/packager/app/test/testdata/bear-320x240-vp9-opus-webm-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-a-cbc1-golden.mp4 b/packager/app/test/testdata/bear-640x360-a-cbc1-golden.mp4 index 1bc6c9d2a6458a9c60f5b16065cc94b7f0a1dbc8..7d646ea6ba46961507cfa577dc3c1fbf624b59af 100644 GIT binary patch delta 18 acmdmShiS(hrU_qIi!&0l6F2^}Ukd - + diff --git a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd index abb3213d34..972d28a625 100644 --- a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd index 620c339c57..88ff403d96 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd index fd061818e8..eb7dc7d94d 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-iop-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd index 3f79f1d0fa..627ef222cb 100644 --- a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-golden.mpd b/packager/app/test/testdata/bear-640x360-av-golden.mpd index cca6f26237..a68f94f8ca 100644 --- a/packager/app/test/testdata/bear-640x360-av-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd index a3fbb022d4..4302e87a18 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd index 3f9cb407c6..0b8c39c6b9 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-iop-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd index cbe5e40c76..c197360e90 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd index 780da4c10f..c7a08aa0ae 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-iop-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-av-live-golden.mpd b/packager/app/test/testdata/bear-640x360-av-live-golden.mpd index 79a43d07a7..b1c1185524 100644 --- a/packager/app/test/testdata/bear-640x360-av-live-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-live-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-avt-golden.mpd b/packager/app/test/testdata/bear-640x360-avt-golden.mpd index 0543669424..83ac21d945 100644 --- a/packager/app/test/testdata/bear-640x360-avt-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-avt-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4 index b7be288788eeecf0118906cc8eb0acad0cd1af9d..810680cb51999f7b02a0500d1af31f44b91872ea 100644 GIT binary patch delta 21 dcmex)h4tqZ)(JmYi!&0l6C3|-{mWRB2>^m$3s3+6 delta 21 dcmex)h4tqZ)(JmYQ&SR)GaCPH{mWRB2>^l%3rzq3 diff --git a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd index 1a6637b04a..549bd6261f 100644 --- a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-hevc-golden.mp4 b/packager/app/test/testdata/bear-640x360-hevc-golden.mp4 index 1875f0b5ed5fe84b41846d4a51ce24febeca256c..2a2f319c7573e0ca63c1d2b3ef0690e2d699f728 100644 GIT binary patch delta 21 dcmbPyn04}D)(JmYi!&0l6C3|-{mVEl0RV7|3UdGe delta 21 dcmbPyn04}D)(JmYQ&SR)GaCPH{mVEl0RV6}3UB}b diff --git a/packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4 index 0d86a631912c7c4af118db6ad15fbbd1c102e1ff..ea3cb097bdf45572c422ec74b460efead711974a 100644 GIT binary patch delta 30 mcmbQdPiXQ!p$R`&i!&0l6C3}w{$*_a%hdXpdFx*mv3UUIg$~dF delta 30 mcmbQdPiXQ!p$R`&Q&SR)GaCQ4{$*_a%hdXpdFx*mv3UUI77on- diff --git a/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4 index af6474058a2aa99d1f9953610fb30c85d5918e83..c336b9f1d6e4489e4525e074fe0f83d3a1c30221 100644 GIT binary patch delta 30 mcmeyfOX$xop$R`&i!&0l6C3}w{$*_a%hdXpdFx-6`Z)mo+7JN% delta 30 mcmeyfOX$xop$R`&Q&SR)GaCQ4{$*_a%hdXpdFx-6`Z)moYY+Ya diff --git a/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4 index 16dd910f4be51fb3f127c16351fbe70815a5d2a0..19f2f5416b5524c1e818dbc3cfb16cc6f25433af 100644 GIT binary patch delta 30 mcmbQdPiXQ!p$R`&i!&0l6C3}w{$*_a%hdXpdFx*mv3UUIg$~dF delta 30 mcmbQdPiXQ!p$R`&Q&SR)GaCQ4{$*_a%hdXpdFx*mv3UUI77on- diff --git a/packager/app/test/testdata/bear-640x360-v-cens-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-cens-golden.mp4 index 8cc823884b171d9819fc877ee5e510e16bc5c3f3..195a9dfd4f7c489d179d9dbd1467ab48496bcb1d 100644 GIT binary patch delta 30 mcmbQdPiXQ!p$R`&i!&0l6C3}w{$*_a%hdXpdFx*mv3UUIg$~dF delta 30 mcmbQdPiXQ!p$R`&Q&SR)GaCQ4{$*_a%hdXpdFx*mv3UUI77on- diff --git a/packager/app/test/testdata/bear-640x360-v-golden.mp4 b/packager/app/test/testdata/bear-640x360-v-golden.mp4 index 793114711caa02d65a29197f1f557016c854ecb8..f399c0c0d5ddaf0822f666b54c0fd16d030e2ef0 100644 GIT binary patch delta 30 mcmaF3Md;xcp$R`&i!&0l6C3}w{$*_a%hdXpdFx-6l$ikbR1cv5 delta 30 mcmaF3Md;xcp$R`&Q&SR)GaCQ4{$*_a%hdXpdFx-6l$ika - + diff --git a/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-init.mp4 b/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-init.mp4 index 8f9595cc313e707ba7abdb9335ca3d4bba2acd12..6a7e8af709102440e935f1ab6bb53c78cf432f75 100644 GIT binary patch delta 16 XcmZ3^v7BSV57y$0#O%b4f3=taI)?_& delta 16 XcmZ3^v7BSV57yL_#Nv#Nf3=taIy?r< diff --git a/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-init.mp4 b/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-init.mp4 index 167a2e00602216608a8e6caac8fb23c1e13d9af6..3ca04d061aff51ad609d83664c5fdedc447916b5 100644 GIT binary patch delta 16 Ycmey){+)fo57y$0#O%b4e}6Fn07YsDJOBUy delta 16 Ycmey){+)fo57yL_#Nv#Ne}6Fn07V}NIRF3v diff --git a/packager/app/test/testdata/bear-640x360-v-live-golden-init.mp4 b/packager/app/test/testdata/bear-640x360-v-live-golden-init.mp4 index 68700f0fa1910abb86f9f967e5c6d2d3cedf7a82..1726955b76984da3612b1e9e0384b371abf41da7 100644 GIT binary patch delta 16 XcmbQwHlJ<657y$0#O%b4f0dX3IZg($ delta 16 XcmbQwHlJ<657yL_#Nv#Nf0dX3IRgf- diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4 index 3423a75b26a67eff776b0b00dc0828718a4ea8f4..8e7d1e42a584f6919ed26f36cc95232f21d388d8 100644 GIT binary patch delta 21 dcmbO;iG9u__6a{&i!&0l6C3|-{mUqS0sv~23K#$Y delta 21 dcmbO;iG9u__6a{&Q&SR)GaCPH{mUqS0sv}33KakV diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd index 18372ecbfe..55b15f8db5 100644 --- a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.webm b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.webm index ea363b8a3bbd354d2ab64426d192ae9e35d3a72b..6a90df191b484a4989d6830cf1be305fc82c68ed 100644 GIT binary patch delta 21 dcmX@z!hX7ieZpzh;*7-X#KsF-FECag1ORL?3Mc>o delta 21 dcmX@z!hX7ieZpzh)Re^HjK&LFFECag1ORK@3MBvl diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd b/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd index 236818df44..ef10280cbf 100644 --- a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/app/test/testdata/bear-640x360-vp8-golden.mp4 b/packager/app/test/testdata/bear-640x360-vp8-golden.mp4 index a5e538e3dc5ddf0012b3d68779726e1b3f8195fd..55b2fe3b61dff245c67b20e4c7832030ad3de930 100644 GIT binary patch delta 21 dcmeC{Wbf-_pYVgVI3qDTvGMQLzl;+P0|00R3ReIC delta 21 dcmeC{Wbf-_pYVe - + diff --git a/packager/app/test/testdata/subtitle-english-vtt-golden.mpd b/packager/app/test/testdata/subtitle-english-vtt-golden.mpd index 47cac88ba2..62f2e3a3ed 100644 --- a/packager/app/test/testdata/subtitle-english-vtt-golden.mpd +++ b/packager/app/test/testdata/subtitle-english-vtt-golden.mpd @@ -1,5 +1,5 @@ - + diff --git a/packager/media/base/http_key_fetcher.cc b/packager/media/base/http_key_fetcher.cc index d7701f04de..22f29f7333 100644 --- a/packager/media/base/http_key_fetcher.cc +++ b/packager/media/base/http_key_fetcher.cc @@ -15,7 +15,7 @@ namespace edash_packager { namespace { -const char kUserAgentString[] = "edash-packager-http_fetcher/1.0"; +const char kUserAgentString[] = "shaka-packager-http_fetcher/1.0"; // Scoped CURL implementation which cleans up itself when goes out of scope. class ScopedCurl { diff --git a/packager/media/formats/mp4/box_definitions_unittest.cc b/packager/media/formats/mp4/box_definitions_unittest.cc index d97f6c86d3..d29f552f35 100644 --- a/packager/media/formats/mp4/box_definitions_unittest.cc +++ b/packager/media/formats/mp4/box_definitions_unittest.cc @@ -309,7 +309,7 @@ class BoxDefinitionsTestGeneral : public testing::Test { void Fill(ID3v2* id3v2) { id3v2->language.code = "eng"; - id3v2->private_frame.owner = "edash-packager"; + id3v2->private_frame.owner = "shaka-packager"; id3v2->private_frame.value = "version 1.2.0-debug"; } diff --git a/packager/media/formats/mp4/segmenter.cc b/packager/media/formats/mp4/segmenter.cc index fcd90ab9c6..6982e6da26 100644 --- a/packager/media/formats/mp4/segmenter.cc +++ b/packager/media/formats/mp4/segmenter.cc @@ -270,7 +270,7 @@ Status Segmenter::Initialize(const std::vector& streams, moov_->metadata.handler.handler_type = FOURCC_ID32; moov_->metadata.id3v2.language.code = "eng"; moov_->metadata.id3v2.private_frame.owner = - "https://github.com/google/edash-packager"; + "https://github.com/google/shaka-packager"; moov_->metadata.id3v2.private_frame.value = options_.packager_version_string; return DoInitialize(); } diff --git a/packager/media/formats/webm/encrypted_segmenter_unittest.cc b/packager/media/formats/webm/encrypted_segmenter_unittest.cc index 15eb8f86c1..cf04ec6b9b 100644 --- a/packager/media/formats/webm/encrypted_segmenter_unittest.cc +++ b/packager/media/formats/webm/encrypted_segmenter_unittest.cc @@ -79,11 +79,11 @@ const uint8_t kBasicSupportData[] = { // MuxingApp: 'libwebm-0.2.1.0' 0x4d, 0x80, 0x8f, 0x6c, 0x69, 0x62, 0x77, 0x65, 0x62, 0x6d, 0x2d, 0x30, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x30, - // WritingApp: 'https://github.com/google/edash-packager version test' + // WritingApp: 'https://github.com/google/shaka-packager version test' 0x57, 0x41, 0xb5, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2f, 0x65, 0x64, 0x61, 0x73, 0x68, 0x2d, 0x70, 0x61, 0x63, 0x6b, + 0x65, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x65, 0x73, 0x74, // ID: Tracks, Payload Size: 92 diff --git a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc index 6d303c64c1..39082d601b 100644 --- a/packager/media/formats/webm/multi_segment_segmenter_unittest.cc +++ b/packager/media/formats/webm/multi_segment_segmenter_unittest.cc @@ -52,11 +52,11 @@ const uint8_t kBasicSupportDataInit[] = { // MuxingApp: 'libwebm-0.2.1.0' 0x4d, 0x80, 0x8f, 0x6c, 0x69, 0x62, 0x77, 0x65, 0x62, 0x6d, 0x2d, 0x30, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x30, - // WritingApp: 'https://github.com/google/edash-packager version test' + // WritingApp: 'https://github.com/google/shaka-packager version test' 0x57, 0x41, 0xb5, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2f, 0x65, 0x64, 0x61, 0x73, 0x68, 0x2d, 0x70, 0x61, 0x63, 0x6b, + 0x65, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x65, 0x73, 0x74, // ID: Tracks, Payload Size: 41 diff --git a/packager/media/formats/webm/segmenter.cc b/packager/media/formats/webm/segmenter.cc index af0792d26c..f3d2a06988 100644 --- a/packager/media/formats/webm/segmenter.cc +++ b/packager/media/formats/webm/segmenter.cc @@ -60,7 +60,7 @@ Status Segmenter::Initialize(scoped_ptr writer, progress_listener_ = progress_listener; const std::string version_string = - "https://github.com/google/edash-packager version " + + "https://github.com/google/shaka-packager version " + options().packager_version_string; segment_info_.Init(); diff --git a/packager/media/formats/webm/single_segment_segmenter_unittest.cc b/packager/media/formats/webm/single_segment_segmenter_unittest.cc index 1f216ea189..75e249cafa 100644 --- a/packager/media/formats/webm/single_segment_segmenter_unittest.cc +++ b/packager/media/formats/webm/single_segment_segmenter_unittest.cc @@ -74,11 +74,11 @@ const uint8_t kBasicSupportData[] = { // MuxingApp: 'libwebm-0.2.1.0' 0x4d, 0x80, 0x8f, 0x6c, 0x69, 0x62, 0x77, 0x65, 0x62, 0x6d, 0x2d, 0x30, 0x2e, 0x32, 0x2e, 0x31, 0x2e, 0x30, - // WritingApp: 'https://github.com/google/edash-packager version test' + // WritingApp: 'https://github.com/google/shaka-packager version test' 0x57, 0x41, 0xb5, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2f, 0x65, 0x64, 0x61, 0x73, 0x68, 0x2d, 0x70, 0x61, 0x63, 0x6b, + 0x65, 0x2f, 0x73, 0x68, 0x61, 0x6b, 0x61, 0x2d, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x65, 0x73, 0x74, // ID: Tracks, Payload Size: 41 diff --git a/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc b/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc index ac1b0c147e..efedead277 100644 --- a/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc +++ b/packager/mpd/base/dash_iop_mpd_notifier_unittest.cc @@ -760,7 +760,7 @@ TEST_P(DashIopMpdNotifierTest, UpdateEncryption) { // This test is mainly for tsan. Using both the notifier and the MpdBuilder. // Although locks in MpdBuilder have been removed, -// https://github.com/google/edash-packager/issues/45 +// https://github.com/google/shaka-packager/issues/45 // This issue identified a bug where using SimpleMpdNotifier with multiple // threads causes a deadlock. This tests with DashIopMpdNotifier. TEST_F(DashIopMpdNotifierTest, NotifyNewContainerAndSampleDurationNoMock) { diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc index 6580fabbbe..a41fe06358 100644 --- a/packager/mpd/base/mpd_builder.cc +++ b/packager/mpd/base/mpd_builder.cc @@ -506,7 +506,7 @@ xmlDocPtr MpdBuilder::GenerateMpd() { DCHECK(doc); std::string version_string = - "Generated with https://github.com/google/edash-packager version " + + "Generated with https://github.com/google/shaka-packager version " + mpd_options_.packager_version_string; xml::scoped_xml_ptr comment( xmlNewDocComment(doc.get(), BAD_CAST version_string.c_str())); diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc index 1fc694594d..04c0d6e0a3 100644 --- a/packager/mpd/base/mpd_builder_unittest.cc +++ b/packager/mpd/base/mpd_builder_unittest.cc @@ -2043,7 +2043,7 @@ TEST_F(StaticMpdBuilderTest, Text) { TEST_F(DynamicMpdBuilderTest, CheckMpdAttributes) { static const char kExpectedOutput[] = "\n" - "\n" "