diff --git a/.appveyor.yml b/.appveyor.yml index 55bd744..1e80e53 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,7 +16,7 @@ environment: COMPOSER_NO_INTERACTION: 1 ANSICON: 121x90 (121x90) # Console colors - shaka_packager_download: https://github.com/google/shaka-packager/releases/download/v2.3.0/packager-win.exe + shaka_packager_download: https://github.com/google/shaka-packager/releases/download/v2.4.2/packager-win.exe init: - ps: $env:PATH = 'c:\tools\php;c:\ProgramData\ComposerSetup\bin;' + $env:PATH diff --git a/.travis.yml b/.travis.yml index 54eab8b..5c1da13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ php: before_install: - sudo add-apt-repository ppa:mc3man/trusty-media -y - sudo apt-get update -q - - sudo wget https://github.com/google/shaka-packager/releases/download/v2.3.0/packager-linux + - sudo wget https://github.com/google/shaka-packager/releases/download/v2.4.2/packager-linux - sudo chmod +x packager-linux - sudo mv packager-linux /bin/packager - composer self-update diff --git a/README.md b/README.md index ed275d9..f448cb4 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ You can add options to your DASH object using a callback method: $export = $shaka->streams($stream1, $stream2, ...) ->mediaPackaging() ->DASH('output.mpd', function ($options) { - return $options->generateStaticMpd(); + return $options->generateStaticLiveMpd(); //->other options; }) ->export(); @@ -163,7 +163,7 @@ $export = $shaka->streams($stream1, $stream2, ...) #### DASH Options | Option | Default | Description | |:------------------------------------------------:|:-----------------------------:|:---------------------------------------------------------------------------------------------------------------------:| -| generateStaticMpd() | FALSE | If enabled, generates static mpd. If segment_template is specified in stream descriptors, shaka-packager generates dynamic mpd by default; if this flag is enabled, shaka-packager generates static mpd instead. Note that if segment_template is not specified, shaka-packager always generates static mpd regardless of the value of this flag. | +| generateStaticLiveMpd() | FALSE | If enabled, generates static mpd. If segment_template is specified in stream descriptors, shaka-packager generates dynamic mpd by default; if this flag is enabled, shaka-packager generates static mpd instead. Note that if segment_template is not specified, shaka-packager always generates static mpd regardless of the value of this flag. | | baseUrls() | NULL | Comma separated BaseURLs for the MPD: [,]…. The values will be added as element(s) immediately under the element. | | minBufferTime() | NULL | Specifies, in seconds, a common duration used in the definition of the MPD Representation data rate. | | minimumUpdatePeriod() | NULL | Indicates to the player how often to refresh the media presentation description in seconds. This value is used for dynamic MPD only. | diff --git a/examples/adInsertion/dash_static-live.php b/examples/adInsertion/dash_static-live.php index 4117c80..7185158 100644 --- a/examples/adInsertion/dash_static-live.php +++ b/examples/adInsertion/dash_static-live.php @@ -47,7 +47,7 @@ ->streams($stream1, $stream2, $stream3, $stream4, $stream5, $stream6) ->mediaPackaging() ->DASH($output_path . 'h264.mpd', function ($options) { - return $options->generateStaticMpd() + return $options->generateStaticLiveMpd() ->adCues('600;1800;3000'); }) ->export(); diff --git a/examples/dash/static-live.php b/examples/dash/static-live.php index 4e843ad..b4b5104 100644 --- a/examples/dash/static-live.php +++ b/examples/dash/static-live.php @@ -43,11 +43,11 @@ ->initSegment($output_path . 'h264_1080p/init.mp4') ->segmentTemplate($output_path . 'h264_1080p/$Number$.m4s'); -$export = \Shaka\Shaka::initialize() +$export = Shaka\Shaka::initialize() ->streams($stream1, $stream2, $stream3, $stream4, $stream5, $stream6) ->mediaPackaging() ->DASH($output_path . 'h264.mpd', function ($options) { - return $options->generateStaticMpd(); + return $options->generateStaticLiveMpd(); }) ->export(); diff --git a/src/Options/DASH.php b/src/Options/DASH.php index e94eb8e..a264870 100644 --- a/src/Options/DASH.php +++ b/src/Options/DASH.php @@ -16,7 +16,7 @@ class DASH extends General { /** @var bool */ - private $generate_static_mpd; + private $generate_static_live_mpd; /** @var string */ private $mpd_output; @@ -42,22 +42,22 @@ class DASH extends General /** * @return array */ - protected function __getGenerateStaticMpd() + protected function __getGenerateStaticLiveMpd() { - if (!$this->generate_static_mpd) { + if (!$this->generate_static_live_mpd) { return null; } - return [MediaOptions::GENERATE_STATIC_MPD]; + return [MediaOptions::GENERATE_STATIC_LIVE_MPD]; } /** - * @param bool $generate_static_mpd + * @param bool $generate_static_live_mpd * @return DASH */ - public function generateStaticMpd(bool $generate_static_mpd = true): DASH + public function generateStaticLiveMpd(bool $generate_static_live_mpd = true): DASH { - $this->generate_static_mpd = $generate_static_mpd; + $this->generate_static_live_mpd = $generate_static_live_mpd; return $this; } diff --git a/src/Options/MediaOptions.php b/src/Options/MediaOptions.php index d988e45..e884ed2 100644 --- a/src/Options/MediaOptions.php +++ b/src/Options/MediaOptions.php @@ -30,7 +30,7 @@ class MediaOptions //DASH Options - const GENERATE_STATIC_MPD = '--generate_static_mpd'; + const GENERATE_STATIC_LIVE_MPD = '--generate_static_live_mpd'; const MPD_OUTPUT = '--mpd_output'; diff --git a/tests/DASHTest.php b/tests/DASHTest.php index 4d36d77..30033d5 100644 --- a/tests/DASHTest.php +++ b/tests/DASHTest.php @@ -44,7 +44,7 @@ public function testStaticLive() ->streams($audio, $text, $video) ->mediaPackaging() ->DASH($this->src_dir . '/dash_static_live/h264.mpd', function ($options) { - return $options->generateStaticMpd(); + return $options->generateStaticLiveMpd(); }) ->export(); diff --git a/tests/MediaOptionsTest.php b/tests/MediaOptionsTest.php index b396e74..7418445 100644 --- a/tests/MediaOptionsTest.php +++ b/tests/MediaOptionsTest.php @@ -24,7 +24,7 @@ class MediaOptionsTest extends TestCase public function testDASHOptions() { $output = (new DASH())->mpdOutput('whatever') - ->generateStaticMpd() + ->generateStaticLiveMpd() ->baseUrls('whatever') ->minBufferTime('whatever') ->minimumUpdatePeriod('whatever') diff --git a/tests/fixtures/options/dash_options.json b/tests/fixtures/options/dash_options.json index f54c7e9..9be9a3b 100644 --- a/tests/fixtures/options/dash_options.json +++ b/tests/fixtures/options/dash_options.json @@ -1,5 +1,5 @@ [ - "--generate_static_mpd", + "--generate_static_live_mpd", "--base_urls", "whatever", "--min_buffer_time",