Commit 24966dbc authored by advasila's avatar advasila
Browse files

fix OMASA for MASA 1 TC

parent 27c6afae

lib_enc/ivas_enc.c

+8 −7
Original line number Diff line number Diff line
@@ -298,6 +298,14 @@ ivas_error ivas_enc( 


        flag_omasa_ener_brate = 0;



        /* Stereo transport is used also with monoMASA, duplicate mono if monoMASA */

        if ( ( st_ivas->hEncoderConfig->nchan_inp - hEncoderConfig->nchan_ism ) == 1 )

        {

            v_multc( data_f[hEncoderConfig->nchan_ism], 1.0f / SQRT2, data_f[hEncoderConfig->nchan_ism], input_frame );

            mvr2r( data_f[hEncoderConfig->nchan_ism], data_f[hEncoderConfig->nchan_ism + 1], input_frame );

        }





        /* Estimate TF-tile energy for the input MASA stream */

        ivas_masa_estimate_energy( st_ivas->hMasa, &( data_f[hEncoderConfig->nchan_ism] ), input_frame, st_ivas->nchan_transport );
@@ -306,13 +314,6 @@ ivas_error ivas_enc( 
            return error;

        }



        /* Stereo transport is used also with monoMASA, duplicate mono if monoMASA */

        if ( ( st_ivas->hEncoderConfig->nchan_inp - hEncoderConfig->nchan_ism ) == 1 )

        {

            v_multc( data_f[hEncoderConfig->nchan_ism], 1.0f / SQRT2, data_f[hEncoderConfig->nchan_ism], input_frame );

            mvr2r( data_f[hEncoderConfig->nchan_ism], data_f[hEncoderConfig->nchan_ism + 1], input_frame );

        }



        set_s( nb_bits_metadata, 0, MAX_SCE + 1 );

        idx_separated_object = 0;