Do not try to show a frame until we've computed it (do it in a callback instead).

[nageru] / vaapi_jpeg_decoder.cpp

diff --git a/vaapi_jpeg_decoder.cpp b/vaapi_jpeg_decoder.cpp
index 70b5f374efc51cca1776cd4fbe51205fdb211454..0682103126281fcfeeb70b45a11bb5efd766fb4d 100644 (file)
--- a/vaapi_jpeg_decoder.cpp
+++ b/vaapi_jpeg_decoder.cpp
@@ -1,5 +1,6 @@
 #include "vaapi_jpeg_decoder.h"
 
+#include "jpeg_destroyer.h"
 #include "jpeg_frame.h"
 #include "memcpy_interleaved.h"
 
@@ -298,12 +299,27 @@ void init_jpeg_vaapi()
        vaapi_jpeg_decoding_usable = true;
 }
 
+class VABufferDestroyer {
+public:
+       VABufferDestroyer(VADisplay *dpy, VABufferID buf)
+               : dpy(dpy), buf(buf) {}
+
+       ~VABufferDestroyer() {
+               vaDestroyBuffer(dpy, buf);
+       }
+
+private:
+       VADisplay *dpy;
+       VABufferID buf;
+};
+
 shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
 {
        jpeg_decompress_struct dinfo;
        jpeg_error_mgr jerr;
        dinfo.err = jpeg_std_error(&jerr);
        jpeg_create_decompress(&dinfo);
+       JPEGDestroyer destroy_dinfo(&dinfo);
 
        FILE *fp = fopen(filename.c_str(), "rb");
        if (fp == nullptr) {
@@ -332,11 +348,10 @@ shared_ptr<Frame> decode_jpeg_vaapi(const string &filename)
                return nullptr;
        }
        if (dinfo.comp_info[0].h_samp_factor != 2 ||
-           dinfo.comp_info[0].v_samp_factor != 2 ||
            dinfo.comp_info[1].h_samp_factor != 1 ||
-           dinfo.comp_info[1].v_samp_factor != 2 ||
+           dinfo.comp_info[1].v_samp_factor != dinfo.comp_info[0].v_samp_factor ||
            dinfo.comp_info[2].h_samp_factor != 1 ||
-           dinfo.comp_info[2].v_samp_factor != 2) {
+           dinfo.comp_info[2].v_samp_factor != dinfo.comp_info[0].v_samp_factor) {
                fprintf(stderr, "Not 4:2:2. (Y=%dx%d, Cb=%dx%d, Cr=%dx%d)\n",
                        dinfo.comp_info[0].h_samp_factor, dinfo.comp_info[0].v_samp_factor,
                        dinfo.comp_info[1].h_samp_factor, dinfo.comp_info[1].v_samp_factor,
@@ -363,6 +378,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;
@@ -387,6 +403,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;
@@ -420,6 +437,7 @@ 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;
@@ -449,11 +467,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.
        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);
 
        VAResources resources = get_va_resources(dinfo.image_width, dinfo.image_height);
        ReleaseVAResources release(resources);