Experiments with 708 in MP4.

This commit is contained in:
cfsmp3 2015-05-04 13:39:06 +02:00
parent c7b77b5555
commit f04cbbd99c
4 changed files with 13 additions and 5 deletions

View File

@ -5,7 +5,10 @@
- Fixed bug in capitalization code ('I' was not being capitalized).
- GUI should now run in Windows 8 (using the include .Net runtime, since
3.5 cannot be installed in Windows 8 apparently).
- Fixed Mac build script, binary is now compiled with support for
files over 2 GB.
- Fixed bug in PMT code, damaged PMT sections could make CCExtractor
crash.
0.76 (2015-03-28)
-----------------

View File

@ -1 +1,2 @@
gcc -std=gnu99 -Wno-write-strings -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek -I ../src/gpacmp4 -I ../src/lib_ccx -I ../src/libpng -I ../src/zlib -o ccextractor $(find ../src/ -name '*.cpp' \! -name 'win_*') $(find ../src/ -name '*.c' \! -name 'win_*') -liconv
gcc -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek -I ../src/gpacmp4 -I ../src/lib_ccx -I ../src/libpng -I ../src/zlib -o ccextractor $(find ../src/ -name '*.cpp' \! -name 'win_*') $(find ../src/ -name '*.c' \! -name 'win_*') -liconv

View File

@ -227,7 +227,8 @@ enum
GF_ISOM_SUBTYPE_LSR1 = GF_4CC( 'l', 's', 'r', '1' ),
/* CAPTIONS */
GF_ISOM_SUBTYPE_C608 = GF_4CC ('c', '6', '0', '8' )
GF_ISOM_SUBTYPE_C608 = GF_4CC ('c', '6', '0', '8' ),
GF_ISOM_SUBTYPE_C708 = GF_4CC('c', '7', '0', '8')
};

View File

@ -285,7 +285,10 @@ int processmp4 (struct lib_ccx_ctx *ctx, char *file,void *enc_ctx)
}
if (type == GF_ISOM_MEDIA_CAPTIONS && subtype == GF_ISOM_SUBTYPE_C608)
if (type == GF_ISOM_MEDIA_CAPTIONS &&
( (subtype == GF_ISOM_SUBTYPE_C608)
//|| (subtype == GF_ISOM_SUBTYPE_C708) && 1)
)
{
if (avc_track_count && ccx_options.mp4vidtrack)
continue;
@ -340,7 +343,7 @@ int processmp4 (struct lib_ccx_ctx *ctx, char *file,void *enc_ctx)
}
data += 4;
if (!strncmp(data, "cdat", 4) || !strncmp(data, "cdt2", 4))
if (!strncmp(data, "cdat", 4) || !strncmp(data, "cdt2", 4) )
{
int ret = 0;
int len = atomLength - 8;