#include <stdio.h>
#include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavutil/lzo.h"
#include "avcodec.h"
-
-#include "bswap.h"
#include "dsputil.h"
-#include "lzo.h"
#include "rtjpeg.h"
typedef struct {
AVFrame pic;
int codec_frameheader;
+ int quality;
int width, height;
unsigned int decomp_size;
unsigned char* decomp_buf;
* \param width width of the video frame
* \param height height of the video frame
*/
-static void copy_frame(AVFrame *f, uint8_t *src,
+static void copy_frame(AVFrame *f, const uint8_t *src,
int width, int height) {
AVPicture pic;
avpicture_fill(&pic, src, PIX_FMT_YUV420P, width, height);
* \brief extract quantization tables from codec data into our context
*/
static int get_quant(AVCodecContext *avctx, NuvContext *c,
- uint8_t *buf, int size) {
+ const uint8_t *buf, int size) {
int i;
if (size < 2 * 64 * 4) {
av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n");
*/
static void get_quant_quality(NuvContext *c, int quality) {
int i;
+ quality = FFMAX(quality, 1);
for (i = 0; i < 64; i++) {
c->lq[i] = (fallback_lquant[i] << 7) / quality;
c->cq[i] = (fallback_cquant[i] << 7) / quality;
}
}
+static int codec_reinit(AVCodecContext *avctx, int width, int height, int quality) {
+ NuvContext *c = avctx->priv_data;
+ width = (width + 1) & ~1;
+ height = (height + 1) & ~1;
+ if (quality >= 0)
+ get_quant_quality(c, quality);
+ if (width != c->width || height != c->height) {
+ if (avcodec_check_dimensions(avctx, height, width) < 0)
+ return 0;
+ avctx->width = c->width = width;
+ avctx->height = c->height = height;
+ c->decomp_size = c->height * c->width * 3 / 2;
+ c->decomp_buf = av_realloc(c->decomp_buf, c->decomp_size + AV_LZO_OUTPUT_PADDING);
+ if (!c->decomp_buf) {
+ av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
+ return 0;
+ }
+ rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
+ } else if (quality != c->quality)
+ rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
+ return 1;
+}
+
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- uint8_t *buf, int buf_size) {
+ AVPacket *avpkt) {
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
NuvContext *c = avctx->priv_data;
AVFrame *picture = data;
int orig_size = buf_size;
+ int keyframe;
+ int result;
enum {NUV_UNCOMPRESSED = '0', NUV_RTJPEG = '1',
NUV_RTJPEG_IN_LZO = '2', NUV_LZO = '3',
NUV_BLACK = 'N', NUV_COPY_LAST = 'L'} comptype;
return -1;
}
- if (c->pic.data[0])
- avctx->release_buffer(avctx, &c->pic);
- c->pic.reference = 1;
- c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
- FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->get_buffer(avctx, &c->pic) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
-
// codec data (rtjpeg quant tables)
if (buf[0] == 'D' && buf[1] == 'R') {
int ret;
return -1;
}
comptype = buf[1];
+ switch (comptype) {
+ case NUV_RTJPEG_IN_LZO:
+ case NUV_RTJPEG:
+ keyframe = !buf[2]; break;
+ case NUV_COPY_LAST:
+ keyframe = 0; break;
+ default:
+ keyframe = 1; break;
+ }
// skip rest of the frameheader.
buf = &buf[12];
buf_size -= 12;
if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) {
int outlen = c->decomp_size, inlen = buf_size;
- if (lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen))
+ if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen))
av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
buf = c->decomp_buf;
buf_size = c->decomp_size;
}
if (c->codec_frameheader) {
- get_quant_quality(c, buf[10]);
- rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
+ int w, h, q;
+ if (buf_size < 12) {
+ av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame\n");
+ return -1;
+ }
+ w = AV_RL16(&buf[6]);
+ h = AV_RL16(&buf[8]);
+ q = buf[10];
+ if (!codec_reinit(avctx, w, h, q))
+ return -1;
buf = &buf[12];
buf_size -= 12;
}
- c->pic.pict_type = FF_I_TYPE;
- c->pic.key_frame = 1;
+ if (keyframe && c->pic.data[0])
+ avctx->release_buffer(avctx, &c->pic);
+ c->pic.reference = 3;
+ c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
+ FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
+ result = keyframe ? avctx->get_buffer(avctx, &c->pic) : avctx->reget_buffer(avctx, &c->pic);
+ if (result < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return -1;
+ }
+
+ c->pic.pict_type = keyframe ? FF_I_TYPE : FF_P_TYPE;
+ c->pic.key_frame = keyframe;
// decompress/copy/whatever data
switch (comptype) {
case NUV_LZO:
break;
}
case NUV_COPY_LAST: {
- c->pic.pict_type = FF_P_TYPE;
- c->pic.key_frame = 0;
/* nothing more to do here */
break;
}
return orig_size;
}
-static int decode_init(AVCodecContext *avctx) {
+static av_cold int decode_init(AVCodecContext *avctx) {
NuvContext *c = avctx->priv_data;
- avctx->width = (avctx->width + 1) & ~1;
- avctx->height = (avctx->height + 1) & ~1;
- if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) {
- return 1;
- }
avctx->pix_fmt = PIX_FMT_YUV420P;
c->pic.data[0] = NULL;
+ c->decomp_buf = NULL;
+ c->quality = -1;
+ c->width = 0;
+ c->height = 0;
c->codec_frameheader = avctx->codec_tag == MKTAG('R', 'J', 'P', 'G');
- c->width = avctx->width;
- c->height = avctx->height;
- c->decomp_size = c->height * c->width * 3 / 2;
- c->decomp_buf = av_malloc(c->decomp_size + LZO_OUTPUT_PADDING);
- if (!c->decomp_buf) {
- av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");
- return 1;
- }
- dsputil_init(&c->dsp, avctx);
if (avctx->extradata_size)
get_quant(avctx, c, avctx->extradata, avctx->extradata_size);
- rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
+ dsputil_init(&c->dsp, avctx);
+ if (!codec_reinit(avctx, avctx->width, avctx->height, -1))
+ return 1;
return 0;
}
-static int decode_end(AVCodecContext *avctx) {
+static av_cold int decode_end(AVCodecContext *avctx) {
NuvContext *c = avctx->priv_data;
av_freep(&c->decomp_buf);
if (c->pic.data[0])
decode_end,
decode_frame,
CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"),
};
projects / frescor / ffmpeg.git / blobdiff