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

Allow uuid to be a valid top level box 

Change-Id: Iec241781321a30fa8eece6a7fc6674d78a02c90f
This commit is contained in:
Kongqun Yang 2016-05-26 11:55:44 -07:00 committed by KongQun Yang
parent 579678d6a6
commit bd1328500c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packager/media/base/container_names.cc
View File

@ -963,6 +963,7 @@ static bool CheckMov(const uint8_t* buffer, int buffer_size) {
switch (atomtype) { switch (atomtype) {
case TAG('f','t','y','p'): case TAG('f','t','y','p'):
case TAG('p','d','i','n'): case TAG('p','d','i','n'):
case TAG('b','l','o','c'):
case TAG('m','o','o','v'): case TAG('m','o','o','v'):
case TAG('m','o','o','f'): case TAG('m','o','o','f'):
case TAG('m','f','r','a'): case TAG('m','f','r','a'):
@ -975,7 +976,7 @@ static bool CheckMov(const uint8_t* buffer, int buffer_size) {
case TAG('s','i','d','x'): case TAG('s','i','d','x'):
case TAG('s','s','i','x'): case TAG('s','s','i','x'):
case TAG('p','r','f','t'): case TAG('p','r','f','t'):
case TAG('b','l','o','c'): case TAG('u','u','i','d'):
break; break;
default: default:
return false; return false;

1
packager/media/formats/mp4/box_reader.cc
View File

@ -92,6 +92,7 @@ bool BoxReader::IsValidTopLevelBox(const FourCC& type) {
case FOURCC_sidx: case FOURCC_sidx:
case FOURCC_ssix: case FOURCC_ssix:
case FOURCC_prft: case FOURCC_prft:
case FOURCC_uuid:
return true; return true;
default: default:
// Hex is used to show nonprintable characters and aid in debugging // Hex is used to show nonprintable characters and aid in debugging