X-Git-Url: https://git.sesse.net/?p=fjl;a=blobdiff_plain;f=driver.c;h=616b613f944ee5ae3ba12a69476eb37d9b20a336;hp=1411b51311e7efca363b88b038a1c9a634173455;hb=a4009687c73083dd0290285a065740a83e27e855;hpb=f96984c3f6474f2d85750351fd249b01245b5ec3 diff --git a/driver.c b/driver.c index 1411b51..616b613 100644 --- a/driver.c +++ b/driver.c @@ -14,8 +14,13 @@ struct jpeg_image { unsigned width, height; unsigned num_components; unsigned hsample[256], vsample[256], qtable[256]; + unsigned max_hsample, max_vsample; + unsigned stride[256]; + unsigned num_blocks_horizontal, num_blocks_vertical; uint32_t qvalues[256][DCTSIZE2]; void* idct_data[256]; + uint8_t* pixel_data[256]; + uint8_t* pixel_write_pointer[256]; }; ssize_t stdio_read(void* userdata, uint8_t* buf, size_t count) @@ -62,8 +67,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; @@ -79,9 +84,34 @@ 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->stride[c] = width; + image->pixel_data[c] = (uint8_t*)malloc(width * height); + assert(image->pixel_data[c] != NULL); + image->pixel_write_pointer[c] = image->pixel_data[c]; + + 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) @@ -121,28 +151,25 @@ 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); - // Some debugging code. - assert(image->width % 8 == 0); - int y_stride = image->width; - uint8_t* y_row_data = (uint8_t*)malloc(y_stride * DCTSIZE * image->vsample[1]); - assert(y_row_data != NULL); - int xb = 0; + unsigned mcu_x = 0, mcu_y = 0; - for ( ;; ) { + while (!bits.source_eof) { for (unsigned c = 0; c < num_components; ++c) { unsigned cn = component_num[c]; 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) { + + uint8_t* pixel_write_pointer_y = image->pixel_write_pointer[cn]; + for (unsigned local_yb = 0; local_yb < image->vsample[cn]; ++local_yb, pixel_write_pointer_y += image->stride[cn] * DCTSIZE) { + uint8_t* pixel_write_pointer = pixel_write_pointer_y; + for (unsigned local_xb = 0; local_xb < image->hsample[cn]; ++local_xb, pixel_write_pointer += DCTSIZE) { 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); + possibly_refill(&bits, dc_category + DEHUF_TABLE_BITS); last_dc[c] += extend(read_bits(&bits, dc_category), dc_category); int16_t coeff[DCTSIZE2] = { 0 }; @@ -150,7 +177,7 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab // decode AC components for (unsigned i = 1; i < DCTSIZE2; ++i) { - unsigned rs = read_huffman_symbol(ac_table, &bits); + unsigned rs = read_huffman_symbol_no_refill(ac_table, &bits); unsigned r = rs >> 4; unsigned s = rs & 0xf; @@ -160,34 +187,44 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab } if (rs == 0xf0) { /* 16 zero coefficients */ + possibly_refill(&bits, DEHUF_TABLE_BITS); i += 15; continue; } - - possibly_refill(&bits, s); - i += r; + + possibly_refill(&bits, s + DEHUF_TABLE_BITS); coeff[unzigzag[i]] = extend(read_bits(&bits, s), s); } uint8_t pixdata[DCTSIZE2]; idct_choice(coeff, image->idct_data[image->qtable[cn]], pixdata); - if (cn != 1) { - continue; - } - - for (int y = 0; y < DCTSIZE; ++y) { - memcpy(y_row_data + (local_yb * DCTSIZE + y) * y_stride + (xb + local_xb) * DCTSIZE, - pixdata + y * DCTSIZE, - DCTSIZE); + uint8_t* dest_pixdata = pixel_write_pointer; + for (unsigned y = 0; y < DCTSIZE; ++y, dest_pixdata += image->stride[cn]) { + memcpy(dest_pixdata, pixdata + y * DCTSIZE, DCTSIZE); } } } + image->pixel_write_pointer[cn] += DCTSIZE * image->hsample[cn]; + } + + if (++mcu_x == image->num_blocks_horizontal) { + ++mcu_y; + mcu_x = 0; + + for (unsigned c = 0; c < num_components; ++c) { + unsigned cn = component_num[c]; + image->pixel_write_pointer[cn] += (image->vsample[cn] * DCTSIZE - 1) * image->stride[cn]; + } - if (cn == 1 && ++xb * DCTSIZE == y_stride) { - fwrite(y_row_data, y_stride * DCTSIZE * image->vsample[1], 1, stdout); - xb = 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; + unsigned height = image->num_blocks_vertical * image->vsample[c] * DCTSIZE; + printf("P5\n%u %u\n255\n", stride, height); + fwrite(image->pixel_data[c], stride * height, 1, stdout); } } } @@ -265,6 +302,9 @@ int main(void) case 0xd8: /* SOI */ break; + case 0xd9: + /* EOI */ + exit(0); case 0xc4: /* DHT (define Huffman tables) */ read_huffman_tables(&tables, byte_source_input_func, &source);