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

Simplify verbatim mode fallback by checking the frame size before writing.

Browse Source 
Originally committed as revision 24632 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles
2010-07-31 21:08:53 +00:00
parent 2249a7f312
commit 3d2cd42f8a
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/flacenc.c
View File

@@ -1285,23 +1285,19 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
channel_decorrelation(s); channel_decorrelation(s);
frame_bytes = encode_frame(s); frame_bytes = encode_frame(s);
if (buf_size < frame_bytes) {
av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");
return 0;
}
out_bytes = write_frame(s, frame, buf_size);
/* fallback to verbatim mode if the compressed frame is larger than it /* fallback to verbatim mode if the compressed frame is larger than it
would be if encoded uncompressed. */ would be if encoded uncompressed. */
if (out_bytes > s->max_framesize) { if (frame_bytes > s->max_framesize) {
s->frame.verbatim_only = 1; s->frame.verbatim_only = 1;
frame_bytes = encode_frame(s); frame_bytes = encode_frame(s);
}
if (buf_size < frame_bytes) { if (buf_size < frame_bytes) {
av_log(avctx, AV_LOG_ERROR, "output buffer too small\n"); av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");
return 0; return 0;
} }
out_bytes = write_frame(s, frame, buf_size); out_bytes = write_frame(s, frame, buf_size);
}
s->frame_count++; s->frame_count++;
avctx->coded_frame->pts = s->sample_count; avctx->coded_frame->pts = s->sample_count;