Prepare for more flexible slices.

They're now always 320 blocks long, but this will probably change in
the future. Note that changing it from “two rows” to “320 blocks”
made chroma blocks a lot longer, which saved 4.9% bitrate overall.

diff --git a/coded.dat b/coded.dat
index 4ecb22c35d8ccb259ab48b7ed930cf5d14aaeb0f..50795ae9ec44cce9ca7798b511c4f45f40b8d760 100644 (file)
Binary files a/coded.dat and b/coded.dat differ

diff --git a/qdc.cpp b/qdc.cpp
index db3fe275a97c18e9a386aca0332cabcd90ef0038..556a8a5d541315a54d6bddf332cdd746a5c1769a 100644 (file)
--- a/qdc.cpp
+++ b/qdc.cpp
@@ -18,6 +18,11 @@
 
 #define WIDTH 1280
 #define HEIGHT 720
+#define WIDTH_BLOCKS (WIDTH/8)
+#define WIDTH_BLOCKS_CHROMA (WIDTH/16)
+#define HEIGHT_BLOCKS (HEIGHT/8)
+#define NUM_BLOCKS (WIDTH_BLOCKS * HEIGHT_BLOCKS)
+#define NUM_BLOCKS_CHROMA (WIDTH_BLOCKS_CHROMA * HEIGHT_BLOCKS)
 #define NUM_SYMS 256
 #define ESCAPE_LIMIT (NUM_SYMS - 1)
 
@@ -848,21 +853,20 @@ int main(int argc, char **argv)
                        // need to reverse later
                        rans_encoder.clear();
                        size_t num_bytes = 0;
-                       for (unsigned yb = 0; yb < HEIGHT; yb += 8) {
-                               for (unsigned xb = 0; xb < WIDTH; xb += 8) {
-                                       int k = coeff_y[(yb + y) * WIDTH + (xb + x)];
-                                       //printf("encoding coeff %d xb,yb=%d,%d: %d\n", y*8+x, xb, yb, k);
-                                       rans_encoder.encode_coeff(k);
-                               }
-                               if (yb % 16 == 8) {
+                       for (unsigned block_idx = 0; block_idx < NUM_BLOCKS; ++block_idx) {
+                               unsigned yb = block_idx / WIDTH_BLOCKS;
+                               unsigned xb = block_idx % WIDTH_BLOCKS;
+
+                               int k = coeff_y[(yb * 8 + y) * WIDTH + (xb * 8 + x)];
+                               //printf("encoding coeff %d xb,yb=%d,%d: %d\n", y*8+x, xb, yb, k);
+                               rans_encoder.encode_coeff(k);
+
+                               if (block_idx % 320 == 319 || block_idx == NUM_BLOCKS - 1) {
                                        int l = rans_encoder.save_block(codedfp);
                                        num_bytes += l;
                                        lens.push_back(l);
                                }
                        }
-                       if (HEIGHT % 16 != 0) {
-                               num_bytes += rans_encoder.save_block(codedfp);
-                       }
                        tot_bytes += num_bytes;
                        printf("coeff %d Y': %ld bytes\n", y * 8 + x, num_bytes);
 
@@ -889,18 +893,18 @@ int main(int argc, char **argv)
 
                        rans_encoder.clear();
                        size_t num_bytes = 0;
-                       for (unsigned yb = 0; yb < HEIGHT; yb += 8) {
-                               for (unsigned xb = 0; xb < WIDTH/2; xb += 8) {
-                                       int k = coeff_cb[(yb + y) * WIDTH/2 + (xb + x)];
-                                       rans_encoder.encode_coeff(k);
-                               }
-                               if (yb % 16 == 8) {
+                       for (unsigned block_idx = 0; block_idx < NUM_BLOCKS_CHROMA; ++block_idx) {
+                               unsigned yb = block_idx / WIDTH_BLOCKS_CHROMA;
+                               unsigned xb = block_idx % WIDTH_BLOCKS_CHROMA;
+
+                               int k = coeff_cb[(yb * 8 + y) * WIDTH/2 + (xb * 8 + x)];
+                               //printf("encoding coeff %d xb,yb=%d,%d: %d\n", y*8+x, xb, yb, k);
+                               rans_encoder.encode_coeff(k);
+
+                               if (block_idx % 320 == 319 || block_idx == NUM_BLOCKS - 1) {
                                        num_bytes += rans_encoder.save_block(codedfp);
                                }
                        }
-                       if (HEIGHT % 16 != 0) {
-                               num_bytes += rans_encoder.save_block(codedfp);
-                       }
                        tot_bytes += num_bytes;
                        printf("coeff %d Cb: %ld bytes\n", y * 8 + x, num_bytes);
                }
@@ -914,18 +918,18 @@ int main(int argc, char **argv)
 
                        rans_encoder.clear();
                        size_t num_bytes = 0;
-                       for (unsigned yb = 0; yb < HEIGHT; yb += 8) {
-                               for (unsigned xb = 0; xb < WIDTH/2; xb += 8) {
-                                       int k = coeff_cr[(yb + y) * WIDTH/2 + (xb + x)];
-                                       rans_encoder.encode_coeff(k);
-                               }
-                               if (yb % 16 == 8) {
+                       for (unsigned block_idx = 0; block_idx < NUM_BLOCKS_CHROMA; ++block_idx) {
+                               unsigned yb = block_idx / WIDTH_BLOCKS_CHROMA;
+                               unsigned xb = block_idx % WIDTH_BLOCKS_CHROMA;
+
+                               int k = coeff_cr[(yb * 8 + y) * WIDTH/2 + (xb * 8 + x)];
+                               //printf("encoding coeff %d xb,yb=%d,%d: %d\n", y*8+x, xb, yb, k);
+                               rans_encoder.encode_coeff(k);
+
+                               if (block_idx % 320 == 319 || block_idx == NUM_BLOCKS - 1) {
                                        num_bytes += rans_encoder.save_block(codedfp);
                                }
                        }
-                       if (HEIGHT % 16 != 0) {
-                               num_bytes += rans_encoder.save_block(codedfp);
-                       }
                        tot_bytes += num_bytes;
                        printf("coeff %d Cr: %ld bytes\n", y * 8 + x, num_bytes);
                }