lavc/j2kenc: Make jp2 output compatible with Kakadu.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 30 Jun 2015 12:42:31 +0000 (14:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 13:00:38 +0000 (15:00 +0200)
Fixes ticket #4689.

libavcodec/j2kenc.c
tests/ref/vsynth/vsynth1-jpeg2000
tests/ref/vsynth/vsynth1-jpeg2000-97
tests/ref/vsynth/vsynth2-jpeg2000
tests/ref/vsynth/vsynth2-jpeg2000-97
tests/ref/vsynth/vsynth3-jpeg2000
tests/ref/vsynth/vsynth3-jpeg2000-97
tests/ref/vsynth/vsynth_lena-jpeg2000
tests/ref/vsynth/vsynth_lena-jpeg2000-97

index acfa5a0..6d7b3f7 100644 (file)
@@ -982,6 +982,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         bytestream_put_buffer(&s->buf, "ftyp", 4);
         bytestream_put_buffer(&s->buf, "jp2\040\040", 4);
         bytestream_put_be32(&s->buf, 0);
+        bytestream_put_buffer(&s->buf, "jp2\040", 4);
         update_size(chunkstart, s->buf);
 
         jp2hstart = s->buf;
index 2f7ea3c..48accf5 100644 (file)
@@ -1,4 +1,4 @@
-c742e656f20e6f4dfcf39d3c00a4d78c *tests/data/fate/vsynth1-jpeg2000.avi
-2265498 tests/data/fate/vsynth1-jpeg2000.avi
+d2a06ad916711d29b30977a06335bb76 *tests/data/fate/vsynth1-jpeg2000.avi
+2265698 tests/data/fate/vsynth1-jpeg2000.avi
 15a8e49f6fd014193bbafd72f84936c7 *tests/data/fate/vsynth1-jpeg2000.out.rawvideo
 stddev:    5.36 PSNR: 33.55 MAXDIFF:   61 bytes:  7603200/  7603200
index 32c8a52..33b3299 100644 (file)
@@ -1,4 +1,4 @@
-a19cc0e1a1c1bf76ff5a0b63a0bdfbd1 *tests/data/fate/vsynth1-jpeg2000-97.avi
-3654420 tests/data/fate/vsynth1-jpeg2000-97.avi
+8bb707e596f97451fd325dec2dd610a7 *tests/data/fate/vsynth1-jpeg2000-97.avi
+3654620 tests/data/fate/vsynth1-jpeg2000-97.avi
 5073771a78e1f5366a7eb0df341662fc *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo
 stddev:    4.23 PSNR: 35.59 MAXDIFF:   53 bytes:  7603200/  7603200
index 0a9df9b..094f416 100644 (file)
@@ -1,4 +1,4 @@
-618d3b5c498a0fde4debce5235fcc334 *tests/data/fate/vsynth2-jpeg2000.avi
-1494316 tests/data/fate/vsynth2-jpeg2000.avi
+6c2f979e4a33a36f36aec86f2d464143 *tests/data/fate/vsynth2-jpeg2000.avi
+1494516 tests/data/fate/vsynth2-jpeg2000.avi
 36afd96d6e55bc83166fd615351ba366 *tests/data/fate/vsynth2-jpeg2000.out.rawvideo
 stddev:    5.00 PSNR: 34.15 MAXDIFF:   59 bytes:  7603200/  7603200
index d325271..38153ea 100644 (file)
@@ -1,4 +1,4 @@
-b86217f0bcbd84a9368ad3f98af32157 *tests/data/fate/vsynth2-jpeg2000-97.avi
-2448506 tests/data/fate/vsynth2-jpeg2000-97.avi
+2e43f004a55f4a55a19c4b79fc8e8743 *tests/data/fate/vsynth2-jpeg2000-97.avi
+2448706 tests/data/fate/vsynth2-jpeg2000-97.avi
 a6e2453118a0de135836a868b2ca0e60 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo
 stddev:    3.23 PSNR: 37.94 MAXDIFF:   29 bytes:  7603200/  7603200
index 0f4c8f4..a1e3a80 100644 (file)
@@ -1,4 +1,4 @@
-6a0f2a14f6b4628c8c51c360d7355093 *tests/data/fate/vsynth3-jpeg2000.avi
-65348 tests/data/fate/vsynth3-jpeg2000.avi
+0b8aa8113c10772cffff60f9c8ffd902 *tests/data/fate/vsynth3-jpeg2000.avi
+65548 tests/data/fate/vsynth3-jpeg2000.avi
 2d8bd94d558755c47d7e23fd9556e164 *tests/data/fate/vsynth3-jpeg2000.out.rawvideo
 stddev:    5.48 PSNR: 33.34 MAXDIFF:   47 bytes:    86700/    86700
index 2c8b5ab..191956f 100644 (file)
@@ -1,4 +1,4 @@
-5e17fdaae1a22f3eef8c82b512e4b1b9 *tests/data/fate/vsynth3-jpeg2000-97.avi
-83670 tests/data/fate/vsynth3-jpeg2000-97.avi
+b6c88a623c3296ca945346d2203f0af0 *tests/data/fate/vsynth3-jpeg2000-97.avi
+83870 tests/data/fate/vsynth3-jpeg2000-97.avi
 0cd707bfb1bbe5312b00c094f695b1fa *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo
 stddev:    4.52 PSNR: 35.02 MAXDIFF:   47 bytes:    86700/    86700
index cbb25b4..72550eb 100644 (file)
@@ -1,4 +1,4 @@
-90976c5b9539111b33a46b4c882a3cb0 *tests/data/fate/vsynth_lena-jpeg2000.avi
-1137854 tests/data/fate/vsynth_lena-jpeg2000.avi
+1f2cf6061c78905b8011091a9a7c425f *tests/data/fate/vsynth_lena-jpeg2000.avi
+1138054 tests/data/fate/vsynth_lena-jpeg2000.avi
 955653ca7a08447e7b1501b444f24562 *tests/data/fate/vsynth_lena-jpeg2000.out.rawvideo
 stddev:    4.40 PSNR: 35.25 MAXDIFF:   58 bytes:  7603200/  7603200
index 194e9bf..5c12665 100644 (file)
@@ -1,4 +1,4 @@
-ca78db12e1af7cbf44fdce165aaa5130 *tests/data/fate/vsynth_lena-jpeg2000-97.avi
-1918756 tests/data/fate/vsynth_lena-jpeg2000-97.avi
+e5a756e97910420c90e76259c56261cb *tests/data/fate/vsynth_lena-jpeg2000-97.avi
+1918956 tests/data/fate/vsynth_lena-jpeg2000-97.avi
 93a4ba0c230f2430a813df594676e58a *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo
 stddev:    2.84 PSNR: 39.04 MAXDIFF:   28 bytes:  7603200/  7603200