Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace generate_static_mpd to generate_static_live_mpd #672

Merged
merged 3 commits into from
Nov 15, 2019
+26 −13
Merged

Replace generate_static_mpd to generate_static_live_mpd #672

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65430c5
refactor: Replace `generate_static_mpd` to `generate_static_live_mpd`
Korilakkuma Oct 30, 2019
91be580
fix: Retire `generate_static_mpd`
Korilakkuma Oct 31, 2019
2efd7fa
refactor: Replace `generate_static_mpd` to `generate_static_live_mpd`…
Korilakkuma Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packager/app/mpd_flags.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

#include "packager/app/mpd_flags.h"

// TODO(kqyang): Rename to generate_static_live_mpd.
DEFINE_bool(generate_static_mpd,
DEFINE_bool(generate_static_live_mpd,
false,
"Set to true to generate static mpd. If segment_template is "
"specified in stream descriptors, shaka-packager generates dynamic "
Expand Down
2 changes: 1 addition & 1 deletion packager/app/mpd_flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <gflags/gflags.h>

DECLARE_bool(generate_static_mpd);
DECLARE_bool(generate_static_live_mpd);
DECLARE_bool(output_media_info);
DECLARE_string(mpd_output);
DECLARE_string(base_urls);
Expand Down
2 changes: 1 addition & 1 deletion packager/app/packager_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ base::Optional<PackagingParams> GetPackagingParams() {

mpd_params.default_language = FLAGS_default_language;
mpd_params.default_text_language = FLAGS_default_text_language;
mpd_params.generate_static_live_mpd = FLAGS_generate_static_mpd;
mpd_params.generate_static_live_mpd = FLAGS_generate_static_live_mpd;
mpd_params.generate_dash_if_iop_compliant_mpd =
FLAGS_generate_dash_if_iop_compliant_mpd;
mpd_params.allow_approximate_segment_timeline =
Expand Down
12 changes: 6 additions & 6 deletions packager/app/test/packager_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def _GetFlags(self,
time_shift_buffer_depth=0.0,
preserved_segments_outside_live_window=0,
utc_timings=None,
generate_static_mpd=False,
generate_static_live_mpd=False,
ad_cues=None,
default_language=None,
segment_duration=1.0,
Expand Down Expand Up @@ -508,8 +508,8 @@ def _GetFlags(self,
if utc_timings:
flags += ['--utc_timings', utc_timings]

if generate_static_mpd:
flags += ['--generate_static_mpd']
if generate_static_live_mpd:
flags += ['--generate_static_live_mpd']

if ad_cues:
flags += ['--ad_cues', ad_cues]
Expand Down Expand Up @@ -1091,7 +1091,7 @@ def testVttTextToMp4WithAdCues(self):
output_format='mp4')
]
flags = self._GetFlags(output_dash=True, output_hls=True,
generate_static_mpd=True, ad_cues='1.5')
generate_static_live_mpd=True, ad_cues='1.5')
self.assertPackageSuccess(streams, flags)
# Mpd cannot be validated right now since we don't generate determinstic
# mpd with multiple inputs due to thread racing.
Expand Down Expand Up @@ -1442,15 +1442,15 @@ def testLiveProfileWithWebM(self):
def testLiveStaticProfile(self):
self.assertPackageSuccess(
self._GetStreams(['audio', 'video'], segmented=True),
self._GetFlags(output_dash=True, generate_static_mpd=True))
self._GetFlags(output_dash=True, generate_static_live_mpd=True))
self._CheckTestResults('live-static-profile')

def testLiveStaticProfileWithTimeInSegmentName(self):
self.assertPackageSuccess(
self._GetStreams(['audio', 'video'],
segmented=True,
using_time_specifier=True),
self._GetFlags(output_dash=True, generate_static_mpd=True))
self._GetFlags(output_dash=True, generate_static_live_mpd=True))
self._CheckTestResults('live-static-profile-with-time-in-segment-name')

def testLiveProfileAndEncryption(self):
Expand Down