#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)
const unsigned prob_bits = 12;
const unsigned prob_scale = 1 << prob_bits;
const unsigned NUM_SYMS = 256;
const unsigned NUM_TABLES = 8;
+const unsigned BLOCKS_PER_STREAM = 320;
struct RansDecSymbol {
unsigned sym_start;
return nullopt; // Error: EOF.
}
+const unsigned num_blocks = ((NUM_BLOCKS + BLOCKS_PER_STREAM - 1) / BLOCKS_PER_STREAM);
+
struct CoeffStream {
uint src_offset, src_len;
};
-CoeffStream streams[45 * 64]; // HACK
+CoeffStream streams[num_blocks * 64];
int main(int argc, char **argv)
{
check_error();
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
check_error();
- glTexImage2D(GL_TEXTURE_2D, 0, GL_R16I, 1280, 720, 0, GL_RED_INTEGER, GL_SHORT, nullptr);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_R16I, WIDTH, HEIGHT, 0, GL_RED_INTEGER, GL_SHORT, nullptr);
check_error();
GLuint out_tex;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, 1280, 720, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
- //glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, 1280, 720, 0, GL_RED, GL_FLOAT, nullptr);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, WIDTH, HEIGHT, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+ //glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, WIDTH, HEIGHT, 0, GL_RED, GL_FLOAT, nullptr);
check_error();
GLint cum2sym_tex_pos = glGetUniformLocation(glsl_program_num, "cum2sym_tex");
GLint out_tex_pos = glGetUniformLocation(glsl_program_num, "out_tex");
GLint coeff_tex_pos = glGetUniformLocation(glsl_program_num, "coeff_tex");
GLint sign_bias_pos = glGetUniformLocation(glsl_program_num, "sign_bias_per_model");
+ GLint num_blocks_pos = glGetUniformLocation(glsl_program_num, "num_blocks");
printf("%d err=0x%x pos=%d,%d,%d,%d\n", __LINE__, glGetError(), cum2sym_tex_pos, dsyms_tex_pos, out_tex_pos, sign_bias_pos);
// Bind the textures.
glUniform1i(out_tex_pos, 2);
glUniform1i(coeff_tex_pos, 3);
glUniform1uiv(sign_bias_pos, 16, sign_bias);
+ glUniform1i(num_blocks_pos, num_blocks);
glBindImageTexture(0, cum2sym_tex, 0, GL_FALSE, 0, GL_READ_ONLY, GL_R8UI);
glBindImageTexture(1, dsyms_tex, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RG16UI);
glBindImageTexture(2, out_tex, 0, GL_FALSE, 0, GL_WRITE_ONLY, GL_R8);
printf("%d err=0x%x\n", __LINE__, glGetError());
// Decode all luma blocks.
- unsigned num_blocks = (HEIGHT / 16);
+ size_t last_src_offset = 0, last_src_len = 0;
for (unsigned y = 0; y < 8; ++y) {
for (unsigned x = 0; x < 8; ++x) {
unsigned coeff_num = y * 8 + x;
- for (unsigned yb = 0; yb < HEIGHT; yb += 16) {
+ for (unsigned block_idx = 0; block_idx < NUM_BLOCKS; block_idx += BLOCKS_PER_STREAM) {
optional<uint32_t> num_rans_bytes = read_varint(&ptr, end);
if (!num_rans_bytes) {
- fprintf(stderr, "Error parsing varint for block %d rANS bytes\n", yb);
+ fprintf(stderr, "Error parsing varint for block %d rANS bytes\n", block_idx);
exit(1);
}
- CoeffStream *stream = &streams[coeff_num * num_blocks + (yb/16)];
- stream->src_offset = ptr - coded.data();
- stream->src_len = *num_rans_bytes;
+ CoeffStream *stream = &streams[coeff_num * num_blocks + block_idx / BLOCKS_PER_STREAM];
+ if (*num_rans_bytes == 0) {
+ // Repeat last stream.
+ stream->src_offset = last_src_offset;
+ stream->src_len = last_src_len;
+ } else {
+ stream->src_offset = ptr - coded.data();
+ stream->src_len = *num_rans_bytes;
+ last_src_offset = stream->src_offset;
+ last_src_len = last_src_len;
+ }
// TODO: check len
ptr += *num_rans_bytes;
#define PARALLEL_SLICES 1
steady_clock::time_point start = steady_clock::now();
- for (int i = 0; i < 1000; ++i)
- glDispatchCompute(1, (45+PARALLEL_SLICES-1)/PARALLEL_SLICES, 1);
+ unsigned num_iterations = 1000;
+ for (unsigned i = 0; i < num_iterations; ++i) {
+ unsigned num_slices = (WIDTH/8)*(HEIGHT/8)/BLOCKS_PER_STREAM;
+ glDispatchCompute(1, (num_slices+PARALLEL_SLICES-1)/PARALLEL_SLICES, 1);
+ }
check_error();
glFinish();
steady_clock::time_point now = steady_clock::now();
}
printf("\n");
- unsigned char *data = new unsigned char[1280 * 720];
+ unsigned char *data = new unsigned char[WIDTH * HEIGHT];
glGetTexImage(GL_TEXTURE_2D, 0, GL_RED, GL_UNSIGNED_BYTE, data);
check_error();
printf("%d err=0x%x bufsize=%zu\n", __LINE__, glGetError(), coded.size());
for (int k = 0; k < 4; ++k) {
for (int y = 0; y < 8; ++y) {
for (int x = 0; x < 8; ++x) {
- printf("%3d ", data[y * 1280 + x + k*8]);
+ printf("%3d ", data[y * WIDTH + x + k*8]);
}
printf("\n");
}
for (int k = 0; k < 4; ++k) {
for (int y = 0; y < 8; ++y) {
for (int x = 0; x < 8; ++x) {
- //printf("%5.2f ", data[(y+8) * 1280 + x + (1272-k*8)]);
- printf("%3d ", data[y * 1280 + x + k*8]);
+ //printf("%5.2f ", data[(y+8) * WIDTH + x + (1272-k*8)]);
+ printf("%3d ", data[y * WIDTH + x + k*8]);
}
printf("\n");
}
#endif
FILE *fp = fopen("narabu.pgm", "wb");
- fprintf(fp, "P5\n1280 720\n255\n");
- for (int y = 0; y < 720; ++y) {
- for (int x = 0; x < 1280; ++x) {
- int k = lrintf(data[y * 1280 + x]);
+ fprintf(fp, "P5\n%d %d\n255\n", WIDTH, HEIGHT);
+ for (int y = 0; y < HEIGHT; ++y) {
+ for (int x = 0; x < WIDTH; ++x) {
+ int k = lrintf(data[y * WIDTH + x]);
if (k < 0) k = 0;
if (k > 255) k = 255;
putc(k, fp);
}
fclose(fp);
- int16_t *coeff_data = new int16_t[1280 * 720];
+ int16_t *coeff_data = new int16_t[WIDTH * HEIGHT];
glBindTexture(GL_TEXTURE_2D, coeff_tex);
check_error();
glGetTexImage(GL_TEXTURE_2D, 0, GL_RED_INTEGER, GL_SHORT, coeff_data);
for (int k = 0; k < 4; ++k) {
for (int y = 0; y < 8; ++y) {
for (int x = 0; x < 8; ++x) {
- printf("%3d ", coeff_data[y * 1280 + x + k*8]);
+ printf("%3d ", coeff_data[y * WIDTH + x + k*8]);
}
printf("\n");
}
glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0); // unbind
printf("foo = 0x%x\n", glGetError());
- printf("Each iteration took %.3f ms.\n", 1e3 * duration<double>(now - start).count() / 1000);
+ printf("Each iteration took %.3f ms.\n", 1e3 * duration<double>(now - start).count() / num_iterations);
}
projects / narabu / blobdiff