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

Support mpd generation in packager app 

Change-Id: I9dfa8ca254d3d3e0210feeecc7389f360ab4b6a7
This commit is contained in:
KongQun Yang 2014-05-22 12:39:30 -07:00
parent df64029e47
commit 8cb3be74b1
7 changed files with 154 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/mpd_flags.cc Normal file
View File

@ -0,0 +1,28 @@
// Copyright 2014 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
//
// Defines Mpd flags.
#include "app/mpd_flags.h"
DEFINE_bool(output_media_info,
false,
"Create a human readable format of MediaInfo. The output file name "
"will be the name specified by output flag, suffixed with "
"'.media_info'.");
DEFINE_string(mpd_output, "", "MPD output file name.");
DEFINE_string(scheme_id_uri,
"urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",
"This flag only applies if output_media_info is true. This value "
"will be set in MediaInfo if the stream is encrypted. "
"If the stream is encrypted, MPD requires a <ContentProtection> "
"element which requires the schemeIdUri attribute. "
"Default value is Widevine PSSH system ID, and it is valid only "
"for ISO BMFF.");
DEFINE_string(base_urls,
"",
"Comma separated BaseURLs for the MPD. The values will be added "
"as <BaseURL> element(s) immediately under the <MPD> element.");

19
app/mpd_flags.h Normal file
View File

@ -0,0 +1,19 @@
// Copyright 2014 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
//
// Defines Mpd flags.
#ifndef APP_MPD_FLAGS_H_
#define APP_MPD_FLAGS_H_
#include <gflags/gflags.h>
DECLARE_bool(output_media_info);
DECLARE_string(mpd_output);
DECLARE_string(scheme_id_uri);
DECLARE_string(base_urls);
#endif // APP_MPD_FLAGS_H_

14
app/muxer_flags.cc
View File

@ -51,17 +51,3 @@ DEFINE_string(temp_dir,
"Specify a directory in which to store temporary (intermediate) "
" files. Used only if single_segment=true.");
// Flags for MuxerListener.
DEFINE_bool(output_media_info,
true,
"Create a human readable format of MediaInfo. The output file name "
"will be the name specified by output flag, suffixed with "
"'.media_info'.");
DEFINE_string(scheme_id_uri,
"urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",
"This flag only applies if output_media_info is true. This value "
"will be set in MediaInfo if the stream is encrypted. "
"If the stream is encrypted, MPD requires a <ContentProtection> "
"element which requires the schemeIdUri attribute. "
"Default value is Widevine PSSH system ID, and it is valid only "
"for ISO BMFF.");

4
app/muxer_flags.h
View File

@ -22,8 +22,4 @@ DECLARE_bool(normalize_presentation_timestamp);
DECLARE_int32(num_subsegments_per_sidx);
DECLARE_string(temp_dir);
// Flags for MuxerListener.
DECLARE_bool(output_media_info);
DECLARE_string(scheme_id_uri);
#endif // APP_MUXER_FLAGS_H_

57
app/packager_main.cc
View File

