generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nuv: return meaningful error codes.

Browse Source 
(cherry picked from commit 3344f5cb74)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Anton Khirnov
2012-11-17 18:07:42 +01:00
committed by Luca Barbato
parent 6537f57782
commit cf6a34b2a5
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/nuv.c
View File

@@ -87,7 +87,7 @@ static int get_quant(AVCodecContext *avctx, NuvContext *c, const uint8_t *buf,
int i; int i;
if (size < 2 * 64 * 4) { if (size < 2 * 64 * 4) {
av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n"); av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n");
return -1; return AVERROR_INVALIDDATA;
} }
for (i = 0; i < 64; i++, buf += 4) for (i = 0; i < 64; i++, buf += 4)
c->lq[i] = AV_RL32(buf); c->lq[i] = AV_RL32(buf);
@@ -113,13 +113,15 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height,
int quality) int quality)
{ {
NuvContext *c = avctx->priv_data; NuvContext *c = avctx->priv_data;
int ret;
width = FFALIGN(width, 2); width = FFALIGN(width, 2);
height = FFALIGN(height, 2); height = FFALIGN(height, 2);
if (quality >= 0) if (quality >= 0)
get_quant_quality(c, quality); get_quant_quality(c, quality);
if (width != c->width || height != c->height) { if (width != c->width || height != c->height) {
if (av_image_check_size(height, width, 0, avctx) < 0) if ((ret = av_image_check_size(height, width, 0, avctx)) < 0)
return 0; return ret;
avctx->width = c->width = width; avctx->width = c->width = width;
avctx->height = c->height = height; avctx->height = c->height = height;
av_fast_malloc(&c->decomp_buf, &c->decomp_size, av_fast_malloc(&c->decomp_buf, &c->decomp_size,
@@ -128,7 +130,7 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height,
if (!c->decomp_buf) { if (!c->decomp_buf) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Can't allocate decompression buffer.\n"); "Can't allocate decompression buffer.\n");
return 0; return AVERROR(ENOMEM);
} }
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
c->lq, c->cq); c->lq, c->cq);
@@ -136,7 +138,7 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height,
ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height,
c->lq, c->cq); c->lq, c->cq);
return 1; return 0;
} }
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
@@ -160,7 +162,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (buf_size < 12) { if (buf_size < 12) {
av_log(avctx, AV_LOG_ERROR, "coded frame too small\n"); av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
return -1; return AVERROR_INVALIDDATA;
} }
// codec data (rtjpeg quant tables) // codec data (rtjpeg quant tables)
@@ -179,7 +181,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (buf[0] != 'V' || buf_size < 12) { if (buf[0] != 'V' || buf_size < 12) {
av_log(avctx, AV_LOG_ERROR, "not a nuv video frame\n"); av_log(avctx, AV_LOG_ERROR, "not a nuv video frame\n");
return -1; return AVERROR_INVALIDDATA;
} }
comptype = buf[1]; comptype = buf[1];
switch (comptype) { switch (comptype) {
@@ -217,8 +219,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
w = AV_RL16(&buf[6]); w = AV_RL16(&buf[6]);
h = AV_RL16(&buf[8]); h = AV_RL16(&buf[8]);
q = buf[10]; q = buf[10];
if (!codec_reinit(avctx, w, h, q)) if ((result = codec_reinit(avctx, w, h, q)) < 0)
return -1; return result;
buf = &buf[RTJPEG_HEADER_SIZE]; buf = &buf[RTJPEG_HEADER_SIZE];
buf_size -= RTJPEG_HEADER_SIZE; buf_size -= RTJPEG_HEADER_SIZE;
} }
@@ -231,7 +233,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
result = avctx->reget_buffer(avctx, &c->pic); result = avctx->reget_buffer(avctx, &c->pic);
if (result < 0) { if (result < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return result;
} }
c->pic.pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; c->pic.pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
@@ -262,7 +264,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "unknown compression\n"); av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
return -1; return AVERROR_INVALIDDATA;
} }
*picture = c->pic; *picture = c->pic;
@@ -273,6 +275,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
NuvContext *c = avctx->priv_data; NuvContext *c = avctx->priv_data;
int ret;
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
c->pic.data[0] = NULL; c->pic.data[0] = NULL;
c->decomp_buf = NULL; c->decomp_buf = NULL;
@@ -287,8 +291,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
ff_dsputil_init(&c->dsp, avctx); ff_dsputil_init(&c->dsp, avctx);
if (!codec_reinit(avctx, avctx->width, avctx->height, -1)) if ((ret = codec_reinit(avctx, avctx->width, avctx->height, -1)) < 0)
return 1; return ret;
return 0; return 0;
} }