The JPEG headers were cached (per resolution) and never invalidated,
causing wrong/outdated information to be sent.
I can't really remember why I wanted to cache these, but I suppose
I had a reason, so I'm a bit reluctant to just kill the cache.
Hopefully, the white balance won't change often enough, and these
objects are so small, that we won't need invalidation; we can just
let it grow until program exit.
-MJPEGEncoder::VAData MJPEGEncoder::get_va_data_for_resolution(unsigned width, unsigned height, const RGBTriplet &white_balance)
+MJPEGEncoder::VAData MJPEGEncoder::get_va_data_for_parameters(unsigned width, unsigned height, const RGBTriplet &white_balance)
- pair<unsigned, unsigned> key(width, height);
- if (va_data_for_resolution.count(key)) {
- return va_data_for_resolution[key];
+ VAKey key{width, height, white_balance};
+ if (va_data_for_parameters.count(key)) {
+ return va_data_for_parameters[key];
}
// Use libjpeg to generate a header and set sane defaults for e.g.
}
// Use libjpeg to generate a header and set sane defaults for e.g.
ret.q = q;
ret.huff = huff;
ret.parms = parms;
ret.q = q;
ret.huff = huff;
ret.parms = parms;
- va_data_for_resolution[key] = ret;
+ va_data_for_parameters[key] = ret;
release = ReleaseVAResources(this, resources);
}
release = ReleaseVAResources(this, resources);
}
- VAData va_data = get_va_data_for_resolution(width, height, qf.white_balance);
+ VAData va_data = get_va_data_for_parameters(width, height, qf.white_balance);
va_data.pic_param.coded_buf = resources.data_buffer;
VABufferID pic_param_buffer;
va_data.pic_param.coded_buf = resources.data_buffer;
VABufferID pic_param_buffer;
std::unique_ptr<VADisplayWithCleanup> va_dpy;
VAConfigID config_id;
std::unique_ptr<VADisplayWithCleanup> va_dpy;
VAConfigID config_id;
+ struct VAKey {
+ unsigned width, height;
+ movit::RGBTriplet white_balance;
+
+ bool operator< (const VAKey &other) const {
+ if (width != other.width)
+ return width < other.width;
+ if (height != other.height)
+ return height < other.height;
+ if (white_balance.r != other.white_balance.r)
+ return white_balance.r < other.white_balance.r;
+ if (white_balance.g != other.white_balance.g)
+ return white_balance.g < other.white_balance.g;
+ return white_balance.b < other.white_balance.b;
+ }
+ };
struct VAData {
std::vector<uint8_t> jpeg_header;
VAEncPictureParameterBufferJPEG pic_param;
struct VAData {
std::vector<uint8_t> jpeg_header;
VAEncPictureParameterBufferJPEG pic_param;
VAHuffmanTableBufferJPEGBaseline huff;
VAEncSliceParameterBufferJPEG parms;
};
VAHuffmanTableBufferJPEGBaseline huff;
VAEncSliceParameterBufferJPEG parms;
};
- std::map<std::pair<unsigned, unsigned>, VAData> va_data_for_resolution;
- VAData get_va_data_for_resolution(unsigned width, unsigned height, const movit::RGBTriplet &white_balance);
+ std::map<VAKey, VAData> va_data_for_parameters;
+ VAData get_va_data_for_parameters(unsigned width, unsigned height, const movit::RGBTriplet &white_balance);
std::list<VAResources> va_resources_freelist;
std::mutex va_resources_mutex;
std::list<VAResources> va_resources_freelist;
std::mutex va_resources_mutex;