'Source' => 'cio.c',
'SourceLine' => '271'
},
- '169398' => {
+ '171879' => {
'Header' => 'openjpeg.h',
- 'Line' => '1062',
+ 'Line' => '1092',
'Return' => '156',
'ShortName' => 'opj_version',
'Source' => 'openjpeg.c',
'SourceLine' => '160'
},
- '169718' => {
+ '172199' => {
'Header' => 'openjpeg.h',
- 'Line' => '1587',
+ 'Line' => '1617',
'Param' => {
'0' => {
'name' => 'cstr_info',
- 'type' => '169736'
+ 'type' => '172217'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '966'
},
- '232061' => {
+ '234546' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_callback',
'Source' => 'openjpeg.c',
'SourceLine' => '44'
},
- '232159' => {
+ '234644' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_callback',
'Source' => 'openjpeg.c',
'SourceLine' => '59'
},
- '232245' => {
+ '234730' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_callback',
'Source' => 'openjpeg.c',
'SourceLine' => '74'
},
- '232360' => {
+ '234845' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '221119'
+ 'type' => '223604'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '232147',
+ 'Return' => '234632',
'ShortName' => 'opj_create_decompress',
'Source' => 'openjpeg.c',
'SourceLine' => '168'
},
- '232582' => {
+ '235067' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '76844'
+ 'type' => '76846'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '364'
},
- '232713' => {
+ '235198' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'num_threads',
'Source' => 'openjpeg.c',
'SourceLine' => '387'
},
- '232831' => {
+ '235316' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'parameters',
- 'type' => '76844'
+ 'type' => '76846'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '398'
},
- '232973' => {
+ '235458' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
},
'1' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'2' => {
'name' => 'p_image',
- 'type' => '76838'
+ 'type' => '76840'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '418'
},
- '233176' => {
+ '235661' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'numcomps',
},
'2' => {
'name' => 'comps_indices',
- 'type' => '76856'
+ 'type' => '76858'
},
'3' => {
'name' => 'apply_color_transforms',
'Source' => 'openjpeg.c',
'SourceLine' => '442'
},
- '233418' => {
+ '235903' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_stream',
'Source' => 'openjpeg.c',
'SourceLine' => '471'
},
- '233572' => {
+ '236057' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_image',
'Source' => 'openjpeg.c',
'SourceLine' => '492'
},
- '233780' => {
+ '236265' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_stream',
'Source' => 'openjpeg.c',
'SourceLine' => '515'
},
- '233986' => {
+ '236471' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_tile_index',
'Source' => 'openjpeg.c',
'SourceLine' => '546'
},
- '234186' => {
+ '236671' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_stream',
'Source' => 'openjpeg.c',
'SourceLine' => '572'
},
- '234363' => {
+ '236848' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'res_factor',
'Source' => 'openjpeg.c',
'SourceLine' => '596'
},
- '234472' => {
+ '236957' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_format',
- 'type' => '221119'
+ 'type' => '223604'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '232147',
+ 'Return' => '234632',
'ShortName' => 'opj_create_compress',
'Source' => 'openjpeg.c',
'SourceLine' => '614'
},
- '234697' => {
+ '237182' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '76867'
+ 'type' => '76869'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '712'
},
- '234828' => {
+ '237313' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'parameters',
- 'type' => '76867'
+ 'type' => '76869'
},
'2' => {
'name' => 'p_image',
'Source' => 'openjpeg.c',
'SourceLine' => '773'
},
- '234966' => {
+ '237451' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_image',
'Source' => 'openjpeg.c',
'SourceLine' => '791'
},
- '235120' => {
+ '237605' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_info',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_stream',
'Source' => 'openjpeg.c',
'SourceLine' => '810'
},
- '235251' => {
+ '237736' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_stream',
'Source' => 'openjpeg.c',
'SourceLine' => '827'
},
- '235382' => {
+ '237867' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_stream',
'Source' => 'openjpeg.c',
'SourceLine' => '844'
},
- '235513' => {
+ '237998' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'parameters',
- 'type' => '76867'
+ 'type' => '76869'
},
'1' => {
'name' => 'pEncodingMatrix',
'Source' => 'openjpeg.c',
'SourceLine' => '864'
},
- '235859' => {
+ '238344' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'p_tile_index',
'Source' => 'openjpeg.c',
'SourceLine' => '894'
},
- '236059' => {
+ '238544' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '921'
},
- '236160' => {
+ '238645' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
},
'1' => {
'name' => 'info_flag',
},
'2' => {
'name' => 'output_stream',
- 'type' => '76873'
+ 'type' => '76875'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '939'
},
- '236297' => {
+ '238782' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '76879',
+ 'Return' => '76881',
'ShortName' => 'opj_get_cstr_info',
'Source' => 'openjpeg.c',
'SourceLine' => '955'
},
- '236461' => {
+ '238946' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_codec',
- 'type' => '232147'
+ 'type' => '234632'
}
},
'Reg' => {
'0' => 'rdi'
},
- 'Return' => '74657',
+ 'Return' => '74659',
'ShortName' => 'opj_get_cstr_index',
'Source' => 'openjpeg.c',
'SourceLine' => '983'
},
- '236546' => {
+ '239031' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'name' => 'p_cstr_index',
- 'type' => '236606'
+ 'type' => '239091'
}
},
'Reg' => {
'Source' => 'openjpeg.c',
'SourceLine' => '994'
},
- '236612' => {
+ '239097' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
'Source' => 'openjpeg.c',
'SourceLine' => '1009'
},
- '236731' => {
+ '239216' => {
'Header' => 'openjpeg.h',
'Param' => {
'0' => {
},
'63562' => {
'Header' => 'openjpeg.h',
- 'Line' => '1119',
+ 'Line' => '1149',
'Param' => {
'0' => {
'name' => 'ptr',
},
'63626' => {
'Header' => 'openjpeg.h',
- 'Line' => '1109',
+ 'Line' => '1139',
'Param' => {
'0' => {
'name' => 'size',
'11254' => {
'BaseType' => '11266',
'Header' => 'openjpeg.h',
- 'Line' => '313',
+ 'Line' => '343',
'Name' => 'opj_msg_callback',
'Size' => '8',
'Type' => 'Typedef'
'11288' => {
'BaseType' => '11300',
'Header' => 'openjpeg.h',
- 'Line' => '597',
+ 'Line' => '627',
'Name' => 'opj_stream_read_fn',
'Size' => '8',
'Type' => 'Typedef'
'11331' => {
'BaseType' => '11300',
'Header' => 'openjpeg.h',
- 'Line' => '603',
+ 'Line' => '633',
'Name' => 'opj_stream_write_fn',
'Size' => '8',
'Type' => 'Typedef'
'11343' => {
'BaseType' => '11355',
'Header' => 'openjpeg.h',
- 'Line' => '609',
+ 'Line' => '639',
'Name' => 'opj_stream_skip_fn',
'Size' => '8',
'Type' => 'Typedef'
'11381' => {
'BaseType' => '11393',
'Header' => 'openjpeg.h',
- 'Line' => '615',
+ 'Line' => '645',
'Name' => 'opj_stream_seek_fn',
'Size' => '8',
'Type' => 'Typedef'
'11419' => {
'BaseType' => '781',
'Header' => 'openjpeg.h',
- 'Line' => '621',
+ 'Line' => '651',
'Name' => 'opj_stream_free_user_data_fn',
'Size' => '8',
'Type' => 'Typedef'
'11448' => {
'BaseType' => '130',
'Header' => 'openjpeg.h',
- 'Line' => '626',
+ 'Line' => '656',
'Name' => 'opj_stream_t',
'Size' => '8',
'Type' => 'Typedef'
'Size' => '1',
'Type' => 'Const'
},
- '169736' => {
- 'BaseType' => '76879',
+ '172217' => {
+ 'BaseType' => '76881',
'Name' => 'opj_codestream_info_v2_t**',
'Size' => '8',
'Type' => 'Pointer'
},
'18379' => {
'Header' => 'openjpeg.h',
- 'Line' => '267',
+ 'Line' => '297',
'Memb' => {
'0' => {
'name' => 'OPJ_PROG_UNKNOWN',
'18429' => {
'BaseType' => '18379',
'Header' => 'openjpeg.h',
- 'Line' => '274',
+ 'Line' => '304',
'Name' => 'OPJ_PROG_ORDER',
'Size' => '4',
'Type' => 'Typedef'
},
'18441' => {
'Header' => 'openjpeg.h',
- 'Line' => '279',
+ 'Line' => '309',
'Memb' => {
'0' => {
'name' => 'OPJ_CLRSPC_UNKNOWN',
'18497' => {
'BaseType' => '18441',
'Header' => 'openjpeg.h',
- 'Line' => '287',
+ 'Line' => '317',
'Name' => 'OPJ_COLOR_SPACE',
'Size' => '4',
'Type' => 'Typedef'
},
'18509' => {
'Header' => 'openjpeg.h',
- 'Line' => '325',
+ 'Line' => '355',
'Memb' => {
'0' => {
'name' => 'resno0',
'19005' => {
'BaseType' => '18509',
'Header' => 'openjpeg.h',
- 'Line' => '348',
+ 'Line' => '378',
'Name' => 'opj_poc_t',
'Size' => '148',
'Type' => 'Typedef'
},
'19033' => {
'Header' => 'openjpeg.h',
- 'Line' => '637',
+ 'Line' => '667',
'Memb' => {
'0' => {
'name' => 'dx',
'19214' => {
'BaseType' => '19033',
'Header' => 'openjpeg.h',
- 'Line' => '664',
+ 'Line' => '694',
'Name' => 'opj_image_comp_t',
'Size' => '64',
'Type' => 'Typedef'
},
'19226' => {
'Header' => 'openjpeg.h',
- 'Line' => '669',
+ 'Line' => '699',
'Memb' => {
'0' => {
'name' => 'x0',
'19365' => {
'BaseType' => '19226',
'Header' => 'openjpeg.h',
- 'Line' => '688',
+ 'Line' => '718',
'Name' => 'opj_image_t',
'Size' => '48',
'Type' => 'Typedef'
'Size' => '8',
'Type' => 'Pointer'
},
- '221069' => {
+ '223554' => {
'Header' => 'openjpeg.h',
- 'Line' => '292',
+ 'Line' => '322',
'Memb' => {
'0' => {
'name' => 'OPJ_CODEC_UNKNOWN',
'Size' => '4',
'Type' => 'Enum'
},
- '221119' => {
- 'BaseType' => '221069',
- 'Header' => 'openjpeg.h',
- 'Line' => '299',
- 'Name' => 'OPJ_CODEC_FORMAT',
- 'Size' => '4',
- 'Type' => 'Typedef'
- },
- '222876' => {
- 'BaseType' => '130',
- 'Header' => 'openjpeg.h',
- 'Line' => '578',
- 'Name' => 'opj_codec_t',
- 'Size' => '8',
- 'Type' => 'Typedef'
- },
'2236' => {
'Name' => 'float',
'Size' => '4',
'Type' => 'Intrinsic'
},
+ '223604' => {
+ 'BaseType' => '223554',
+ 'Header' => 'openjpeg.h',
+ 'Line' => '329',
+ 'Name' => 'OPJ_CODEC_FORMAT',
+ 'Size' => '4',
+ 'Type' => 'Typedef'
+ },
'2243' => {
'Name' => 'double',
'Size' => '8',
'Size' => '216',
'Type' => 'Struct'
},
- '232147' => {
- 'BaseType' => '222876',
- 'Name' => 'opj_codec_t*',
+ '225361' => {
+ 'BaseType' => '130',
+ 'Header' => 'openjpeg.h',
+ 'Line' => '608',
+ 'Name' => 'opj_codec_t',
'Size' => '8',
- 'Type' => 'Pointer'
+ 'Type' => 'Typedef'
},
'23247' => {
'BaseType' => '2747',
'Size' => '4',
'Type' => 'Const'
},
- '236606' => {
- 'BaseType' => '74657',
+ '234632' => {
+ 'BaseType' => '225361',
+ 'Name' => 'opj_codec_t*',
+ 'Size' => '8',
+ 'Type' => 'Pointer'
+ },
+ '239091' => {
+ 'BaseType' => '74659',
'Name' => 'opj_codestream_index_t**',
'Size' => '8',
'Type' => 'Pointer'
},
'58980' => {
'Header' => 'openjpeg.h',
- 'Line' => '694',
+ 'Line' => '724',
'Memb' => {
'0' => {
'name' => 'dx',
'59103' => {
'BaseType' => '58980',
'Header' => 'openjpeg.h',
- 'Line' => '713',
+ 'Line' => '743',
'Name' => 'opj_image_cmptparm_t',
'Size' => '36',
'Type' => 'Typedef'
},
'67518' => {
'Header' => 'openjpeg.h',
- 'Line' => '246',
+ 'Line' => '276',
'Memb' => {
'0' => {
'name' => 'OPJ_STD_RSIZ',
'Size' => '4',
'Type' => 'Enum'
},
- '67557' => {
+ '67558' => {
'BaseType' => '67518',
'Header' => 'openjpeg.h',
- 'Line' => '251',
+ 'Line' => '281',
'Name' => 'OPJ_RSIZ_CAPABILITIES',
'Size' => '4',
'Type' => 'Typedef'
},
- '67568' => {
+ '67570' => {
'Header' => 'openjpeg.h',
- 'Line' => '257',
+ 'Line' => '287',
'Memb' => {
'0' => {
'name' => 'OPJ_OFF',
'Size' => '4',
'Type' => 'Enum'
},
- '67606' => {
- 'BaseType' => '67568',
+ '67608' => {
+ 'BaseType' => '67570',
'Header' => 'openjpeg.h',
- 'Line' => '262',
+ 'Line' => '292',
'Name' => 'OPJ_CINEMA_MODE',
'Size' => '4',
'Type' => 'Typedef'
},
- '68290' => {
+ '68292' => {
'Header' => 'openjpeg.h',
- 'Line' => '353',
+ 'Line' => '383',
'Memb' => {
'0' => {
'name' => 'tile_size_on',
'15' => {
'name' => 'tcp_rates',
'offset' => '4800',
- 'type' => '69154'
+ 'type' => '69156'
},
'16' => {
'name' => 'tcp_distoratio',
'offset' => '5200',
- 'type' => '69154'
+ 'type' => '69156'
},
'17' => {
'name' => 'numresolution',
'25' => {
'name' => 'prcw_init',
'offset' => '5632',
- 'type' => '69170'
+ 'type' => '69172'
},
'26' => {
'name' => 'prch_init',
'offset' => '5764',
- 'type' => '69170'
+ 'type' => '69172'
},
'27' => {
'name' => 'infile',
'offset' => '5896',
- 'type' => '69186'
+ 'type' => '69188'
},
'28' => {
'name' => 'outfile',
'offset' => '9992',
- 'type' => '69186'
+ 'type' => '69188'
},
'29' => {
'name' => 'index_on',
'30' => {
'name' => 'index',
'offset' => '14092',
- 'type' => '69186'
+ 'type' => '69188'
},
'31' => {
'name' => 'image_offset_x0',
'39' => {
'name' => 'jpwl_hprot_TPH_tileno',
'offset' => '18220',
- 'type' => '69203'
+ 'type' => '69205'
},
'4' => {
'name' => 'cp_tdy',
'40' => {
'name' => 'jpwl_hprot_TPH',
'offset' => '18284',
- 'type' => '69203'
+ 'type' => '69205'
},
'41' => {
'name' => 'jpwl_pprot_tileno',
'offset' => '18348',
- 'type' => '69203'
+ 'type' => '69205'
},
'42' => {
'name' => 'jpwl_pprot_packno',
'offset' => '18412',
- 'type' => '69203'
+ 'type' => '69205'
},
'43' => {
'name' => 'jpwl_pprot',
'offset' => '18476',
- 'type' => '69203'
+ 'type' => '69205'
},
'44' => {
'name' => 'jpwl_sens_size',
'48' => {
'name' => 'jpwl_sens_TPH_tileno',
'offset' => '18556',
- 'type' => '69203'
+ 'type' => '69205'
},
'49' => {
'name' => 'jpwl_sens_TPH',
'offset' => '18620',
- 'type' => '69203'
+ 'type' => '69205'
},
'5' => {
'name' => 'cp_disto_alloc',
'50' => {
'name' => 'cp_cinema',
'offset' => '18684',
- 'type' => '67606'
+ 'type' => '67608'
},
'51' => {
'name' => 'max_comp_size',
'52' => {
'name' => 'cp_rsiz',
'offset' => '18692',
- 'type' => '67557'
+ 'type' => '67558'
},
'53' => {
'name' => 'tp_on',
'8' => {
'name' => 'cp_matrice',
'offset' => '32',
- 'type' => '69132'
+ 'type' => '69134'
},
'9' => {
'name' => 'cp_comment',
'Size' => '18720',
'Type' => 'Struct'
},
- '69132' => {
+ '69134' => {
'BaseType' => '87',
'Name' => 'int*',
'Size' => '8',
'Type' => 'Pointer'
},
- '69154' => {
+ '69156' => {
'BaseType' => '2236',
'Name' => 'float[100]',
'Size' => '400',
'Type' => 'Array'
},
- '69170' => {
+ '69172' => {
'BaseType' => '87',
'Name' => 'int[33]',
'Size' => '132',
'Type' => 'Array'
},
- '69186' => {
+ '69188' => {
'BaseType' => '138',
'Name' => 'char[4096]',
'Size' => '4096',
'Type' => 'Array'
},
- '69203' => {
+ '69205' => {
'BaseType' => '87',
'Name' => 'int[16]',
'Size' => '64',
'Type' => 'Array'
},
- '69219' => {
- 'BaseType' => '68290',
+ '69221' => {
+ 'BaseType' => '68292',
'Header' => 'openjpeg.h',
- 'Line' => '504',
+ 'Line' => '534',
'Name' => 'opj_cparameters_t',
'Size' => '18720',
'Type' => 'Typedef'
},
- '69231' => {
+ '69233' => {
'Header' => 'openjpeg.h',
- 'Line' => '512',
+ 'Line' => '542',
'Memb' => {
'0' => {
'name' => 'cp_reduce',
'2' => {
'name' => 'infile',
'offset' => '8',
- 'type' => '69186'
+ 'type' => '69188'
},
'3' => {
'name' => 'outfile',
'offset' => '4104',
- 'type' => '69186'
+ 'type' => '69188'
},
'4' => {
'name' => 'decod_format',
'Size' => '8252',
'Type' => 'Struct'
},
- '69481' => {
- 'BaseType' => '69231',
+ '69483' => {
+ 'BaseType' => '69233',
'Header' => 'openjpeg.h',
- 'Line' => '572',
+ 'Line' => '602',
'Name' => 'opj_dparameters_t',
'Size' => '8252',
'Type' => 'Typedef'
},
- '69997' => {
+ '69999' => {
'Header' => 'openjpeg.h',
- 'Line' => '726',
+ 'Line' => '756',
'Memb' => {
'0' => {
'name' => 'start_pos',
'Size' => '32',
'Type' => 'Struct'
},
- '70063' => {
- 'BaseType' => '69997',
+ '70065' => {
+ 'BaseType' => '69999',
'Header' => 'openjpeg.h',
- 'Line' => '735',
+ 'Line' => '765',
'Name' => 'opj_packet_info_t',
'Size' => '32',
'Type' => 'Typedef'
},
- '70075' => {
+ '70077' => {
'Header' => 'openjpeg.h',
- 'Line' => '742',
+ 'Line' => '772',
'Memb' => {
'0' => {
'name' => 'type',
'Size' => '24',
'Type' => 'Struct'
},
- '70128' => {
- 'BaseType' => '70075',
+ '70130' => {
+ 'BaseType' => '70077',
'Header' => 'openjpeg.h',
- 'Line' => '749',
+ 'Line' => '779',
'Name' => 'opj_marker_info_t',
'Size' => '24',
'Type' => 'Typedef'
},
- '70480' => {
- 'BaseType' => '70063',
+ '70482' => {
+ 'BaseType' => '70065',
'Name' => 'opj_packet_info_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '70486' => {
- 'BaseType' => '70128',
+ '70488' => {
+ 'BaseType' => '70130',
'Name' => 'opj_marker_info_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '70826' => {
+ '70828' => {
'Header' => 'openjpeg.h',
- 'Line' => '866',
+ 'Line' => '896',
'Memb' => {
'0' => {
'name' => 'compno',
'8' => {
'name' => 'stepsizes_mant',
'offset' => '32',
- 'type' => '71028'
+ 'type' => '71030'
},
'9' => {
'name' => 'stepsizes_expn',
'offset' => '420',
- 'type' => '71028'
+ 'type' => '71030'
}
},
'Name' => 'struct opj_tccp_info',
'Size' => '1080',
'Type' => 'Struct'
},
- '71028' => {
+ '71030' => {
'BaseType' => '9048',
'Name' => 'OPJ_UINT32[97]',
'Size' => '388',
'Type' => 'Array'
},
- '71060' => {
- 'BaseType' => '70826',
+ '71062' => {
+ 'BaseType' => '70828',
'Header' => 'openjpeg.h',
- 'Line' => '896',
+ 'Line' => '926',
'Name' => 'opj_tccp_info_t',
'Size' => '1080',
'Type' => 'Typedef'
},
- '71072' => {
+ '71074' => {
'Header' => 'openjpeg.h',
- 'Line' => '901',
+ 'Line' => '931',
'Memb' => {
'0' => {
'name' => 'tileno',
'5' => {
'name' => 'tccp_info',
'offset' => '24',
- 'type' => '71164'
+ 'type' => '71166'
}
},
'Name' => 'struct opj_tile_v2_info',
'Size' => '32',
'Type' => 'Struct'
},
- '71164' => {
- 'BaseType' => '71060',
+ '71166' => {
+ 'BaseType' => '71062',
'Name' => 'opj_tccp_info_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '71170' => {
- 'BaseType' => '71072',
+ '71172' => {
+ 'BaseType' => '71074',
'Header' => 'openjpeg.h',
- 'Line' => '917',
+ 'Line' => '947',
'Name' => 'opj_tile_info_v2_t',
'Size' => '32',
'Type' => 'Typedef'
},
- '71182' => {
+ '71184' => {
'Header' => 'openjpeg.h',
- 'Line' => '922',
+ 'Line' => '952',
'Memb' => {
'0' => {
'name' => 'tx0',
'7' => {
'name' => 'm_default_tile_info',
'offset' => '32',
- 'type' => '71170'
+ 'type' => '71172'
},
'8' => {
'name' => 'tile_info',
'offset' => '64',
- 'type' => '71311'
+ 'type' => '71313'
}
},
'Name' => 'struct opj_codestream_info_v2',
'Size' => '72',
'Type' => 'Struct'
},
- '71311' => {
- 'BaseType' => '71170',
+ '71313' => {
+ 'BaseType' => '71172',
'Name' => 'opj_tile_info_v2_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '71317' => {
- 'BaseType' => '71182',
+ '71319' => {
+ 'BaseType' => '71184',
'Header' => 'openjpeg.h',
- 'Line' => '946',
+ 'Line' => '976',
'Name' => 'opj_codestream_info_v2_t',
'Size' => '72',
'Type' => 'Typedef'
},
- '71329' => {
+ '71331' => {
'Header' => 'openjpeg.h',
- 'Line' => '952',
+ 'Line' => '982',
'Memb' => {
'0' => {
'name' => 'start_pos',
'Size' => '24',
'Type' => 'Struct'
},
- '71382' => {
- 'BaseType' => '71329',
+ '71384' => {
+ 'BaseType' => '71331',
'Header' => 'openjpeg.h',
- 'Line' => '960',
+ 'Line' => '990',
'Name' => 'opj_tp_index_t',
'Size' => '24',
'Type' => 'Typedef'
},
- '71394' => {
+ '71396' => {
'Header' => 'openjpeg.h',
- 'Line' => '965',
+ 'Line' => '995',
'Memb' => {
'0' => {
'name' => 'tileno',
'4' => {
'name' => 'tp_index',
'offset' => '16',
- 'type' => '71538'
+ 'type' => '71540'
},
'5' => {
'name' => 'marknum',
'6' => {
'name' => 'marker',
'offset' => '32',
- 'type' => '70486'
+ 'type' => '70488'
},
'7' => {
'name' => 'maxmarknum',
'9' => {
'name' => 'packet_index',
'offset' => '48',
- 'type' => '70480'
+ 'type' => '70482'
}
},
'Name' => 'struct opj_tile_index',
'Size' => '56',
'Type' => 'Struct'
},
- '71538' => {
- 'BaseType' => '71382',
+ '71540' => {
+ 'BaseType' => '71384',
'Name' => 'opj_tp_index_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '71544' => {
- 'BaseType' => '71394',
+ '71546' => {
+ 'BaseType' => '71396',
'Header' => 'openjpeg.h',
- 'Line' => '992',
+ 'Line' => '1022',
'Name' => 'opj_tile_index_t',
'Size' => '56',
'Type' => 'Typedef'
},
- '71556' => {
+ '71558' => {
'Header' => 'openjpeg.h',
- 'Line' => '997',
+ 'Line' => '1027',
'Memb' => {
'0' => {
'name' => 'main_head_start',
'4' => {
'name' => 'marker',
'offset' => '32',
- 'type' => '70486'
+ 'type' => '70488'
},
'5' => {
'name' => 'maxmarknum',
'7' => {
'name' => 'tile_index',
'offset' => '48',
- 'type' => '71674'
+ 'type' => '71676'
}
},
'Name' => 'struct opj_codestream_index',
'Size' => '56',
'Type' => 'Struct'
},
- '71674' => {
- 'BaseType' => '71544',
+ '71676' => {
+ 'BaseType' => '71546',
'Name' => 'opj_tile_index_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '71680' => {
- 'BaseType' => '71556',
+ '71682' => {
+ 'BaseType' => '71558',
'Header' => 'openjpeg.h',
- 'Line' => '1020',
+ 'Line' => '1050',
'Name' => 'opj_codestream_index_t',
'Size' => '56',
'Type' => 'Typedef'
'Size' => '1',
'Type' => 'Intrinsic'
},
- '74657' => {
- 'BaseType' => '71680',
+ '74659' => {
+ 'BaseType' => '71682',
'Name' => 'opj_codestream_index_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76838' => {
+ '76840' => {
'BaseType' => '21147',
'Name' => 'opj_image_t**',
'Size' => '8',
'Type' => 'Pointer'
},
- '76844' => {
- 'BaseType' => '69481',
+ '76846' => {
+ 'BaseType' => '69483',
'Name' => 'opj_dparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76856' => {
+ '76858' => {
'BaseType' => '23281',
'Name' => 'OPJ_UINT32 const*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76867' => {
- 'BaseType' => '69219',
+ '76869' => {
+ 'BaseType' => '69221',
'Name' => 'opj_cparameters_t*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76873' => {
+ '76875' => {
'BaseType' => '66801',
'Name' => 'FILE*',
'Size' => '8',
'Type' => 'Pointer'
},
- '76879' => {
- 'BaseType' => '71317',
+ '76881' => {
+ 'BaseType' => '71319',
'Name' => 'opj_codestream_info_v2_t*',
'Size' => '8',
'Type' => 'Pointer'
<br/>
<h1>Changelog from Git</h1><br/><br/>
<div class='changelog'>
-<pre class='wrap'>commit 28881453f6b1ae68a357557999498a11a2bc8b7e
+<pre class='wrap'>commit 4e5501b3c72a98b3117e68263afb922092c309cf
+Merge: 2888145 84f3beb
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-02-13 09:54:20 +0100
+
+ Merge pull request #1235 from rouault/imf
+
+ Implement writing of IMF profiles
+
+commit 84f3bebbff515f2b00ccf0c817930ebb10b91760
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-02-12 15:55:16 +0100
+
+ Implement writing of IMF profiles
+
+ Add -IMF switch to opj_compress as well
+
+commit fffe32adcb9f41a00805f4120012be9625ba450a
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: 2020-02-12 15:55:02 +0100
+
+ openjpeg.h: fix values of OPJ_PROFILE_IMF_ constants
+
+commit 28881453f6b1ae68a357557999498a11a2bc8b7e
Merge: 647f9b1 b5cb419
Author: Even Rouault <even.rouault@spatialys.com>
Date: 2020-02-10 11:20:20 +0100
mj2: Add missing variable to format string in fprintf() invocation in meta_out.c
-commit 31a347a9a04209933c63b180c9ff04bdf8a427e5
-Merge: b02e0d9 db6841a
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-03-04 23:13:45 +0100
-
- Merge pull request #1096 from kbabioch/fix/opj_mj2_extract-help
-
- opj_mj2_extract: Rename output_location to output_prefix
-
-commit b02e0d9c4e746faf7448cb06f0487402dff66083
-Merge: 564fbfb e351c22
-Author: Even Rouault <even.rouault@mines-paris.org>
-Date: 2018-03-04 23:10:48 +0100
-
- Merge pull request #1101 from kbabioch/fix/jp3d-sprintf-overflow
-
- jp3d: Replace sprintf() by snprintf() in volumetobin()
-
-commit e351c22ee8c4d8cef0f212831a00447bc0400601
-Author: Karol Babioch <karol@babioch.de>
-Date: 2018-03-03 10:10:32 +0100
-
- jp3d: Replace sprintf() by snprintf() in volumetobin()
-
- This replaces the unsafe sprintf() invocation by the safer snprintf()
- one, with the correct buffer size to prevent buffer overflows.
-
- This fixes #1085.
-
...</pre></div>
</body>
'2.2.0' => '2017-08-10 00:31',
'2.3.0' => '2017-10-04 22:23',
'2.3.1' => '2019-04-02 10:08',
- 'current' => '2020-02-10 11:20:20'
+ 'current' => '2020-02-13 09:54:20'
},
'HeadersDiff' => {
'1.1' => {
'Maintainer' => 'OpenJPEG team',
'MaintainerUrl' => 'http://www.openjpeg.org/',
'PackageDiff' => {},
- 'ScmUpdateTime' => '1581330585',
+ 'ScmUpdateTime' => '1581584678',
'Soname' => {
'1.1' => {
'lib/libopenjpeg.so' => 'libopenjpeg.so'
<table class='diff_tbl' border="0" cellpadding="0" cellspacing="0">
<tr id="part-1" bgcolor="orange"><th></th><th> openjpeg.h (2.3.1) </th><th> </th><th> openjpeg.h (current) </th><th></th></tr>
<tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
- <tr id="part-1" class="change" ><td></td><th><small>skipping to change at</small><a href="#part-1"><em> line 334<span class="hide"> ¶</span></em></a></th><th> </th><th><small>skipping to change at</small><a href="#part-1"><em> line 334<span class="hide"> ¶</span></em></a></th><td></td></tr>
+ <tr id="part-1" class="change" ><td></td><th><small>skipping to change at</small><a href="#part-1"><em> line 206<span class="hide"> ¶</span></em></a></th><th> </th><th><small>skipping to change at</small><a href="#part-1"><em> line 206<span class="hide"> ¶</span></em></a></th><td></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_PART2 0x8000 /** At least 1 extension defined in
+15444-2 (Part-2) */</td><td> </td><td class="right">#define OPJ_PROFILE_PART2 0x8000 /** At least 1 extension defined in
+15444-2 (Part-2) */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_CINEMA_2K 0x0003 /** 2K cinema profile defined in 154
+44-1 AMD1 */</td><td> </td><td class="right">#define OPJ_PROFILE_CINEMA_2K 0x0003 /** 2K cinema profile defined in 154
+44-1 AMD1 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_CINEMA_4K 0x0004 /** 4K cinema profile defined in 154
+44-1 AMD1 */</td><td> </td><td class="right">#define OPJ_PROFILE_CINEMA_4K 0x0004 /** 4K cinema profile defined in 154
+44-1 AMD1 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_CINEMA_S2K 0x0005 /** Scalable 2K cinema profile defin
+ed in 15444-1 AMD2 */</td><td> </td><td class="right">#define OPJ_PROFILE_CINEMA_S2K 0x0005 /** Scalable 2K cinema profile defin
+ed in 15444-1 AMD2 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_CINEMA_S4K 0x0006 /** Scalable 4K cinema profile defin
+ed in 15444-1 AMD2 */</td><td> </td><td class="right">#define OPJ_PROFILE_CINEMA_S4K 0x0006 /** Scalable 4K cinema profile defin
+ed in 15444-1 AMD2 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_CINEMA_LTS 0x0007 /** Long term storage cinema profile
+ defined in 15444-1 AMD2 */</td><td> </td><td class="right">#define OPJ_PROFILE_CINEMA_LTS 0x0007 /** Long term storage cinema profile
+ defined in 15444-1 AMD2 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_BC_SINGLE 0x0100 /** Single Tile Broadcast profile de
+fined in 15444-1 AMD3 */</td><td> </td><td class="right">#define OPJ_PROFILE_BC_SINGLE 0x0100 /** Single Tile Broadcast profile de
+fined in 15444-1 AMD3 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_BC_MULTI 0x0200 /** Multi Tile Broadcast profile def
+ined in 15444-1 AMD3 */</td><td> </td><td class="right">#define OPJ_PROFILE_BC_MULTI 0x0200 /** Multi Tile Broadcast profile def
+ined in 15444-1 AMD3 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_BC_MULTI_R 0x0300 /** Multi Tile Reversible Broadcast
+profile defined in 15444-1 AMD3 */</td><td> </td><td class="right">#define OPJ_PROFILE_BC_MULTI_R 0x0300 /** Multi Tile Reversible Broadcast
+profile defined in 15444-1 AMD3 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_IMF_2K 0x0400 /** 2K Single Tile Lossy IMF profile
+ defined in 15444-1 AMD 8 */</td><td> </td><td class="right">#define OPJ_PROFILE_IMF_2K 0x0400 /** 2K Single Tile Lossy IMF profile
+ defined in 15444-1 AMD 8 */</td><td class="lineno"></td></tr>
+ <tr id="diff0001"><td></td></tr>
+ <tr><td class="lineno"></td><td class="lblock">#define OPJ_PROFILE_IMF_4K <span class="delete">0x0401</span> /** 4K Single Tile Lossy IMF profile</td><td> </td><td class="rblock">#define OPJ_PROFILE_IMF_4K <span class="insert">0x0500</span> /** 4K Single Tile Lossy IMF profile</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"> defined in 15444-1 AMD 8 */</td><td> </td><td class="rblock"> defined in 15444-1 AMD 8 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock">#define OPJ_PROFILE_IMF_8K <span class="delete">0x0402</span> /** 8K Single Tile Lossy IMF profile</td><td> </td><td class="rblock">#define OPJ_PROFILE_IMF_8K <span class="insert">0x0600</span> /** 8K Single Tile Lossy IMF profile</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"> defined in 15444-1 AMD 8 */</td><td> </td><td class="rblock"> defined in 15444-1 AMD 8 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock">#define OPJ_PROFILE_IMF_2K_R <span class="delete">0x0403</span> /** 2K Single/Multi Tile Reversible </td><td> </td><td class="rblock">#define OPJ_PROFILE_IMF_2K_R <span class="insert">0x0700</span> /** 2K Single/Multi Tile Reversible </td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock">IMF profile defined in 15444-1 AMD 8 */</td><td> </td><td class="rblock">IMF profile defined in 15444-1 AMD 8 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_PROFILE_IMF_4K_R 0x0800 /** 4K Single/Multi Tile Reversible
+IMF profile defined in 15444-1 AMD 8 */</td><td> </td><td class="right">#define OPJ_PROFILE_IMF_4K_R 0x0800 /** 4K Single/Multi Tile Reversible
+IMF profile defined in 15444-1 AMD 8 */</td><td class="lineno"></td></tr>
+ <tr id="diff0002"><td></td></tr>
+ <tr><td class="lineno"></td><td class="lblock">#define OPJ_PROFILE_IMF_8K_R 0x0<span class="delete">801 /** 8K Single/Multi Tile Reversible
+ </span>IMF profile defined in 15444-1 AMD 8 */</td><td> </td><td class="rblock">#define OPJ_PROFILE_IMF_8K_R 0x0<span class="insert">900 /** 8K Single/Multi Tile Reversible
+</span>IMF profile defined in 15444-1 AMD 8 */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"> * JPEG 2000 Part-2 extensions</td><td> </td><td class="right"> * JPEG 2000 Part-2 extensions</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_EXTENSION_NONE 0x0000 /** No Part-2 extension */</td><td> </td><td class="right">#define OPJ_EXTENSION_NONE 0x0000 /** No Part-2 extension */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_EXTENSION_MCT 0x0100 /** Custom MCT support */</td><td> </td><td class="right">#define OPJ_EXTENSION_MCT 0x0100 /** Custom MCT support */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"> * JPEG 2000 profile macros</td><td> </td><td class="right"> * JPEG 2000 profile macros</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_IS_CINEMA(v) (((v) >= OPJ_PROFILE_CINEMA_2K)&&((v) <= OPJ_P
+ROFILE_CINEMA_S4K))</td><td> </td><td class="right">#define OPJ_IS_CINEMA(v) (((v) >= OPJ_PROFILE_CINEMA_2K)&&((v) <= OPJ_P
+ROFILE_CINEMA_S4K))</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_IS_STORAGE(v) ((v) == OPJ_PROFILE_CINEMA_LTS)</td><td> </td><td class="right">#define OPJ_IS_STORAGE(v) ((v) == OPJ_PROFILE_CINEMA_LTS)</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_IS_BROADCAST(v) (((v) >= OPJ_PROFILE_BC_SINGLE)&&((v) <= ((OPJ
+_PROFILE_BC_MULTI_R) | (0x000b))))</td><td> </td><td class="right">#define OPJ_IS_BROADCAST(v) (((v) >= OPJ_PROFILE_BC_SINGLE)&&((v) <= ((OPJ
+_PROFILE_BC_MULTI_R) | (0x000b))))</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_IS_IMF(v) (((v) >= OPJ_PROFILE_IMF_2K)&&((v) <= ((OPJ_PR
+OFILE_IMF_8K_R) | (0x009b))))</td><td> </td><td class="right">#define OPJ_IS_IMF(v) (((v) >= OPJ_PROFILE_IMF_2K)&&((v) <= ((OPJ_PR
+OFILE_IMF_8K_R) | (0x009b))))</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_IS_PART2(v) ((v) & OPJ_PROFILE_PART2)</td><td> </td><td class="right">#define OPJ_IS_PART2(v) ((v) & OPJ_PROFILE_PART2)</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
+ <tr id="diff0003"><td></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_GET_IMF_PROFILE(v) ((v) & 0xff00) /** Extract IMF profil</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">e without mainlevel/sublevel */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_GET_IMF_MAINLEVEL(v) ((v) & 0xf) /** Extract IMF main l</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">evel */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_GET_IMF_SUBLEVEL(v) (((v) >> 4) & 0xf) /** Extract IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_MAX 11 /** Maximum main level */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/** Max. Components Sampling Rate (MSamples/sec) per IMF main level */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_1_MSAMPLESEC 65 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 1 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_2_MSAMPLESEC 130 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 2 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_3_MSAMPLESEC 195 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 3 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_4_MSAMPLESEC 260 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 4 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_5_MSAMPLESEC 520 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 5 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_6_MSAMPLESEC 1200 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 6 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_7_MSAMPLESEC 2400 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 7 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_8_MSAMPLESEC 4800 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 8 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_9_MSAMPLESEC 9600 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 9 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_10_MSAMPLESEC 19200 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 10 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_MAINLEVEL_11_MSAMPLESEC 38400 /** MSamples/sec for IMF m</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">ain level 11 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert"></span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">/** Max. compressed Bit Rate (Mbits/s) per IMF sub level */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_1_MBITSSEC 200 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 1 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_2_MBITSSEC 400 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 2 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_3_MBITSSEC 800 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 3 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_4_MBITSSEC 1600 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 4 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_5_MBITSSEC 3200 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 5 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_6_MBITSSEC 6400 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 6 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_7_MBITSSEC 12800 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 7 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_8_MBITSSEC 25600 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 8 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">#define OPJ_IMF_SUBLEVEL_9_MBITSSEC 51200 /** Mbits/s for IMF sub le</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"><span class="insert">vel 9 */</span></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="lblock"></td><td> </td><td class="rblock"> </td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">/**</td><td> </td><td class="right">/**</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"> * JPEG 2000 codestream and component size limits in cinema profiles</td><td> </td><td class="right"> * JPEG 2000 codestream and component size limits in cinema profiles</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"> * */</td><td> </td><td class="right"> * */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_CINEMA_24_CS 1302083 /** Maximum codestream length for 2
+4fps */</td><td> </td><td class="right">#define OPJ_CINEMA_24_CS 1302083 /** Maximum codestream length for 2
+4fps */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_CINEMA_48_CS 651041 /** Maximum codestream length for 4
+8fps */</td><td> </td><td class="right">#define OPJ_CINEMA_48_CS 651041 /** Maximum codestream length for 4
+8fps */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_CINEMA_24_COMP 1041666 /** Maximum size per color componen
+t for 2K & 4K @ 24fps */</td><td> </td><td class="right">#define OPJ_CINEMA_24_COMP 1041666 /** Maximum size per color componen
+t for 2K & 4K @ 24fps */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">#define OPJ_CINEMA_48_COMP 520833 /** Maximum size per color componen
+t for 2K @ 48fps */</td><td> </td><td class="right">#define OPJ_CINEMA_48_COMP 520833 /** Maximum size per color componen
+t for 2K @ 48fps */</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">/*</td><td> </td><td class="right">/*</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left">==========================================================</td><td> </td><td class="right">==========================================================</td><td class="lineno"></td></tr>
+ <tr><td class="lineno"></td><td class="left"></td><td> </td><td class="right"></td><td class="lineno"></td></tr>
+ <tr id="part-2" class="change" ><td></td><th><small>skipping to change at</small><a href="#part-2"><em> line 334<span class="hide"> ¶</span></em></a></th><th> </th><th><small>skipping to change at</small><a href="#part-2"><em> line 364<span class="hide"> ¶</span></em></a></th><td></td></tr>
<tr><td class="lineno"></td><td class="left"> /** Resolution num start, Component num start, given by POC */</td><td> </td><td class="right"> /** Resolution num start, Component num start, given by POC */</td><td class="lineno"></td></tr>
<tr><td class="lineno"></td><td class="left"> OPJ_UINT32 resno0, compno0;</td><td> </td><td class="right"> OPJ_UINT32 resno0, compno0;</td><td class="lineno"></td></tr>
<tr><td class="lineno"></td><td class="left"> /** Layer num end,Resolution num end, Component num end, given by POC *
<tr><td class="lineno"></td><td class="left"> OPJ_PROG_ORDER prg1, prg;</td><td> </td><td class="right"> OPJ_PROG_ORDER prg1, prg;</td><td class="lineno"></td></tr>
<tr><td class="lineno"></td><td class="left"> /** Progression order string*/</td><td> </td><td class="right"> /** Progression order string*/</td><td class="lineno"></td></tr>
<tr><td class="lineno"></td><td class="left"> OPJ_CHAR progorder[5];</td><td> </td><td class="right"> OPJ_CHAR progorder[5];</td><td class="lineno"></td></tr>
- <tr id="diff0001"><td></td></tr>
+ <tr id="diff0004"><td></td></tr>
<tr><td class="lineno"></td><td class="lblock"> /** Tile number */</td><td> </td><td class="rblock"> /** Tile number <span class="insert">(starting at 1) </span>*/</td><td class="lineno"></td></tr>
<tr><td class="lineno"></td><td class="left"> OPJ_UINT32 tile;</td><td> </td><td class="right"> OPJ_UINT32 tile;</td><td class="lineno"></td></tr>
<tr><td class="lineno"></td><td class="left"> /** Start and end values for Tile width and height*/</td><td> </td><td class="right"> /** Start and end values for Tile width and height*/</td><td class="lineno"></td></tr>
<tr><td class="lineno"></td><td class="left"> /** Temporary values for Tile parts, initialised in pi_create_encode */</td><td> </td><td class="right"> /** Temporary values for Tile parts, initialised in pi_create_encode */</td><td class="lineno"></td></tr>
<tr><td></td><td class="left"></td><td> </td><td class="right"></td><td></td></tr>
- <tr id="end" bgcolor="gray"><th colspan="5" align="center"> End of changes. 1 change blocks. </th></tr>
- <tr class="stats"><td></td><th><i>1 lines changed or deleted</i></th><th><i> </i></th><th><i>1 lines changed or added</i></th><td></td></tr>
+ <tr id="end" bgcolor="gray"><th colspan="5" align="center"> End of changes. 4 change blocks. </th></tr>
+ <tr class="stats"><td></td><th><i>8 lines changed or deleted</i></th><th><i> </i></th><th><i>61 lines changed or added</i></th><td></td></tr>
<tr><td colspan="5" align="center" class="small"></td></tr>
</table>
<br/><div style='width:100%;' align='left' class='small'>This html diff was produced by rfcdiff 1.41.The latest version is available from <a href='http://tools.ietf.org/tools/rfcdiff/'>http://tools.ietf.org/tools/rfcdiff/</a></div>
#define OPJ_PROFILE_BC_MULTI 0x0200 /** Multi Tile Broadcast profile defined in 15444-1 AMD3 */
#define OPJ_PROFILE_BC_MULTI_R 0x0300 /** Multi Tile Reversible Broadcast profile defined in 15444-1 AMD3 */
#define OPJ_PROFILE_IMF_2K 0x0400 /** 2K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 */
-#define OPJ_PROFILE_IMF_4K 0x0401 /** 4K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 */
-#define OPJ_PROFILE_IMF_8K 0x0402 /** 8K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 */
-#define OPJ_PROFILE_IMF_2K_R 0x0403 /** 2K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 */
+#define OPJ_PROFILE_IMF_4K 0x0500 /** 4K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 */
+#define OPJ_PROFILE_IMF_8K 0x0600 /** 8K Single Tile Lossy IMF profile defined in 15444-1 AMD 8 */
+#define OPJ_PROFILE_IMF_2K_R 0x0700 /** 2K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 */
#define OPJ_PROFILE_IMF_4K_R 0x0800 /** 4K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 */
-#define OPJ_PROFILE_IMF_8K_R 0x0801 /** 8K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 */
+#define OPJ_PROFILE_IMF_8K_R 0x0900 /** 8K Single/Multi Tile Reversible IMF profile defined in 15444-1 AMD 8 */
/**
* JPEG 2000 Part-2 extensions
#define OPJ_IS_IMF(v) (((v) >= OPJ_PROFILE_IMF_2K)&&((v) <= ((OPJ_PROFILE_IMF_8K_R) | (0x009b))))
#define OPJ_IS_PART2(v) ((v) & OPJ_PROFILE_PART2)
+#define OPJ_GET_IMF_PROFILE(v) ((v) & 0xff00) /** Extract IMF profile without mainlevel/sublevel */
+#define OPJ_GET_IMF_MAINLEVEL(v) ((v) & 0xf) /** Extract IMF main level */
+#define OPJ_GET_IMF_SUBLEVEL(v) (((v) >> 4) & 0xf) /** Extract IMF sub level */
+
+#define OPJ_IMF_MAINLEVEL_MAX 11 /** Maximum main level */
+
+/** Max. Components Sampling Rate (MSamples/sec) per IMF main level */
+#define OPJ_IMF_MAINLEVEL_1_MSAMPLESEC 65 /** MSamples/sec for IMF main level 1 */
+#define OPJ_IMF_MAINLEVEL_2_MSAMPLESEC 130 /** MSamples/sec for IMF main level 2 */
+#define OPJ_IMF_MAINLEVEL_3_MSAMPLESEC 195 /** MSamples/sec for IMF main level 3 */
+#define OPJ_IMF_MAINLEVEL_4_MSAMPLESEC 260 /** MSamples/sec for IMF main level 4 */
+#define OPJ_IMF_MAINLEVEL_5_MSAMPLESEC 520 /** MSamples/sec for IMF main level 5 */
+#define OPJ_IMF_MAINLEVEL_6_MSAMPLESEC 1200 /** MSamples/sec for IMF main level 6 */
+#define OPJ_IMF_MAINLEVEL_7_MSAMPLESEC 2400 /** MSamples/sec for IMF main level 7 */
+#define OPJ_IMF_MAINLEVEL_8_MSAMPLESEC 4800 /** MSamples/sec for IMF main level 8 */
+#define OPJ_IMF_MAINLEVEL_9_MSAMPLESEC 9600 /** MSamples/sec for IMF main level 9 */
+#define OPJ_IMF_MAINLEVEL_10_MSAMPLESEC 19200 /** MSamples/sec for IMF main level 10 */
+#define OPJ_IMF_MAINLEVEL_11_MSAMPLESEC 38400 /** MSamples/sec for IMF main level 11 */
+
+/** Max. compressed Bit Rate (Mbits/s) per IMF sub level */
+#define OPJ_IMF_SUBLEVEL_1_MBITSSEC 200 /** Mbits/s for IMF sub level 1 */
+#define OPJ_IMF_SUBLEVEL_2_MBITSSEC 400 /** Mbits/s for IMF sub level 2 */
+#define OPJ_IMF_SUBLEVEL_3_MBITSSEC 800 /** Mbits/s for IMF sub level 3 */
+#define OPJ_IMF_SUBLEVEL_4_MBITSSEC 1600 /** Mbits/s for IMF sub level 4 */
+#define OPJ_IMF_SUBLEVEL_5_MBITSSEC 3200 /** Mbits/s for IMF sub level 5 */
+#define OPJ_IMF_SUBLEVEL_6_MBITSSEC 6400 /** Mbits/s for IMF sub level 6 */
+#define OPJ_IMF_SUBLEVEL_7_MBITSSEC 12800 /** Mbits/s for IMF sub level 7 */
+#define OPJ_IMF_SUBLEVEL_8_MBITSSEC 25600 /** Mbits/s for IMF sub level 8 */
+#define OPJ_IMF_SUBLEVEL_9_MBITSSEC 51200 /** Mbits/s for IMF sub level 9 */
+
/**
* JPEG 2000 codestream and component size limits in cinema profiles
* */
<th>Headers<br/>Diff</th>
</tr>
<tr id='current'><td>current</td>
-<td>2020-02-10<br/>11:20</td>
+<td>2020-02-13<br/>09:54</td>
<td>7</td>
<td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
<td class='ok'><a href='../../objects_report/openjpeg/2.3.1/current/report.html'>100%</a></td>
<td>N/A</td>
<td>N/A</td>
</tr>
-</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Mon Feb 10 10:30:22 2020.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Thu Feb 13 09:05:13 2020.<br/>
<br/>
<hr/>
<div align='right'><a class='home' title="Andrey Ponomarenko's ABI laboratory" href='http://abi-laboratory.pro/'>abi-laboratory.pro</a></div>
projects / openjpeg.git / commitdiff