breeze/Bento4
1
0
Fork 0
mirror of https://github.com/axiomatic-systems/Bento4.git synced 2026-01-12 00:18:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

prep for r611

Browse Source
This commit is contained in:
Gilles Boccon-Gibod
2016-05-13 11:15:38 -07:00
parent ce8bcdd173
commit 6622a25035
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Documents/Websites/www.bok.net/dash/players/html5/presets.js
View File

@@ -15,20 +15,5 @@ var Presets = [
kid: '000102030405060708090a0b0c0d0e0f',
key: '00112233445566778899aabbccddeeff',
emeConfig: 'manual'
},
{
title: 'PlayReady NO-EME',
url: 'http://192.168.1.199:8081/noeme/stream.mpd',
licenseUrl: 'https://expressplay-licensing.axprod.net/LicensingService.ashx?ExpressPlayToken=AQAAAAM7XvUAAABgy-BCj1tcTPhJxHuRBinTPX3CgyVqrgL6NQxfeBs6O5I-UX1PrYLGXWUqZvuYY8K25XHwVx8wkHRCCJFUq7MSZEFk_BqAEDTo7oOnEDf8xAwrzQmVw3TMXX8CfawwuU90WDN95Xj9XNn4bNZJLeyI93JVcGk'
},
{
title: 'PlayReady PSSH-V0',
url: 'http://192.168.1.199:8081/pssh-v0/stream.mpd',
licenseUrl: 'https://expressplay-licensing.axprod.net/LicensingService.ashx?ExpressPlayToken=AQAAAAM7XvUAAABgy-BCj1tcTPhJxHuRBinTPX3CgyVqrgL6NQxfeBs6O5I-UX1PrYLGXWUqZvuYY8K25XHwVx8wkHRCCJFUq7MSZEFk_BqAEDTo7oOnEDf8xAwrzQmVw3TMXX8CfawwuU90WDN95Xj9XNn4bNZJLeyI93JVcGk'
},
{
title: 'PlayReady PSSH-V1',
url: 'http://192.168.1.199:8081/pssh-v1/stream.mpd',
licenseUrl: 'https://expressplay-licensing.axprod.net/LicensingService.ashx?ExpressPlayToken=AQAAAAM7XvUAAABgy-BCj1tcTPhJxHuRBinTPX3CgyVqrgL6NQxfeBs6O5I-UX1PrYLGXWUqZvuYY8K25XHwVx8wkHRCCJFUq7MSZEFk_BqAEDTo7oOnEDf8xAwrzQmVw3TMXX8CfawwuU90WDN95Xj9XNn4bNZJLeyI93JVcGk'
}
];

6
Source/Python/utils/mp4-dash.py
View File

@@ -27,7 +27,7 @@ from subtitles import *
# setup main options
VERSION = "1.7.0"
SDK_REVISION = '610'
SDK_REVISION = '611'
SCRIPT_PATH = path.abspath(path.dirname(__file__))
sys.path += [SCRIPT_PATH]
@@ -1028,7 +1028,7 @@ def main():
parser.add_option('', "--playready", dest="playready", action="store_true", default=False,
help="Add PlayReady signaling to the MPD (requires an encrypted input, or the --encryption-key option)")
parser.add_option('', "--playready-header", dest="playready_header", metavar='<playready-header>', default=None,
help="Add a PlayReady PRO element in the MPD and a PlayReady PSSH box in the init segments. The use of this option implies the --playready option." +
help="Add a PlayReady PRO element in the MPD and a PlayReady PSSH box in the init segments. The use of this option implies the --playready option. " +
"The <playready-header> argument can be either: " +
"(1) the character '@' followed by the name of a file containing a PlayReady XML Rights Management Header (<WRMHEADER>) or a PlayReady Header Object (PRO) in binary form, or "
"(2) the character '#' followed by a PlayReady Header Object encoded in Base64, or " +
@@ -1214,6 +1214,8 @@ def main():
if not options.no_media and options.encryption_key:
encrypted_files = {}
for media_source in media_sources:
if media_source.format != 'mp4': continue
media_file = media_source.filename
# check if we have already encrypted this file

2
Source/Python/utils/mp4-hls.py
View File

@@ -26,7 +26,7 @@ from mp4utils import *
# setup main options
VERSION = "1.0.0"
SDK_REVISION = '610'
SDK_REVISION = '611'
SCRIPT_PATH = path.abspath(path.dirname(__file__))
sys.path += [SCRIPT_PATH]

2
Source/Python/utils/subtitles.py
View File

@@ -36,7 +36,7 @@ class SubtitlesFile:
self.format = 'ttml'
self.mime_type = 'application/ttml+xml'
xml_tree= ET.parse(filename)
xml_tree= ET.parse(self.media_source.filename)
xml_root = xml_tree.getroot()
if xml_root.tag != '{'+TTML_XML_NAMESPACE+'}tt':