# HG changeset patch
# User voroshil
# Date 1244946579 0
# Node ID af3cc583501e623d9dfd87b5ebd149ffc3fffa6b
# Parent  e0fe929c5dc4f0ec48497a0e85046fec6a74264f
Replace MAX_SUBFRAME_SIZE and ctx->subframe_size with SUBFRAME_SIZE,
since subframe length is the same in all G.729 modes.

diff -r e0fe929c5dc4 -r af3cc583501e g729.h
--- a/g729.h	Sat Jun 13 22:33:13 2009 +0000
+++ b/g729.h	Sun Jun 14 02:29:39 2009 +0000
@@ -22,8 +22,8 @@
 #define AVCODEC_G729_H
 
 /**
- * maximum possible subframe size
+ * subframe size
  */
-#define MAX_SUBFRAME_SIZE 44
+#define SUBFRAME_SIZE 40
 
 #endif // AVCODEC_G729_H
diff -r e0fe929c5dc4 -r af3cc583501e g729dec.c
--- a/g729dec.c	Sat Jun 13 22:33:13 2009 +0000
+++ b/g729dec.c	Sun Jun 14 02:29:39 2009 +0000
@@ -107,7 +107,7 @@
                                      fc, 1 << 14,
                                      av_clip(ctx->gain_pitch, SHARP_MIN, SHARP_MAX),
                                      0, 14,
-                                     ctx->subframe_size - pitch_delay_int[i]);
+                                     SUBFRAME_SIZE - pitch_delay_int[i]);
 
         if (ctx->frame_erasure) {
             ctx->gain_pitch = (29491 * ctx->gain_pitch) >> 15; // 0.90 (0.15)
@@ -120,11 +120,11 @@
             gain_corr_factor = cb_gain_1st_8k[parm->gc_1st_index[i]][1] +
                                cb_gain_2nd_8k[parm->gc_2nd_index[i]][1];
 
-        ff_acelp_weighted_vector_sum(ctx->exc + i * ctx->subframe_size,
-                                     ctx->exc + i * ctx->subframe_size, fc,
+        ff_acelp_weighted_vector_sum(ctx->exc + i * SUBFRAME_SIZE,
+                                     ctx->exc + i * SUBFRAME_SIZE, fc,
                                      (!voicing && ctx->frame_erasure) ? 0 : ctx->gain_pitch,
                                      ( voicing && ctx->frame_erasure) ? 0 : ctx->gain_code,
-                                     1<<13, 14, ctx->subframe_size);
+                                     1 << 13, 14, SUBFRAME_SIZE);
 
     if (buf_size < packed_frame_size) {
         av_log(avctx, AV_LOG_ERROR, "Error processing packet: packet size too small\n");