Commit bdd6b451 authored by ber's avatar ber
Browse files

add some push/pop wmops

parent b18029e5

lib_dec/ivas_jbm_dec.c

+30 −1
Original line number Diff line number Diff line
@@ -1873,7 +1873,7 @@ ivas_error ivas_jbm_dec_render_fx( 
    move16();

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;



    push_wmops( "ivas_dec_render" );

    push_wmops( "ivas_dec_render (IDR)" );

    /*----------------------------------------------------------------*

     * Initialization of local vars after struct has been set

     *----------------------------------------------------------------*/
@@ -1941,6 +1941,7 @@ ivas_error ivas_jbm_dec_render_fx( 
    }

    ELSE IF( EQ_32( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )

    {

        push_wmops( "IDR: TC_BUFFER_MODE_BUFFER " );

        Word16 slot_size, tmp, e;



        slot_size = st_ivas->hTcBuffer->n_samples_granularity;
@@ -1951,9 +1952,11 @@ ivas_error ivas_jbm_dec_render_fx( 
        tmp = shr( tmp, sub( 15, e ) );



        ivas_jbm_dec_tc_buffer_playout_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, p_output_fx );

        pop_wmops(); /*push_wmops( "IDR: TC_BUFFER_MODE_BUFFER " );*/

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, STEREO_FORMAT ) )

    {

        push_wmops( "IDR: RENDERER_MC " );

        /* Rendering */

        IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) )

        {
@@ -1962,9 +1965,11 @@ ivas_error ivas_jbm_dec_render_fx( 


            ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, *nSamplesRendered, p_tc_fx, p_output_fx );

        }

        pop:wmops(); /*push_wmops( "IDR: RENDERER_MC " );*/

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

    {

        push_wmops( "IDR: ISM_FORMAT " );

        /* Rendering */

        IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) )

        {
@@ -2069,6 +2074,7 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                IF( NE_32( ( error = ivas_td_binaural_renderer_sf_fx( st_ivas, p_output_fx, *nSamplesRendered ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: ISM_FORMAT " );*/

                    return error;

                }

            }
@@ -2092,6 +2098,7 @@ ivas_error ivas_jbm_dec_render_fx( 
                }

                IF( NE_32( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR, st_ivas->hDecoderConfig, NULL, NULL, NULL, st_ivas->hTcBuffer, p_output_fx, p_output_fx, *nSamplesRendered, output_Fs ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: ISM_FORMAT " );*/

                    return error;

                }

                FOR( i = 0; i < nchan_out; i++ )
@@ -2100,9 +2107,11 @@ ivas_error ivas_jbm_dec_render_fx( 
                }

            }

        }

        pop_wmops(); /*push_wmops( "IDR: ISM_FORMAT " );*/

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )

    {

        push_wmops( "IDR: SBA_FORMAT || MASA_FORMAT " );

        nchan_remapped = nchan_transport;

        move16();

        test();
@@ -2124,6 +2133,7 @@ ivas_error ivas_jbm_dec_render_fx( 
                }

                IF( NE_32( ( error = ivas_sba_linear_renderer_fx( p_output_fx, *nSamplesRendered, nchan_remapped, 0, output_config, st_ivas->hOutSetup ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: SBA_FORMAT || MASA_FORMAT " );*/

                    return error;

                }

            }
@@ -2136,12 +2146,15 @@ ivas_error ivas_jbm_dec_render_fx( 
        {

            IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )

            {

                pop_wmops(); /*push_wmops( "IDR: SBA_FORMAT || MASA_FORMAT " );*/

                return error;

            }

        }

        pop_wmops(); /*push_wmops( "IDR: SBA_FORMAT || MASA_FORMAT " );*/

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )

    {

        push_wmops( "IDR: MASA_ISM_FORMAT " );

        nchan_remapped = st_ivas->nchan_transport;

        move16();

        test();
@@ -2153,6 +2166,7 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                IF( NE_32( ( error = ivas_omasa_dirac_td_binaural_jbm_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output_fx ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: MASA_ISM_FORMAT " );*/

                    return error;

                }

            }
@@ -2165,9 +2179,11 @@ ivas_error ivas_jbm_dec_render_fx( 
        {

            ivas_omasa_dirac_rend_jbm_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output_fx );

        }

        pop_wmops(); /*push_wmops( "IDR: MASA_ISM_FORMAT " );*/

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

    {

        push_wmops( "IDR: SBA_ISM_FORMAT " );

        nchan_remapped = nchan_transport;

        move16();

        /* Loudspeakers, Ambisonics or Binaural rendering */
@@ -2184,6 +2200,7 @@ ivas_error ivas_jbm_dec_render_fx( 


                IF( NE_32( ( error = ivas_osba_dirac_td_binaural_jbm_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: SBA_ISM_FORMAT " );*/

                    return error;

                }

            }
@@ -2215,6 +2232,7 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                IF( NE_32( ( error = ivas_osba_render_sf_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: SBA_ISM_FORMAT " );*/

                    return error;

                }

            }
@@ -2222,6 +2240,7 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, &p_output_fx[st_ivas->nchan_ism], 960 ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: SBA_ISM_FORMAT " );*/

                    return error;

                }
@@ -2234,6 +2253,7 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: SBA_ISM_FORMAT " );*/

                    return error;

                }

            }
@@ -2246,6 +2266,7 @@ ivas_error ivas_jbm_dec_render_fx( 
        {

            IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx, 960 ) ), IVAS_ERR_OK ) )

            {

                pop_wmops(); /*push_wmops( "IDR: SBA_ISM_FORMAT " );*/

                return error;

            }
@@ -2261,9 +2282,11 @@ ivas_error ivas_jbm_dec_render_fx( 
                }

            }

        }

        pop_wmops(); /*push_wmops( "IDR: SBA_ISM_FORMAT " );*/

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )

    {

        push_wmops( "IDR: MC_FORMAT " );

        IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )

        {

            Word16 crendInPlaceRotation = FALSE;
@@ -2296,10 +2319,12 @@ ivas_error ivas_jbm_dec_render_fx( 
                move16();

                IF( NE_32( ( error = getAudioConfigNumChannels( st_ivas->intern_config, &nchan_in ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: MC_FORMAT " );*/

                    return error;

                }

                IF( NE_32( ( error = getAudioConfigNumChannels( st_ivas->hOutSetup.output_config, &nchan_out ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: MC_FORMAT " );*/

                    return error;

                }

                exp = sub( exp, gd_bits );
@@ -2318,6 +2343,7 @@ ivas_error ivas_jbm_dec_render_fx( 
                                                                     &st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output_fx : p_tc_fx, p_output_fx, *nSamplesRendered, output_Fs ) ),

                           IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: MC_FORMAT " );*/

                    return error;

                }
@@ -2347,6 +2373,7 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                IF( NE_32( ( error = ivas_td_binaural_renderer_sf_fx( st_ivas, p_output_fx, *nSamplesRendered ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: MC_FORMAT " );*/

                    return error;

                }
@@ -2376,6 +2403,7 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                IF( NE_32( ( error = ivas_td_binaural_renderer_fx( st_ivas, p_output_fx, *nSamplesRendered ) ), IVAS_ERR_OK ) )

                {

                    pop_wmops(); /*push_wmops( "IDR: MC_FORMAT " );*/

                    return error;

                }
@@ -2550,6 +2578,7 @@ ivas_error ivas_jbm_dec_render_fx( 
                }

            }

        }

        pop_wmops(); /*push_wmops( "IDR: MC_FORMAT " );*/

    }



    /*----------------------------------------------------------------*