return nullptr; \
}
+// From libjpeg (although it's of course identical between implementations).
+static const int jpeg_natural_order[DCTSIZE2] = {
+ 0, 1, 8, 16, 9, 2, 3, 10,
+ 17, 24, 32, 25, 18, 11, 4, 5,
+ 12, 19, 26, 33, 40, 48, 41, 34,
+ 27, 20, 13, 6, 7, 14, 21, 28,
+ 35, 42, 49, 56, 57, 50, 43, 36,
+ 29, 22, 15, 23, 30, 37, 44, 51,
+ 58, 59, 52, 45, 38, 31, 39, 46,
+ 53, 60, 61, 54, 47, 55, 62, 63,
+};
+
VAResources get_va_resources(unsigned width, unsigned height)
{
{
class VABufferDestroyer {
public:
- VABufferDestroyer(VADisplay *dpy, VABufferID buf)
+ VABufferDestroyer(VADisplay dpy, VABufferID buf)
: dpy(dpy), buf(buf) {}
~VABufferDestroyer() {
- vaDestroyBuffer(dpy, buf);
+ VAStatus va_status = vaDestroyBuffer(dpy, buf);
+ CHECK_VASTATUS(va_status, "vaDestroyBuffer");
}
private:
- VADisplay *dpy;
+ VADisplay dpy;
VABufferID buf;
};
VABufferID pic_param_buffer;
VAStatus va_status = vaCreateBuffer(va_dpy->va_dpy, config_id, VAPictureParameterBufferType, sizeof(pic_param), 1, &pic_param, &pic_param_buffer);
CHECK_VASTATUS_RET(va_status, "vaCreateBuffer");
- VABufferDestroyer destroy_pic_param(&va_dpy->va_dpy, pic_param_buffer);
+ VABufferDestroyer destroy_pic_param(va_dpy->va_dpy, pic_param_buffer);
// Quantization matrices.
VAIQMatrixBufferJPEGBaseline iq;
fprintf(stderr, "Baseline JPEG only!\n");
return nullptr;
}
- iq.quantiser_table[quant_tbl_idx][i] = qtbl->quantval[i];
+ iq.quantiser_table[quant_tbl_idx][i] = qtbl->quantval[jpeg_natural_order[i]];
}
}
}
VABufferID iq_buffer;
va_status = vaCreateBuffer(va_dpy->va_dpy, config_id, VAIQMatrixBufferType, sizeof(iq), 1, &iq, &iq_buffer);
CHECK_VASTATUS_RET(va_status, "vaCreateBuffer");
- VABufferDestroyer destroy_iq(&va_dpy->va_dpy, iq_buffer);
+ VABufferDestroyer destroy_iq(va_dpy->va_dpy, iq_buffer);
// Huffman tables (arithmetic is not supported).
VAHuffmanTableBufferJPEGBaseline huff;
VABufferID huff_buffer;
va_status = vaCreateBuffer(va_dpy->va_dpy, config_id, VAHuffmanTableBufferType, sizeof(huff), 1, &huff, &huff_buffer);
CHECK_VASTATUS_RET(va_status, "vaCreateBuffer");
- VABufferDestroyer destroy_huff(&va_dpy->va_dpy, huff_buffer);
+ VABufferDestroyer destroy_huff(va_dpy->va_dpy, huff_buffer);
// Slice parameters (metadata about the slice).
VASliceParameterBufferJPEGBaseline parms;
VABufferID slice_param_buffer;
va_status = vaCreateBuffer(va_dpy->va_dpy, config_id, VASliceParameterBufferType, sizeof(parms), 1, &parms, &slice_param_buffer);
CHECK_VASTATUS_RET(va_status, "vaCreateBuffer");
- VABufferDestroyer destroy_slice_param(&va_dpy->va_dpy, slice_param_buffer);
+ VABufferDestroyer destroy_slice_param(va_dpy->va_dpy, slice_param_buffer);
// The actual data.
VABufferID data_buffer;
va_status = vaCreateBuffer(va_dpy->va_dpy, config_id, VASliceDataBufferType, str.size(), 1, &str[0], &data_buffer);
CHECK_VASTATUS_RET(va_status, "vaCreateBuffer");
- VABufferDestroyer destroy_data(&va_dpy->va_dpy, data_buffer);
+ VABufferDestroyer destroy_data(va_dpy->va_dpy, data_buffer);
VAResources resources = get_va_resources(dinfo.image_width, dinfo.image_height);
ReleaseVAResources release(resources);