Commit cb73ed29 authored by Arthur Tritthart's avatar Arthur Tritthart
Browse files

correct phase setting with 4 quadrants - active, when macro FIX_ISSUE_1966 is active

parent 216bf478

lib_dec/tonalMDCTconcealment_fx.c

100644 → 100755
+8 −8
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ static void FindPhaseDifferences( 
        {

            phaseDiff[i] = 0; /*(float)tan(0.0f*EVS_PI/bandwidth);*/

            move16();

#if 0

#ifndef FIX_ISSUE_1966 

            if ( s_and( k, 1 ) != 0 )

            {

                phaseDiff[i] = -12868 /*-EVS_PI 3Q12*/;
@@ -676,7 +676,7 @@ static void FindPhaseDifferences( 
            {

                phaseDiff[i] = 12868 /*EVS_PI 3Q12*/; /*(float)tan(2.0f*PI/bandwidth);*/

                move16();

#if 0

#ifndef FIX_ISSUE_1966

                if ( s_and( k, 1 ) != 0 )

                {

                    phaseDiff[i] = 0 /*0 Q13*/; /*2Q13*/
@@ -849,7 +849,7 @@ static void CalcPowerSpecAndDetectTonalComponents_fx( 
    }



#ifdef DEBUG_ISSUE_1966

    printf( "Before DetectTonalComponents_fx: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

    //printf( "Before DetectTonalComponents_fx: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

#endif

    DetectTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak,

                              (Word16 *) hTonalMDCTConc->pTCI->lowerIndex,
@@ -868,7 +868,7 @@ static void CalcPowerSpecAndDetectTonalComponents_fx( 
                              hTonalMDCTConc->nSamplesCore,

                              floorPowerSpectrum, psychParamsCurrent, element_mode );

#ifdef DEBUG_ISSUE_1966

    printf( "Behind DetectTonalComponents_fx: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

    //printf( "Behind DetectTonalComponents_fx: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

#endif

    FindPhases( hTonalMDCTConc, secondLastMDCT, secondLastMDST, sub( secondLastMDST_exp, secondLastMDCT_exp ) );
@@ -1022,7 +1022,7 @@ void TonalMDCTConceal_Detect_fx( 
    Word32 sns_int_scf_fx[FDNS_NPTS];

#ifdef DEBUG_ISSUE_1966

    Word32 det_way = 0;

    printf( "Calling TonalMDCTConceal_Detect in frame=%d  *numIndices=%d ->numIndexes=%d\n", frame, *numIndices, hTonalMDCTConc->pTCI->numIndexes );

    printf( "Calling TonalMDCTConceal_Detect in frame=%d\n", frame);

#endif

    set32_fx( sns_int_scf_fx, 0, FDNS_NPTS );
@@ -1163,7 +1163,7 @@ void TonalMDCTConceal_Detect_fx( 
                    powerSpectrum_exp = sub( 31, sub( shl( sub( Q31 - 3, powerSpectrum_exp ), 1 ), 31 ) );

                }

#ifdef DEBUG_ISSUE_1966

                printf( "Before RefineTonalComponents: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

                //printf( "Before RefineTonalComponents: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

#endif

                RefineTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak,

                                          (Word16 *) hTonalMDCTConc->pTCI->lowerIndex,
@@ -1184,7 +1184,7 @@ void TonalMDCTConceal_Detect_fx( 
                                          hTonalMDCTConc->nSamplesCore,

                                          extract_l( Mpy_32_16_1( L_mult0( hTonalMDCTConc->nSamples, hTonalMDCTConc->nSamples ), 82 ) ), element_mode, psychParamsCurrent ); /* floorPowerSpectrum */

#ifdef DEBUG_ISSUE_1966

                printf( "After RefineTonalComponents: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

                //printf( "After RefineTonalComponents: hTonalMDCTConc->pTCI->numIndexes=%d\n", hTonalMDCTConc->pTCI->numIndexes );

#endif

            }

        }