opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 04:47:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix nuv decoder to use reget_buffer for non-keyframes and correctly

Browse Source 
identify non-keyframe RTJPEG frames.

Originally committed as revision 15217 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2008-09-05 16:31:26 +00:00
parent cf74dd4a5c
commit 2881a656ff
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/nuv.c
View File

@ -132,6 +132,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
NuvContext *c = avctx->priv_data; NuvContext *c = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
int orig_size = buf_size; int orig_size = buf_size;
int keyframe;
int result;
enum {NUV_UNCOMPRESSED = '0', NUV_RTJPEG = '1', enum {NUV_UNCOMPRESSED = '0', NUV_RTJPEG = '1',
NUV_RTJPEG_IN_LZO = '2', NUV_LZO = '3', NUV_RTJPEG_IN_LZO = '2', NUV_LZO = '3',
NUV_BLACK = 'N', NUV_COPY_LAST = 'L'} comptype; NUV_BLACK = 'N', NUV_COPY_LAST = 'L'} comptype;
@ -159,6 +161,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
return -1; return -1;
} }
comptype = buf[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. // skip rest of the frameheader.
buf = &buf[12]; buf = &buf[12];
buf_size -= 12; buf_size -= 12;
@ -184,18 +195,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
buf_size -= 12; buf_size -= 12;
} }
if (c->pic.data[0]) if (keyframe && c->pic.data[0])
avctx->release_buffer(avctx, &c->pic); avctx->release_buffer(avctx, &c->pic);
c->pic.reference = 1; c->pic.reference = 1;
c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE | c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_READABLE |
FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; 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"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
c->pic.pict_type = FF_I_TYPE; c->pic.pict_type = keyframe ? FF_I_TYPE : FF_P_TYPE;
c->pic.key_frame = 1; c->pic.key_frame = keyframe;
// decompress/copy/whatever data // decompress/copy/whatever data
switch (comptype) { switch (comptype) {
case NUV_LZO: case NUV_LZO:
@ -220,8 +232,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
break; break;
} }
case NUV_COPY_LAST: { case NUV_COPY_LAST: {
c->pic.pict_type = FF_P_TYPE;
c->pic.key_frame = 0;
/* nothing more to do here */ /* nothing more to do here */
break; break;
} }