---
libavcodec/nuv.c | 59 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 14e9c79..44837f1 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -69,8 +69,8 @@ static const uint8_t fallback_cquant[] = {
* @param width width of the video frame
* @param height height of the video frame
*/
-static void copy_frame(AVFrame *f, const uint8_t *src,
- int width, int height) {
+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);
av_picture_copy((AVPicture *)f, &pic, PIX_FMT_YUV420P, width, height);
@@ -79,8 +79,9 @@ static void copy_frame(AVFrame *f, const uint8_t *src,
/**
* @brief extract quantization tables from codec data into our context
*/
-static int get_quant(AVCodecContext *avctx, NuvContext *c,
- const uint8_t *buf, int size) {
+static int get_quant(AVCodecContext *avctx, NuvContext *c, const uint8_t *buf,
+ int size)
+{
int i;
if (size < 2 * 64 * 4) {
av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n");
@@ -96,7 +97,8 @@ static int get_quant(AVCodecContext *avctx, NuvContext *c,
/**
* @brief set quantization tables from a quality value
*/
-static void get_quant_quality(NuvContext *c, int quality) {
+static void get_quant_quality(NuvContext *c, int quality)
+{
int i;
quality = FFMAX(quality, 1);
for (i = 0; i < 64; i++) {
@@ -105,7 +107,9 @@ static void get_quant_quality(NuvContext *c, int quality) {
}
}
-static int codec_reinit(AVCodecContext *avctx, int width, int height, int
quality) {
+static int codec_reinit(AVCodecContext *avctx, int width, int height,
+ int quality)
+{
NuvContext *c = avctx->priv_data;
width = FFALIGN(width, 2);
height = FFALIGN(height, 2);
@@ -116,19 +120,23 @@ static int codec_reinit(AVCodecContext *avctx, int width,
int height, int qualit
return 0;
avctx->width = c->width = width;
avctx->height = c->height = height;
- av_fast_malloc(&c->decomp_buf, &c->decomp_size, c->height * c->width *
3 / 2);
+ av_fast_malloc(&c->decomp_buf, &c->decomp_size,
+ c->height * c->width * 3 / 2);
if (!c->decomp_buf) {
- av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression
buffer.\n");
+ av_log(avctx, AV_LOG_ERROR,
+ "Can't allocate decompression buffer.\n");
return 0;
}
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq,
c->cq);
} else if (quality != c->quality)
ff_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,
- AVPacket *avpkt) {
+ AVPacket *avpkt)
+{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
NuvContext *c = avctx->priv_data;
@@ -136,9 +144,14 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int *data_size,
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;
+ enum {
+ NUV_UNCOMPRESSED = '0',
+ NUV_RTJPEG = '1',
+ NUV_RTJPEG_IN_LZO = '2',
+ NUV_LZO = '3',
+ NUV_BLACK = 'N',
+ NUV_COPY_LAST = 'L'
+ } comptype;
if (buf_size < 12) {
av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
@@ -154,7 +167,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int *data_size,
ret = get_quant(avctx, c, buf, buf_size);
if (ret < 0)
return ret;
- ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq,
c->cq);
+ ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq,
+ c->cq);
return orig_size;
}
@@ -248,26 +262,35 @@ static int decode_frame(AVCodecContext *avctx, void
*data, int *data_size,
return orig_size;
}
-static av_cold int decode_init(AVCodecContext *avctx) {
- NuvContext *c = avctx->priv_data;
+static av_cold int decode_init(AVCodecContext *avctx)
+{
+ NuvContext *c = avctx->priv_data;
avctx->pix_fmt = PIX_FMT_YUV420P;
c->pic.data[0] = NULL;
- c->decomp_buf = NULL;
- c->quality = -1;
+ c->decomp_buf = NULL;
+ c->quality = -1;
+
c->codec_frameheader = avctx->codec_tag == MKTAG('R', 'J', 'P', 'G');
+
if (avctx->extradata_size)
get_quant(avctx, c, avctx->extradata, avctx->extradata_size);
+
ff_dsputil_init(&c->dsp, avctx);
+
if (!codec_reinit(avctx, avctx->width, avctx->height, -1))
return 1;
+
return 0;
}
-static av_cold 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])
avctx->release_buffer(avctx, &c->pic);
+
return 0;
}
--
1.7.8.6
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