@ -8,9 +8,9 @@
#include "app/fixed_key_encryption_flags.h"
#include "app/libcrypto_threading.h"
#include "app/muxer_flags.h"
#include "app/packager_common.h"
#include "app/single_muxer_flags.h"
#include "app/mpd_flags.h"
#include "app/muxer_flags.h"
#include "app/widevine_encryption_flags.h"
#include "base/logging.h"
#include "base/stl_util.h"
@ -21,7 +21,10 @@
#include "media/base/encryption_key_source.h"
#include "media/base/muxer_options.h"
#include "media/base/muxer_util.h"
#include "media/event/mpd_notify_muxer_listener.h"
#include "media/formats/mp4/mp4_muxer.h"
#include "mpd/base/mpd_builder.h"
#include "mpd/base/simple_mpd_notifier.h"
namespace {
const char kUsage[] =
@ -43,6 +46,15 @@ typedef std::vector<std::string> StringVector;
namespace media {
using dash_packager::DashProfile;
using dash_packager::kOnDemandProfile;
using dash_packager::kLiveProfile;
using dash_packager::MpdNotifier;
using dash_packager::MpdOptions;
using dash_packager::SimpleMpdNotifier;
using event::MpdNotifyMuxerListener;
using event::MuxerListener;
// Demux, Mux(es) and worker thread used to remux a source file/stream.
class RemuxJob : public base::SimpleThread {
public:
@ -77,7 +89,10 @@ class RemuxJob : public base::SimpleThread {
bool CreateRemuxJobs(const StringVector& stream_descriptors,
const MuxerOptions& muxer_options,
EncryptionKeySource* key_source,
MpdNotifier* mpd_notifier,
std::vector<MuxerListener*>* muxer_listeners,
std::vector<RemuxJob*>* remux_jobs) {
DCHECK(muxer_listeners);
DCHECK(remux_jobs);
// Sort the stream descriptors so that we can group muxers by demux.
@ -140,6 +155,15 @@ bool CreateRemuxJobs(const StringVector& stream_descriptors,
FLAGS_crypto_period_duration);
}
if (mpd_notifier) {
scoped_ptr<MpdNotifyMuxerListener> mpd_notify_muxer_listener(
new MpdNotifyMuxerListener(mpd_notifier));
mpd_notify_muxer_listener->SetContentProtectionSchemeIdUri(
FLAGS_scheme_id_uri);
muxer_listeners->push_back(mpd_notify_muxer_listener.release());
muxer->SetMuxerListener(muxer_listeners->back());
}
if (!AddStreamToMuxer(remux_jobs->back()->demuxer()->streams(),
stream_selector,
muxer.get()))
@ -181,6 +205,11 @@ Status RunRemuxJobs(const std::vector<RemuxJob*>& remux_jobs) {
}
bool RunPackager(const StringVector& stream_descriptors) {
if (FLAGS_output_media_info) {
NOTIMPLEMENTED() << "ERROR: --output_media_info is not supported yet.";
return false;
}
// Get basic muxer options.
MuxerOptions muxer_options;
if (!GetMuxerOptions(&muxer_options))
@ -194,13 +223,35 @@ bool RunPackager(const StringVector& stream_descriptors) {
return false;
}
scoped_ptr<MpdNotifier> mpd_notifier;
if (!FLAGS_mpd_output.empty()) {
DashProfile profile =
FLAGS_single_segment ? kOnDemandProfile : kLiveProfile;
std::vector<std::string> base_urls;
base::SplitString(FLAGS_base_urls, ',', &base_urls);
// TODO(rkuroiwa,kqyang): Get mpd options from command line.
mpd_notifier.reset(new SimpleMpdNotifier(profile, MpdOptions(), base_urls,
FLAGS_mpd_output));
if (!mpd_notifier->Init()) {
LOG(ERROR) << "MpdNotifier failed to initialize.";
return false;
}
}
// TODO(kqyang): Should Muxer::SetMuxerListener take owership of the
// muxer_listeners object? Then we can get rid of |muxer_listeners|.
std::vector<MuxerListener*> muxer_listeners;
STLElementDeleter<std::vector<MuxerListener*> > deleter(&muxer_listeners);
std::vector<RemuxJob*> remux_jobs;
STLElementDeleter<std::vector<RemuxJob*> > scoped_jobs_deleter(&remux_jobs);
if (!CreateRemuxJobs(stream_descriptors,
muxer_options,
encryption_key_source.get(),
&remux_jobs))
mpd_notifier.get(),
&muxer_listeners,
&remux_jobs)) {
return false;
}
Status status = RunRemuxJobs(remux_jobs);
if (!status.ok()) {

47
app/single_packager_main.cc
View File

@ -8,20 +8,25 @@
#include "app/fixed_key_encryption_flags.h"
#include "app/packager_common.h"
#include "app/mpd_flags.h"
#include "app/muxer_flags.h"
#include "app/single_muxer_flags.h"
#include "app/widevine_encryption_flags.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
#include "media/base/demuxer.h"
#include "media/base/encryption_key_source.h"
#include "media/base/muxer_options.h"
#include "media/base/muxer_util.h"
#include "media/event/mpd_notify_muxer_listener.h"
#include "media/event/vod_media_info_dump_muxer_listener.h"
#include "media/file/file.h"
#include "media/file/file_closer.h"
#include "media/formats/mp4/mp4_muxer.h"
#include "mpd/base/mpd_builder.h"
#include "mpd/base/simple_mpd_notifier.h"
namespace {
const char kUsage[] =
@ -51,6 +56,25 @@ bool GetSingleMuxerOptions(MuxerOptions* muxer_options) {
bool RunPackager(const std::string& input) {
Status status;
if (FLAGS_output_media_info && !FLAGS_mpd_output.empty()) {
NOTIMPLEMENTED() << "ERROR: --output_media_info and --mpd_output cannot be "
"enabled together.";
return false;
}
if (!FLAGS_single_segment) {
if (FLAGS_output_media_info) {
LOG(ERROR) << "ERROR: --output_media_info can be enabled only if "
"--single_segment is true.";
return false;
}
if (!FLAGS_mpd_output.empty() && FLAGS_segment_template.empty()) {
LOG(ERROR) << "ERROR: --segment_template is required for live mpd "
"profile generation.";
return false;
}
}
// Get muxer options from commandline flags.
MuxerOptions muxer_options;
if (!GetSingleMuxerOptions(&muxer_options))
@ -93,6 +117,29 @@ bool RunPackager(const std::string& input) {
muxer->SetMuxerListener(muxer_listener.get());
}
scoped_ptr<dash_packager::MpdNotifier> mpd_notifier;
if (!FLAGS_mpd_output.empty()) {
dash_packager::DashProfile profile = FLAGS_single_segment
? dash_packager::kOnDemandProfile
: dash_packager::kLiveProfile;
std::vector<std::string> base_urls;
base::SplitString(FLAGS_base_urls, ',', &base_urls);
// TODO(rkuroiwa,kqyang): Get mpd options from command line.
mpd_notifier.reset(new dash_packager::SimpleMpdNotifier(
profile, dash_packager::MpdOptions(), base_urls, FLAGS_mpd_output));
if (!mpd_notifier->Init()) {
LOG(ERROR) << "MpdNotifier failed to initialize.";
return false;
}
scoped_ptr<event::MpdNotifyMuxerListener> mpd_notify_muxer_listener(
new event::MpdNotifyMuxerListener(mpd_notifier.get()));
mpd_notify_muxer_listener->SetContentProtectionSchemeIdUri(
FLAGS_scheme_id_uri);
muxer_listener = mpd_notify_muxer_listener.Pass();
muxer->SetMuxerListener(muxer_listener.get());
}
if (!AddStreamToMuxer(demuxer.streams(), FLAGS_stream, muxer.get()))
return false;

6
packager.gyp
View File

@ -23,6 +23,8 @@
'app/fixed_key_encryption_flags.h',
'app/libcrypto_threading.cc',
'app/libcrypto_threading.h',
'app/mpd_flags.cc',
'app/mpd_flags.h',
'app/muxer_flags.cc',
'app/muxer_flags.h',
'app/packager_common.cc',
@ -38,6 +40,7 @@
'media/formats/mp2t/mp2t.gyp:mp2t',
'media/formats/mp4/mp4.gyp:mp4',
'media/formats/mpeg/mpeg.gyp:mpeg',
'mpd/mpd.gyp:mpd_builder',
'third_party/gflags/gflags.gyp:gflags',
],
'conditions': [
@ -54,6 +57,8 @@
'sources': [
'app/fixed_key_encryption_flags.cc',
'app/fixed_key_encryption_flags.h',
'app/mpd_flags.cc',
'app/mpd_flags.h',
'app/muxer_flags.cc',
'app/muxer_flags.h',
'app/packager_common.cc',
@ -71,6 +76,7 @@
'media/formats/mp2t/mp2t.gyp:mp2t',
'media/formats/mp4/mp4.gyp:mp4',
'media/formats/mpeg/mpeg.gyp:mpeg',
'mpd/mpd.gyp:mpd_builder',
'third_party/gflags/gflags.gyp:gflags',
],
},