highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

output last ac3 frame and simplify

Browse Source 
Originally committed as revision 4926 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2006-02-02 18:38:47 +00:00
parent b4e021e8c4
commit d8a91afd36
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/parser.c
View File

@@ -873,9 +873,8 @@ static int ac3_parse(AVCodecParserContext *s1,
len = s->inbuf_ptr - s->inbuf; len = s->inbuf_ptr - s->inbuf;
if (s->frame_size == 0) { if (s->frame_size == 0) {
/* no header seen : find one. We need at least 7 bytes to parse it */ /* no header seen : find one. We need at least 7 bytes to parse it */
len = AC3_HEADER_SIZE - len; len = FFMIN(AC3_HEADER_SIZE - len, buf_size);
if (len > buf_size)
len = buf_size;
memcpy(s->inbuf_ptr, buf_ptr, len); memcpy(s->inbuf_ptr, buf_ptr, len);
buf_ptr += len; buf_ptr += len;
s->inbuf_ptr += len; s->inbuf_ptr += len;
@@ -898,21 +897,21 @@ static int ac3_parse(AVCodecParserContext *s1,
avctx->frame_size = 6 * 256; avctx->frame_size = 6 * 256;
} }
} }
} else if (len < s->frame_size) { } else {
len = s->frame_size - len; len = FFMIN(s->frame_size - len, buf_size);
if (len > buf_size)
len = buf_size;
memcpy(s->inbuf_ptr, buf_ptr, len); memcpy(s->inbuf_ptr, buf_ptr, len);
buf_ptr += len; buf_ptr += len;
s->inbuf_ptr += len; s->inbuf_ptr += len;
buf_size -= len; buf_size -= len;
} else {
*poutbuf = s->inbuf; if(s->inbuf_ptr - s->inbuf == s->frame_size){
*poutbuf_size = s->frame_size; *poutbuf = s->inbuf;
s->inbuf_ptr = s->inbuf; *poutbuf_size = s->frame_size;
s->frame_size = 0; s->inbuf_ptr = s->inbuf;
break; s->frame_size = 0;
break;
}
} }
} }
return buf_ptr - buf; return buf_ptr - buf;