AAC/SBR encoder improvements

am: 46ba367

* commit '46ba3676b854acbc69a4c7845f578d4c2886377b':
  AAC/SBR encoder improvements

Change-Id: Id839c5ba8b79eddb7e239b7ec1b26fb5079b7d81

1 files changed, 57 insertions, 4 deletions

diff --git a/libSBRenc/src/tran_det.h b/libSBRenc/src/tran_det.h
index 95b5d2e..6fe1023 100644
--- a/libSBRenc/src/tran_det.h
+++ b/libSBRenc/src/tran_det.h
@@ -2,7 +2,7 @@
 /* -----------------------------------------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+© Copyright  1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
   All rights reserved.
 
  1.    INTRODUCTION
@@ -96,7 +96,8 @@ typedef struct
   FIXP_DBL  transients[QMF_MAX_TIME_SLOTS+(QMF_MAX_TIME_SLOTS/2)];
   FIXP_DBL  thresholds[QMF_CHANNELS];
   FIXP_DBL  tran_thr;              /* Master threshold for transient signals */
-  FIXP_DBL  split_thr;             /* Threshold for splitting FIXFIX-frames into 2 env */
+  FIXP_DBL  split_thr_m;           /* Threshold for splitting FIXFIX-frames into 2 env */
+  INT       split_thr_e;           /* Scale for splitting threshold */
   FIXP_DBL  prevLowBandEnergy;     /* Energy of low band */
   FIXP_DBL  prevHighBandEnergy;    /* Energy of high band */
   INT    tran_fc;                  /* Number of lowband subbands to discard  */
@@ -112,6 +113,57 @@ SBR_TRANSIENT_DETECTOR;
 
 typedef SBR_TRANSIENT_DETECTOR *HANDLE_SBR_TRANSIENT_DETECTOR;
 
+#define TRAN_DET_LOOKAHEAD 2
+#define TRAN_DET_START_FREQ 4500  /*start frequency for transient detection*/
+#define TRAN_DET_STOP_FREQ  13500 /*stop frequency for transient detection*/
+#define TRAN_DET_MIN_QMFBANDS 4 /* minimum qmf bands for transient detection */
+#define QMF_HP_dBd_SLOPE_FIX FL2FXCONST_DBL(0.00075275f) /* 0.002266f/10 * log2(10) */
+#define TRAN_DET_THRSHLD FL2FXCONST_DBL(3.2f/4.f)
+#define TRAN_DET_THRSHLD_SCALE (2)
+
+typedef struct
+{
+  INT transientCandidates[QMF_MAX_TIME_SLOTS + TRAN_DET_LOOKAHEAD];
+  INT nTimeSlots;
+  INT lookahead;
+  INT startBand;
+  INT stopBand;
+
+  FIXP_DBL dBf_m[QMF_CHANNELS];
+  INT      dBf_e[QMF_CHANNELS];
+
+  FIXP_DBL energy_timeSlots[QMF_MAX_TIME_SLOTS + TRAN_DET_LOOKAHEAD];
+  INT      energy_timeSlots_scale[QMF_MAX_TIME_SLOTS + TRAN_DET_LOOKAHEAD];
+
+  FIXP_DBL delta_energy[QMF_MAX_TIME_SLOTS + TRAN_DET_LOOKAHEAD];
+  INT      delta_energy_scale[QMF_MAX_TIME_SLOTS + TRAN_DET_LOOKAHEAD];
+
+  FIXP_DBL lowpass_energy[QMF_MAX_TIME_SLOTS + TRAN_DET_LOOKAHEAD];
+  INT      lowpass_energy_scale[QMF_MAX_TIME_SLOTS + TRAN_DET_LOOKAHEAD];
+#if defined (FTD_LOG)
+  FDKFILE *ftd_log;
+#endif
+}
+FAST_TRAN_DETECTOR;
+typedef FAST_TRAN_DETECTOR *HANDLE_FAST_TRAN_DET;
+
+
+INT FDKsbrEnc_InitSbrFastTransientDetector(
+        HANDLE_FAST_TRAN_DET h_sbrFastTransientDetector,
+        const INT time_slots_per_frame,
+        const INT bandwidth_qmf_slot,
+        const INT no_qmf_channels,
+        const INT sbr_qmf_1st_band
+        );
+
+void FDKsbrEnc_fastTransientDetect(
+        const HANDLE_FAST_TRAN_DET          h_sbrFastTransientDetector,
+        const FIXP_DBL              *const *Energies,
+        const int                   *const  scaleEnergies,
+        const INT                           YBufferWriteOffset,
+              UCHAR                 *const  tran_vector
+        );
+
 void
 FDKsbrEnc_transientDetect(HANDLE_SBR_TRANSIENT_DETECTOR h_sbrTransientDetector,
                           FIXP_DBL **Energies,
@@ -124,6 +176,7 @@ FDKsbrEnc_transientDetect(HANDLE_SBR_TRANSIENT_DETECTOR h_sbrTransientDetector,
 
 int
 FDKsbrEnc_InitSbrTransientDetector (HANDLE_SBR_TRANSIENT_DETECTOR h_sbrTransientDetector,
+                            UINT  sbrSyntaxFlags, /* SBR syntax flags derived from AOT. */
                             INT   frameSize,
                             INT   sampleFreq,
                             sbrConfigurationPtr params,
@@ -145,6 +198,6 @@ FDKsbrEnc_frameSplitter(FIXP_DBL **Energies,
                         int YBufferSzShift,
                         int nSfb,
                         int timeStep,
-                        int no_cols);
-
+                        int no_cols,
+                        FIXP_DBL* tonality);
 #endif