Update ABI/API compatibility reports after commit 4e5501b3c7
This commit is contained in:
OpenJPEG Travis CI
parent
9febc013c3
commit
73caa11aea
File diff suppressed because it is too large
Load Diff
|
|
@ -20,7 +20,30 @@
|
|||
<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
|
||||
|
|
@ -872,35 +895,6 @@ Date: 2018-03-04 23:16:04 +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>
|
||||
|
|
|
|||
|
|
@ -705,7 +705,7 @@ $VAR1 = {
|
|||
'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' => {
|
||||
|
|
@ -813,7 +813,7 @@ $VAR1 = {
|
|||
'Maintainer' => 'OpenJPEG team',
|
||||
'MaintainerUrl' => 'http://www.openjpeg.org/',
|
||||
'PackageDiff' => {},
|
||||
'ScmUpdateTime' => '1581330585',
|
||||
'ScmUpdateTime' => '1581584678',
|
||||
'Soname' => {
|
||||
'1.1' => {
|
||||
'lib/libopenjpeg.so' => 'libopenjpeg.so'
|
||||
|
|
|
|||
|
|
@ -22,7 +22,147 @@
|
|||
<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 *
|
||||
|
|
@ -35,7 +175,7 @@
|
|||
<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>
|
||||
|
|
@ -51,8 +191,8 @@ itialise_encode*/</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>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -204,11 +204,11 @@ typedef size_t OPJ_SIZE_T;
|
|||
#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
|
||||
|
|
@ -225,6 +225,36 @@ typedef size_t OPJ_SIZE_T;
|
|||
#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
|
||||
* */
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -30,7 +30,7 @@
|
|||
<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>
|
||||
|
|
@ -179,7 +179,7 @@
|
|||
<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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue