Allow symlinked frame files. Useful for testing.

[nageru] / vaapi_jpeg_decoder.cpp

diff --git a/vaapi_jpeg_decoder.cpp b/vaapi_jpeg_decoder.cpp
index ae1febc041d355cf53deba1b0f1bc601c83799c4..12db78b194a52075ca8fc578d5af6589698e2df7 100644 (file)
--- a/vaapi_jpeg_decoder.cpp
+++ b/vaapi_jpeg_decoder.cpp
@@ -49,6 +49,18 @@ static mutex va_resources_mutex;
         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)
 {
        {
@@ -299,7 +311,22 @@ void init_jpeg_vaapi()
        vaapi_jpeg_decoding_usable = true;
 }
 
-shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
+class VABufferDestroyer {
+public:
+       VABufferDestroyer(VADisplay dpy, VABufferID buf)
+               : dpy(dpy), buf(buf) {}
+
+       ~VABufferDestroyer() {
+               VAStatus va_status = vaDestroyBuffer(dpy, buf);
+               CHECK_VASTATUS(va_status, "vaDestroyBuffer");
+       }
+
+private:
+       VADisplay dpy;
+       VABufferID buf;
+};
+
+shared_ptr<Frame> decode_jpeg_vaapi(const string &jpeg)
 {
        jpeg_decompress_struct dinfo;
        jpeg_error_mgr jerr;
@@ -307,24 +334,9 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
        jpeg_create_decompress(&dinfo);
        JPEGDestroyer destroy_dinfo(&dinfo);
 
-       FILE *fp = fopen(filename.c_str(), "rb");
-       if (fp == nullptr) {
-               perror(filename.c_str());
-               exit(1);
-       }
-       jpeg_stdio_src(&dinfo, fp);
-
+       jpeg_mem_src(&dinfo, reinterpret_cast<const unsigned char *>(jpeg.data()), jpeg.size());
        jpeg_read_header(&dinfo, true);
 
-       // Read the data that comes after the header. VA-API will destuff and all for us.
-       std::string str((const char *)dinfo.src->next_input_byte, dinfo.src->bytes_in_buffer);
-       while (!feof(fp)) {
-               char buf[4096];
-               size_t ret = fread(buf, 1, sizeof(buf), fp);
-               str.append(buf, ret);
-       }
-       fclose(fp);
-
        if (dinfo.num_components != 3) {
                fprintf(stderr, "Not a color JPEG. (%d components, Y=%dx%d, Cb=%dx%d, Cr=%dx%d)\n",
                        dinfo.num_components,
@@ -364,6 +376,7 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
        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);
 
        // Quantization matrices.
        VAIQMatrixBufferJPEGBaseline iq;
@@ -380,7 +393,7 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
                                        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]];
                        }
                }
        }
@@ -388,6 +401,7 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
        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);
 
        // Huffman tables (arithmetic is not supported).
        VAHuffmanTableBufferJPEGBaseline huff;
@@ -421,11 +435,12 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
        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);
 
        // Slice parameters (metadata about the slice).
        VASliceParameterBufferJPEGBaseline parms;
        memset(&parms, 0, sizeof(parms));
-       parms.slice_data_size = str.size();
+       parms.slice_data_size = dinfo.src->bytes_in_buffer;
        parms.slice_data_offset = 0;
        parms.slice_data_flag = VA_SLICE_DATA_FLAG_ALL;
        parms.slice_horizontal_position = 0;
@@ -450,11 +465,13 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
        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);
 
-       // The actual data.
+       // The actual data. VA-API will destuff and all for us.
        VABufferID data_buffer;
-       va_status = vaCreateBuffer(va_dpy->va_dpy, config_id, VASliceDataBufferType, str.size(), 1, &str[0], &data_buffer);
+       va_status = vaCreateBuffer(va_dpy->va_dpy, config_id, VASliceDataBufferType, dinfo.src->bytes_in_buffer, 1, const_cast<unsigned char *>(dinfo.src->next_input_byte), &data_buffer);
        CHECK_VASTATUS_RET(va_status, "vaCreateBuffer");
+       VABufferDestroyer destroy_data(va_dpy->va_dpy, data_buffer);
 
        VAResources resources = get_va_resources(dinfo.image_width, dinfo.image_height);
        ReleaseVAResources release(resources);