openjpeg/src/lib/openjp2/t2.c, branch v2.4.0 Fork of openjpeg library for JPEG2000 encoding and decoding https://git.carlh.net/cgit/openjpeg/atom?h=v2.4.0 2020-12-02T22:56:39Z Merge pull request #1300 from rouault/complement_1293 2020-12-02T22:56:39Z Even Rouault even.rouault@spatialys.com 2020-12-02T22:56:39Z urn:sha1:fb9eae5d637d06209a6cb9ca57960ac72179ee14 pi.c: avoid out of bounds access with POC (refs https://github.com/uclouvain/openjpeg/issues/1293#issuecomment-737122836) pi.c: avoid out of bounds access with POC (refs https://github.com/uclouvain/openjpeg/issues/1293#issuecomment-737122836) 2020-12-02T13:03:11Z Even Rouault even.rouault@spatialys.com 2020-12-02T13:02:17Z urn:sha1:00383e162ae2f8fc951f5745bf1011771acb8dce opj_t2_encode_packet(): avoid out of bound access of #1297, but likely not the proper fix 2020-12-02T12:13:26Z Even Rouault even.rouault@spatialys.com 2020-12-02T12:13:26Z urn:sha1:38d661a3897052c7ff0b39b30c29cb067e130121 opj_t2_encode_packet(): avoid out of bound access of #1294, but likely not the proper fix 2020-12-01T18:51:35Z Even Rouault even.rouault@spatialys.com 2020-12-01T18:51:35Z urn:sha1:fbd30b064f8f9607d500437b6fedc41431fd6cdc Add support for generation of PLT markers in encoder 2020-04-21T13:55:44Z Even Rouault even.rouault@spatialys.com 2020-04-21T13:55:44Z urn:sha1:4edb8c83374f52cd6a8f2c7c875e8ffacccb5fa5 * -PLT switch added to opj_compress * Add a opj_encoder_set_extra_options() function that accepts a PLT=YES option, and could be expanded later for other uses. ------- Testing with a Sentinel2 10m band, T36JTT_20160914T074612_B02.jp2, coming from S2A_MSIL1C_20160914T074612_N0204_R135_T36JTT_20160914T081456.SAFE Decompress it to TIFF: ``` opj_uncompress -i T36JTT_20160914T074612_B02.jp2 -o T36JTT_20160914T074612_B02.tif ``` Recompress it with similar parameters as original: ``` opj_compress -n 5 -c [256,256],[256,256],[256,256],[256,256],[256,256] -t 1024,1024 -PLT -i T36JTT_20160914T074612_B02.tif -o T36JTT_20160914T074612_B02_PLT.jp2 ``` Dump codestream detail with GDAL dump_jp2.py utility (https://github.com/OSGeo/gdal/blob/master/gdal/swig/python/samples/dump_jp2.py) ``` python dump_jp2.py T36JTT_20160914T074612_B02.jp2 > /tmp/dump_sentinel2_ori.txt python dump_jp2.py T36JTT_20160914T074612_B02_PLT.jp2 > /tmp/dump_sentinel2_openjpeg_plt.txt ``` The diff between both show very similar structure, and identical number of packets in PLT markers Now testing with Kakadu (KDU803_Demo_Apps_for_Linux-x86-64_200210) Full file decompression: ``` kdu_expand -i T36JTT_20160914T074612_B02_PLT.jp2 -o tmp.tif Consumed 121 tile-part(s) from a total of 121 tile(s). Consumed 80,318,806 codestream bytes (excluding any file format) = 5.329697 bits/pel. Processed using the multi-threaded environment, with 8 parallel threads of execution ``` Partial decompresson (presumably using PLT markers): ``` kdu_expand -i T36JTT_20160914T074612_B02.jp2 -o tmp.pgm -region "{0.5,0.5},{0.01,0.01}" kdu_expand -i T36JTT_20160914T074612_B02_PLT.jp2 -o tmp2.pgm -region "{0.5,0.5},{0.01,0.01}" diff tmp.pgm tmp2.pgm && echo "same !" ``` ------- Funded by ESA for S2-MPC project compression: emit POC marker when only one single POC is requested (fixes #1191) 2019-04-25T12:40:55Z Even Rouault even.rouault@spatialys.com 2019-04-24T22:17:13Z urn:sha1:1e3a57563defb6aa7cf24ffd2394d4a820e13bda opj_t2_encode_packet(): disable setting empty packet header bit to 1 when there is an empty packet 2018-01-08T08:38:44Z Even Rouault even.rouault@spatialys.com 2018-01-08T08:38:44Z urn:sha1:07d526e4cb93b6d2e1a52cf49e3d011d3d4caa11 This effectively reverts commit 2609fb8077125b5b31f1bcc2f98c12ff1e6572d7 since it has been reported that such packets cause decoding issues with cinema J2K hardware decoders: https://groups.google.com/forum/#!topic/openjpeg/M7M_fLX_Bco Sub-tile decoding: only decode precincts and codeblocks that intersect the window specified in opj_set_decode_area() 2017-08-17T17:05:54Z Even Rouault even.rouault@spatialys.com 2017-08-14T11:23:57Z urn:sha1:fe338a057c39797bf61939471ebaef09e44464c7 opj_t2_encode_packet(): fix potential write heap buffer overflow (#992) 2017-08-16T15:20:29Z Even Rouault even.rouault@spatialys.com 2017-08-16T15:20:29Z urn:sha1:c535531f03369623b9b833ef41952c62257b507e opj_t2_encode_packet(): only emit an error about insufficiently large output buffer in FINAL_PASS mode. Fixes (master-only) regression added in 0b4fef6d1901254e41ab74ed681daba477d724c3 2017-08-16T10:52:33Z Even Rouault even.rouault@spatialys.com 2017-08-16T10:52:33Z urn:sha1:9624b2fa4722edf77fbac631e7dacaae12c91672