Commit 614bfd0c authored by multrus's avatar multrus
Browse files

take correct frame-length into account for guard-bit calculation

parent f09f909a
Loading
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1646,8 +1646,12 @@ int main(

    ObjectPositionBuffer mtdBuffer;
    outBuffer.pq_fact = &outBuffer.q_factor;
#ifdef FIX_2257_INCR_GUARD_BITS
    Word16 gd_bits = find_guard_bits( frameSize_smpls );
#else
    Word16 subframe_len = (Word16) ( args.sampleRate / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) );
    Word16 gd_bits = find_guard_bits( subframe_len );
#endif
    Word16 prev_q_fact = Q11;
    while ( 1 )
    {
+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@
#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */
#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */
#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */
#define FIX_2257_INCR_GUARD_BITS                        /* FhG: take correct rendering frame-size into account for guard-bits calculation */

/* ##################### End NON-BE switches ########################### */