X-Git-Url: https://git.sesse.net/?p=fjl;a=blobdiff_plain;f=driver.c;h=aa803d6ed00aa67266495b65df93e6582bc89151;hp=bbc569e5d143e1b41c35b460f53f1b1c25721863;hb=9069ae93f3e9e9b44f5f28968f508d09f0711737;hpb=4f5e260fc1163b9383c565035e73f30bedbeec92 diff --git a/driver.c b/driver.c index bbc569e..aa803d6 100644 --- a/driver.c +++ b/driver.c @@ -1,9 +1,11 @@ #include +#include #include #include "bytesource.h" #include "choice.h" #include "dehuff.h" +#include "idct.h" #include "input.h" #include "zigzag.h" @@ -12,7 +14,11 @@ struct jpeg_image { unsigned width, height; unsigned num_components; unsigned hsample[256], vsample[256], qtable[256]; + unsigned max_hsample, max_vsample; + unsigned num_blocks_horizontal, num_blocks_vertical; uint32_t qvalues[256][DCTSIZE2]; + void* idct_data[256]; + uint8_t* pixel_data[256]; }; ssize_t stdio_read(void* userdata, uint8_t* buf, size_t count) @@ -28,6 +34,10 @@ void read_dqt(struct byte_source* source, struct jpeg_image* image) int precision = precision_table >> 4; // 0 = 8 bits, otherwise 16 bits. int table = precision_table & 0x0f; + if (image->idct_data[table] != NULL) { + idct_choice_free(image->idct_data[table]); + } + if (precision != 0) { assert(len == 131); fprintf(stderr, "Quantization table %u: 16 bits/entry\n", table); @@ -45,6 +55,8 @@ void read_dqt(struct byte_source* source, struct jpeg_image* image) read_uint8(byte_source_input_func, source); } } + + image->idct_data[table] = idct_choice_alloc(image->qvalues[table]); } void read_sof(struct byte_source* source, struct jpeg_image* image) @@ -53,8 +65,8 @@ void read_sof(struct byte_source* source, struct jpeg_image* image) assert(len >= 8); image->precision = read_uint8(byte_source_input_func, source); assert(image->precision == 8); - image->width = read_uint16(byte_source_input_func, source); image->height = read_uint16(byte_source_input_func, source); + image->width = read_uint16(byte_source_input_func, source); image->num_components = read_uint8(byte_source_input_func, source); len -= 8; @@ -70,9 +82,32 @@ void read_sof(struct byte_source* source, struct jpeg_image* image) image->qtable[c] = read_uint8(byte_source_input_func, source); len -= 3; + if (image->hsample[c] > image->max_hsample) { + image->max_hsample = image->hsample[c]; + } + if (image->vsample[c] > image->max_vsample) { + image->max_vsample = image->vsample[c]; + } + fprintf(stderr, "Component %u: sampling factors %u x %x, quantization table %u\n", c, image->hsample[c], image->vsample[c], image->qtable[c]); } + + image->num_blocks_horizontal = (image->width + image->max_hsample * DCTSIZE - 1) / (image->max_hsample * DCTSIZE); + image->num_blocks_vertical = (image->height + image->max_vsample * DCTSIZE - 1) / (image->max_vsample * DCTSIZE); + + for (unsigned c = 0; c < 256; ++c) { + if (image->hsample[c] == 0) { + continue; + } + + unsigned width = image->num_blocks_horizontal * image->hsample[c] * DCTSIZE; + unsigned height = image->num_blocks_vertical * image->vsample[c] * DCTSIZE; + image->pixel_data[c] = (uint8_t*)malloc(width * height); + assert(image->pixel_data[c] != NULL); + + fprintf(stderr, "Component %u: allocating %d x %d\n", c, width, height); + } } void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tables_t* tables) @@ -112,52 +147,75 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab } struct bit_source bits; - init_bit_source(&bits, byte_source_input_func, source); + init_bit_source(&bits, byte_source_input_func, 8, source); + + unsigned mcu_x = 0, mcu_y = 0; for ( ;; ) { for (unsigned c = 0; c < num_components; ++c) { unsigned cn = component_num[c]; - unsigned nc = image->vsample[cn] * image->hsample[cn]; - for (unsigned n = 0; n < nc; ++n) { - const struct huffman_table* dc_table = &((*tables)[DC_CLASS][dc_huffman_table[c]]); - const struct huffman_table* ac_table = &((*tables)[AC_CLASS][ac_huffman_table[c]]); - - // decode DC component - unsigned dc_category = read_huffman_symbol(dc_table, &bits); - possibly_refill(&bits, dc_category); - last_dc[c] += extend(read_bits(&bits, dc_category), dc_category); - - // printf("dc=%d ac=", last_dc[c]); - putchar(last_dc[c]); - - // decode AC components - int zz[63] = { 0 }; - for (unsigned i = 0; i < 63; ++i) { - unsigned rs = read_huffman_symbol(ac_table, &bits); - unsigned r = rs >> 4; - unsigned s = rs & 0xf; - - if (rs == 0x00) { - /* end of block */ - break; - } - if (rs == 0xf0) { - /* 16 zero coefficients */ - i += 15; - continue; - } + unsigned stride = image->num_blocks_horizontal * image->hsample[cn] * DCTSIZE; + assert(image->idct_data[image->qtable[cn]] != NULL); + + for (unsigned local_yb = 0; local_yb < image->vsample[cn]; ++local_yb) { + for (unsigned local_xb = 0; local_xb < image->hsample[cn]; ++local_xb) { + const struct huffman_table* dc_table = &((*tables)[DC_CLASS][dc_huffman_table[c]]); + const struct huffman_table* ac_table = &((*tables)[AC_CLASS][ac_huffman_table[c]]); - possibly_refill(&bits, s); + // decode DC component + unsigned dc_category = read_huffman_symbol(dc_table, &bits); + possibly_refill(&bits, dc_category); + last_dc[c] += extend(read_bits(&bits, dc_category), dc_category); + + int16_t coeff[DCTSIZE2] = { 0 }; + coeff[0] = last_dc[c]; - i += r; - zz[unzigzag[i]] = extend(read_bits(&bits, s), s); - } - - for (unsigned i = 0; i < 63; ++i) { - putchar(zz[i]); - //printf("%d ", zz[i]); + // decode AC components + for (unsigned i = 1; i < DCTSIZE2; ++i) { + unsigned rs = read_huffman_symbol(ac_table, &bits); + unsigned r = rs >> 4; + unsigned s = rs & 0xf; + + if (rs == 0x00) { + /* end of block */ + break; + } + if (rs == 0xf0) { + /* 16 zero coefficients */ + i += 15; + continue; + } + i += r; + + possibly_refill(&bits, s); + coeff[unzigzag[i]] = extend(read_bits(&bits, s), s); + } + + uint8_t pixdata[DCTSIZE2]; + idct_choice(coeff, image->idct_data[image->qtable[cn]], pixdata); + + for (unsigned y = 0; y < DCTSIZE; ++y) { + unsigned real_x = (mcu_x * image->hsample[cn] + local_xb) * DCTSIZE; + unsigned real_y = (mcu_y * image->vsample[cn] + local_yb) * DCTSIZE + y; + + memcpy(image->pixel_data[cn] + real_y * stride + real_x, + pixdata + y * DCTSIZE, + DCTSIZE); + } } - //printf("\n"); + } + } + + if (++mcu_x == image->num_blocks_horizontal) { + ++mcu_y; + mcu_x = 0; + + // Some debug code. + const int c = 1; + if (mcu_y == image->num_blocks_vertical) { + unsigned stride = image->num_blocks_horizontal * image->hsample[c] * DCTSIZE; + printf("P5\n%u %u\n255\n", stride, image->height); + fwrite(image->pixel_data[c], stride * image->height, 1, stdout); } } } @@ -184,6 +242,7 @@ void skip_segment(struct byte_source* source) int main(void) { struct jpeg_image jpeg; + memset(&jpeg, 0, sizeof(jpeg)); init_choices(); struct byte_source source;