diff flacenc.c @ 9216:64246d9e583a libavcodec

add a function to calculate a more accurate estimate for maximum FLAC frame size and use the function in the FLAC decoder and FLAC encoder
author jbr
date Sat, 21 Mar 2009 01:54:31 +0000
parents 78b55e071bb9
children 0dce4fe6e6f3
line wrap: on
line diff
--- a/flacenc.c	Sat Mar 21 01:27:28 2009 +0000
+++ b/flacenc.c	Sat Mar 21 01:54:31 2009 +0000
@@ -345,11 +345,8 @@
            s->options.lpc_coeff_precision);
 
     /* set maximum encoded frame size in verbatim mode */
-    if(s->channels == 2) {
-        s->max_framesize = 14 + ((s->avctx->frame_size * 33 + 7) >> 3);
-    } else {
-        s->max_framesize = 14 + (s->avctx->frame_size * s->channels * 2);
-    }
+    s->max_framesize = ff_flac_get_max_frame_size(s->avctx->frame_size,
+                                                  s->channels, 16);
 
     /* initialize MD5 context */
     s->md5ctx = av_malloc(av_md5_size);