@@ -991,3 +991,109 @@ JXL_TRANSCODE_JPEG_TEST(RoundtripTest, TestJPEGReconstruction) {
991
991
ASSERT_EQ (used, orig.size ());
992
992
EXPECT_EQ (0 , memcmp (reconstructed_buffer.data (), orig.data (), used));
993
993
}
994
+
995
+ JXL_TRANSCODE_JPEG_TEST (RoundtripTest,
996
+ TestJPEGReconstructionWithIncompleteHuffmanCode) {
997
+ TEST_LIBJPEG_SUPPORT ();
998
+ static constexpr uint8_t kJPEGBytes [] = {
999
+ // SOI
1000
+ 0xff , 0xd8 , //
1001
+ // SOF
1002
+ 0xff , 0xc0 , 0x00 , 0x0b , 0x08 , 0x00 , 0x01 , 0x00 , 0x01 , 0x01 , //
1003
+ 0x01 , 0x11 , 0x00 , //
1004
+ // DQT
1005
+ 0xff , 0xdb , 0x00 , 0x43 , 0x00 , 0x03 , 0x02 , 0x02 , 0x03 , 0x02 , //
1006
+ 0x02 , 0x03 , 0x03 , 0x03 , 0x03 , 0x04 , 0x03 , 0x03 , 0x04 , 0x05 , //
1007
+ 0x08 , 0x05 , 0x05 , 0x04 , 0x04 , 0x05 , 0x0a , 0x07 , 0x07 , 0x06 , //
1008
+ 0x08 , 0x0c , 0x0a , 0x0c , 0x0c , 0x0b , 0x0a , 0x0b , 0x0b , 0x0d , //
1009
+ 0x0e , 0x12 , 0x10 , 0x0d , 0x0e , 0x11 , 0x0e , 0x0b , 0x0b , 0x10 , //
1010
+ 0x16 , 0x10 , 0x11 , 0x13 , 0x14 , 0x15 , 0x15 , 0x15 , 0x0c , 0x0f , //
1011
+ 0x17 , 0x18 , 0x16 , 0x14 , 0x18 , 0x12 , 0x14 , 0x15 , 0x14 , //
1012
+ // DHT
1013
+ 0xff , 0xc4 , 0x01 , 0x30 , // marker, len
1014
+ 0x00 , // slot id DC0
1015
+ // counts for lengths 1 - 16 (total_count: 12)
1016
+ 0x00 , 0x01 , 0x05 , 0x01 , 0x01 , 0x01 , 0x01 , 0x01 , 0x01 , 0x00 , //
1017
+ 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 ,
1018
+ // symbols: 0 - 11
1019
+ 0x00 , 0x01 , 0x02 , 0x03 , 0x04 , 0x05 , 0x06 , 0x07 , 0x08 , 0x09 , //
1020
+ 0x0a , 0x0b , //
1021
+ 0x13 , // slot id AC3
1022
+ // counts for lengths 1 - 16 (total_count: 256)
1023
+ 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x00 , 0x01 , 0x01 , //
1024
+ 0x01 , 0x01 , 0x01 , 0x01 , 0x01 , 0xf9 , //
1025
+ // symbols: 0 - 255
1026
+ 0x00 , 0x01 , 0x02 , 0x03 , 0x04 , 0x05 , 0x06 , 0x07 , 0x08 , 0x09 , //
1027
+ 0x0a , 0x0b , 0x0c , 0x0d , 0x0e , 0x0f , 0x10 , 0x11 , 0x12 , 0x13 , //
1028
+ 0x14 , 0x15 , 0x16 , 0x17 , 0x18 , 0x19 , 0x1a , 0x1b , 0x1c , 0x1d , //
1029
+ 0x1e , 0x1f , 0x20 , 0x21 , 0x22 , 0x23 , 0x24 , 0x25 , 0x26 , 0x27 , //
1030
+ 0x28 , 0x29 , 0x2a , 0x2b , 0x2c , 0x2d , 0x2e , 0x2f , 0x30 , 0x31 , //
1031
+ 0x32 , 0x33 , 0x34 , 0x35 , 0x36 , 0x37 , 0x38 , 0x39 , 0x3a , 0x3b , //
1032
+ 0x3c , 0x3d , 0x3e , 0x3f , 0x40 , 0x41 , 0x42 , 0x43 , 0x44 , 0x45 , //
1033
+ 0x46 , 0x47 , 0x48 , 0x49 , 0x4a , 0x4b , 0x4c , 0x4d , 0x4e , 0x4f , //
1034
+ 0x50 , 0x51 , 0x52 , 0x53 , 0x54 , 0x55 , 0x56 , 0x57 , 0x58 , 0x59 , //
1035
+ 0x5a , 0x5b , 0x5c , 0x5d , 0x5e , 0x5f , 0x60 , 0x61 , 0x62 , 0x63 , //
1036
+ 0x64 , 0x65 , 0x66 , 0x67 , 0x68 , 0x69 , 0x6a , 0x6b , 0x6c , 0x6d , //
1037
+ 0x6e , 0x6f , 0x70 , 0x71 , 0x72 , 0x73 , 0x74 , 0x75 , 0x76 , 0x77 , //
1038
+ 0x78 , 0x79 , 0x7a , 0x7b , 0x7c , 0x7d , 0x7e , 0x7f , 0x80 , 0x81 , //
1039
+ 0x82 , 0x83 , 0x84 , 0x85 , 0x86 , 0x87 , 0x88 , 0x89 , 0x8a , 0x8b , //
1040
+ 0x8c , 0x8d , 0x8e , 0x8f , 0x90 , 0x91 , 0x92 , 0x93 , 0x94 , 0x95 , //
1041
+ 0x96 , 0x97 , 0x98 , 0x99 , 0x9a , 0x9b , 0x9c , 0x9d , 0x9e , 0x9f , //
1042
+ 0xa0 , 0xa1 , 0xa2 , 0xa3 , 0xa4 , 0xa5 , 0xa6 , 0xa7 , 0xa8 , 0xa9 , //
1043
+ 0xaa , 0xab , 0xac , 0xad , 0xae , 0xaf , 0xb0 , 0xb1 , 0xb2 , 0xb3 , //
1044
+ 0xb4 , 0xb5 , 0xb6 , 0xb7 , 0xb8 , 0xb9 , 0xba , 0xbb , 0xbc , 0xbd , //
1045
+ 0xbe , 0xbf , 0xc0 , 0xc1 , 0xc2 , 0xc3 , 0xc4 , 0xc5 , 0xc6 , 0xc7 , //
1046
+ 0xc8 , 0xc9 , 0xca , 0xcb , 0xcc , 0xcd , 0xce , 0xcf , 0xd0 , 0xd1 , //
1047
+ 0xd2 , 0xd3 , 0xd4 , 0xd5 , 0xd6 , 0xd7 , 0xd8 , 0xd9 , 0xda , 0xdb , //
1048
+ 0xdc , 0xdd , 0xde , 0xdf , 0xe0 , 0xe1 , 0xe2 , 0xe3 , 0xe4 , 0xe5 , //
1049
+ 0xe6 , 0xe7 , 0xe8 , 0xe9 , 0xea , 0xeb , 0xec , 0xed , 0xee , 0xef , //
1050
+ 0xf0 , 0xf1 , 0xf2 , 0xf3 , 0xf4 , 0xf5 , 0xf6 , 0xf7 , 0xf8 , 0xf9 , //
1051
+ 0xfa , 0xfb , 0xfc , 0xfd , 0xfe , 0xff ,
1052
+ // SOS
1053
+ 0xff , 0xda , 0x00 , 0x08 , 0x01 , 0x01 , 0x03 , 0x00 , 0x3f , 0x00 , //
1054
+ // entropy coded data (first 16 bit: DC 0, next 9 bits: AC eob)
1055
+ 0xfc , 0xaa , 0x00 , 0x00 , //
1056
+ // EOI
1057
+ 0xff , 0xd9 , //
1058
+ };
1059
+ static constexpr size_t kJPEGSize = sizeof (kJPEGBytes );
1060
+
1061
+ JxlEncoderPtr enc = JxlEncoderMake (nullptr );
1062
+ JxlEncoderFrameSettings* frame_settings =
1063
+ JxlEncoderFrameSettingsCreate (enc.get (), nullptr );
1064
+
1065
+ EXPECT_EQ (JXL_ENC_SUCCESS, JxlEncoderUseContainer (enc.get (), JXL_TRUE));
1066
+ EXPECT_EQ (JXL_ENC_SUCCESS, JxlEncoderStoreJPEGMetadata (enc.get (), JXL_TRUE));
1067
+ EXPECT_EQ (JXL_ENC_SUCCESS,
1068
+ JxlEncoderAddJPEGFrame (frame_settings, kJPEGBytes , kJPEGSize ));
1069
+ JxlEncoderCloseInput (enc.get ());
1070
+
1071
+ std::vector<uint8_t > compressed;
1072
+ EncodeWithEncoder (enc.get (), &compressed);
1073
+
1074
+ JxlDecoderPtr dec = JxlDecoderMake (nullptr );
1075
+ EXPECT_EQ (JXL_DEC_SUCCESS,
1076
+ JxlDecoderSubscribeEvents (
1077
+ dec.get (), JXL_DEC_JPEG_RECONSTRUCTION | JXL_DEC_FULL_IMAGE));
1078
+ JxlDecoderSetInput (dec.get (), compressed.data (), compressed.size ());
1079
+ EXPECT_EQ (JXL_DEC_JPEG_RECONSTRUCTION, JxlDecoderProcessInput (dec.get ()));
1080
+ std::vector<uint8_t > reconstructed_buffer (128 );
1081
+ EXPECT_EQ (JXL_DEC_SUCCESS,
1082
+ JxlDecoderSetJPEGBuffer (dec.get (), reconstructed_buffer.data (),
1083
+ reconstructed_buffer.size ()));
1084
+ size_t used = 0 ;
1085
+ JxlDecoderStatus dec_process_result = JXL_DEC_JPEG_NEED_MORE_OUTPUT;
1086
+ while (dec_process_result == JXL_DEC_JPEG_NEED_MORE_OUTPUT) {
1087
+ used = reconstructed_buffer.size () - JxlDecoderReleaseJPEGBuffer (dec.get ());
1088
+ reconstructed_buffer.resize (reconstructed_buffer.size () * 2 );
1089
+ EXPECT_EQ (
1090
+ JXL_DEC_SUCCESS,
1091
+ JxlDecoderSetJPEGBuffer (dec.get (), reconstructed_buffer.data () + used,
1092
+ reconstructed_buffer.size () - used));
1093
+ dec_process_result = JxlDecoderProcessInput (dec.get ());
1094
+ }
1095
+ ASSERT_EQ (JXL_DEC_FULL_IMAGE, dec_process_result);
1096
+ used = reconstructed_buffer.size () - JxlDecoderReleaseJPEGBuffer (dec.get ());
1097
+ ASSERT_EQ (used, kJPEGSize );
1098
+ EXPECT_EQ (0 , memcmp (reconstructed_buffer.data (), kJPEGBytes , used));
1099
+ }
0 commit comments