[FFmpeg-soc] [soc]: r2754 - aac/aac.c

superdump subversion at mplayerhq.hu
Wed Jul 9 22:36:42 CEST 2008


Author: superdump
Date: Wed Jul  9 22:36:39 2008
New Revision: 2754

Log:
Remove useless tns_trans() wrapper function


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Wed Jul  9 22:36:39 2008
@@ -1777,13 +1777,6 @@ static void apply_tns(AACContext * ac, i
     }
 }
 
-/**
- * apply_tns wrapper to make interface consistent.
- */
-static void tns_trans(AACContext * ac, SingleChannelElement * sce) {
-    if(sce->tns.present) apply_tns(ac, 1, sce, sce->coeffs);
-}
-
 #ifdef AAC_LTP
 static void windowing_and_mdct_ltp(AACContext * ac, SingleChannelElement * sce, float * in, float * out) {
     IndividualChannelStream * ics = &sce->ics;
@@ -2150,9 +2143,10 @@ static void spectral_to_sample(AACContex
                         ltp_trans(ac, &che->ch[1]);
                 }
 #endif /* AAC_LTP */
-                tns_trans(ac, &che->ch[0]);
-                if(j == ID_CPE)
-                    tns_trans(ac, &che->ch[1]);
+                if(               che->ch[0].tns.present)
+                    apply_tns(ac, 1, &che->ch[0], che->ch[0].coeffs);
+                if(j == ID_CPE && che->ch[1].tns.present)
+                    apply_tns(ac, 1, &che->ch[1], che->ch[1].coeffs);
                 if(j == ID_CCE && !che->coup.is_indep_coup && (che->coup.domain == 1))
                     transform_coupling_tool(ac, che, coupling_dependent_trans);
 #ifdef AAC_SSR



More information about the FFmpeg-soc mailing list