#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 {
* \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 int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- uint8_t *buf, int buf_size) {
+ const uint8_t *buf, int buf_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;
}
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;
buf_size -= 12;
}
- if (c->pic.data[0])
+ if (keyframe && 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) {
+ 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 = FF_I_TYPE;
- c->pic.key_frame = 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->pix_fmt = PIX_FMT_YUV420P;
c->pic.data[0] = NULL;
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"),
};