AVIOContext *frame; ///< current frame buffer
uint32_t timestamp; ///< current frame timestamp
int hdr_size; ///< size of the current frame header
+ uint8_t qtables[128][128];
+ uint8_t qtables_len[128];
};
static const uint8_t default_quantizers[128] = {
"Unimplemented RTP/JPEG restart marker header.\n");
return AVERROR_PATCHWELCOME;
}
+ if (type > 1) {
+ av_log(ctx, AV_LOG_ERROR, "Unimplemented RTP/JPEG type %d\n", type);
+ return AVERROR_PATCHWELCOME;
+ }
/* Parse the quantization table header. */
if (off == 0) {
if (precision)
av_log(ctx, AV_LOG_WARNING, "Only 8-bit precision is supported.\n");
- if (q == 255 && qtable_len == 0) {
- av_log(ctx, AV_LOG_ERROR,
- "Invalid RTP/JPEG packet. Quantization tables not found.\n");
- return AVERROR_INVALIDDATA;
- }
-
if (qtable_len > 0) {
if (len < qtable_len) {
av_log(ctx, AV_LOG_ERROR, "Too short RTP/JPEG packet.\n");
qtables = buf;
buf += qtable_len;
len -= qtable_len;
+ if (q < 255) {
+ if (jpeg->qtables_len[q - 128] &&
+ (jpeg->qtables_len[q - 128] != qtable_len ||
+ memcmp(qtables, &jpeg->qtables[q - 128][0], qtable_len))) {
+ av_log(ctx, AV_LOG_WARNING,
+ "Quantization tables for q=%d changed\n", q);
+ } else if (!jpeg->qtables_len[q - 128] && qtable_len <= 128) {
+ memcpy(&jpeg->qtables[q - 128][0], qtables,
+ qtable_len);
+ jpeg->qtables_len[q - 128] = qtable_len;
+ }
+ }
+ } else {
+ if (q == 255) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Invalid RTP/JPEG packet. Quantization tables not found.\n");
+ return AVERROR_INVALIDDATA;
+ }
+ if (!jpeg->qtables_len[q - 128]) {
+ av_log(ctx, AV_LOG_ERROR,
+ "No quantization tables known for q=%d yet.\n", q);
+ return AVERROR_INVALIDDATA;
+ }
+ qtables = &jpeg->qtables[q - 128][0];
+ qtable_len = jpeg->qtables_len[q - 128];
}
+ } else { /* q <= 127 */
+ if (q == 0 || q > 99) {
+ av_log(ctx, AV_LOG_ERROR, "Reserved q value %d\n", q);
+ return AVERROR_INVALIDDATA;
+ }
+ create_default_qtables(new_qtables, q);
+ qtables = new_qtables;
+ qtable_len = sizeof(new_qtables);
}
/* Skip the current frame in case of the end packet
return ret;
jpeg->timestamp = *timestamp;
- if (!qtables) {
- create_default_qtables(new_qtables, q);
- qtables = new_qtables;
- qtable_len = sizeof(new_qtables);
- }
-
/* Generate a frame and scan headers that can be prepended to the
* RTP/JPEG data payload to produce a JPEG compressed image in
* interchange format. */
jpeg->hdr_size = jpeg_create_header(hdr, sizeof(hdr), type, width,
height, qtables,
- qtable_len > 64 ? 2 : 1);
+ qtable_len / 64);
/* Copy JPEG header to frame buffer. */
avio_write(jpeg->frame, hdr, jpeg->hdr_size);