Commit 4778a4da authored by laitinenmik's avatar laitinenmik Committed by Tapani Pihlajakuja
Browse files

Bug fix for separated object panning into mix with 1sepmasa mode

parent 80973a73

lib_enc/ivas_omasa_enc.c

+3 −3
Original line number Diff line number Diff line
@@ -578,6 +578,9 @@ void ivas_omasa_enc( 
        ivas_omasa_energy_and_ratio_est( hOMasa, hMasa->data.hOmasaData, data_in_f, input_frame, nchan_ism );

    }



    /* Downmix */

    ivas_omasa_dmx( data_in_f, data_out_f, input_frame, nchan_transport, nchan_ism, hIsmMeta, hOMasa->prev_object_dm_gains, hOMasa->interpolator );



    /* Move the ISM metadata to the first entry for encoding in the MASA_ONE_OBJ mode */

    if ( ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )

    {
@@ -585,9 +588,6 @@ void ivas_omasa_enc( 
        hIsmMeta[0]->elevation = hIsmMeta[*idx_separated_object]->elevation;

    }



    /* Downmix */

    ivas_omasa_dmx( data_in_f, data_out_f, input_frame, nchan_transport, nchan_ism, hIsmMeta, hOMasa->prev_object_dm_gains, hOMasa->interpolator );



    /* Merge transport signals */

    ivas_merge_masa_transports( data_out_f, &( data_in_f[nchan_ism] ), data_in_f, input_frame, nchan_transport );