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

Merge "Add fields in ContentProtection to match MPD spec"

This commit is contained in:
Rintaro Kuroiwa 2014-01-10 22:57:34 +00:00 committed by Gerrit Code Review
parent ffc4a82460 d34a331ef5
commit 4c01b89625
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mpd/base/media_info.proto
View File

@ -38,16 +38,28 @@ message MediaInfo {
optional string language = 2; optional string language = 2;
} }
message ContentProtection { message ContentProtectionXml {
optional bytes key_id = 1; message AttributeNameValuePair {
optional bytes pssh = 2; optional string name = 1;
optional string value = 2;
}
message Element {
repeated AttributeNameValuePair attributes = 1;
repeated Element subelements = 2;
}
optional string scheme_id_uri = 1;
optional string value = 2;
repeated AttributeNameValuePair attributes = 3;
repeated Element subelements = 4;
} }
optional uint32 bandwidth = 1; optional uint32 bandwidth = 1;
repeated VideoInfo video_info = 2; repeated VideoInfo video_info = 2;
repeated AudioInfo audio_info = 3; repeated AudioInfo audio_info = 3;
repeated TextInfo text_info = 4; repeated TextInfo text_info = 4;
repeated ContentProtection content_protections = 5; repeated ContentProtectionXml content_protections = 5;
// This is the reference time scale if there are multiple VideoInfo and/or // This is the reference time scale if there are multiple VideoInfo and/or
// AudioInfo. // AudioInfo.