X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vaapi_jpeg_decoder.cpp;h=1a3b64eb326b0c05731f1f439b6dd9df15d539b7;hb=92cca212dad5e4b968c052d8200a534473929674;hp=e11c0318b40bde7e8e5a3a726f997a07ab5fb763;hpb=ec877bf1354fcd69120e080a6e796ff08133e06f;p=nageru

diff --git a/vaapi_jpeg_decoder.cpp b/vaapi_jpeg_decoder.cpp
index e11c031..1a3b64e 100644
--- 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"
 
@@ -48,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)
 {
 	{
@@ -298,12 +311,28 @@ void init_jpeg_vaapi()
 	vaapi_jpeg_decoding_usable = true;
 }
 
+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 &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) {
@@ -362,6 +391,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;
@@ -378,7 +408,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]];
 			}
 		}
 	}
@@ -386,6 +416,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;
@@ -419,6 +450,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;
@@ -448,11 +480,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);