Commit d477fa65 authored by vaclav's avatar vaclav
Browse files

fix MC brate switching

parent 5197c31f

lib_dec/ivas_init_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ ivas_error ivas_dec_get_format( 
    int16_t sba_order, sba_analysis_order;

    int32_t ivas_total_brate;

    uint16_t *bit_stream_orig;

    AUDIO_CONFIG signaled_config;



    num_bits_read = 0;

    element_mode_flag = 0;
@@ -251,8 +252,8 @@ ivas_error ivas_dec_get_format( 
            }

            num_bits_read += MC_LS_SETUP_BITS;



            /* set transported MC LS setup */

            st_ivas->transport_config = ivas_mc_map_ls_setup_to_output_config( idx );

            signaled_config = ivas_mc_map_ls_setup_to_output_config( idx );

            st_ivas->mc_mode = ivas_mc_mode_select( ivas_mc_map_output_config_to_mc_ls_setup( signaled_config ), st_ivas->hDecoderConfig->ivas_total_brate );

        }



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

lib_dec/lib_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1064,6 +1064,7 @@ ivas_error IVAS_DEC_ReadFormat( 
    Decoder_Struct *st_ivas;

    IVAS_FORMAT ivas_format_old;

    ISM_MODE ism_mode_old;

    MC_MODE mc_mode_old;

    int16_t nchan_transport_old;

    AUDIO_CONFIG intern_config_old;

    RENDERER_TYPE renderer_type_old;
@@ -1076,6 +1077,7 @@ ivas_error IVAS_DEC_ReadFormat( 
    st_ivas = hIvasDec->st_ivas;

    ivas_format_old = st_ivas->ivas_format;

    ism_mode_old = st_ivas->ism_mode;

    mc_mode_old = st_ivas->mc_mode;

    nchan_transport_old = st_ivas->nchan_transport;

    intern_config_old = st_ivas->intern_config;

    renderer_type_old = st_ivas->renderer_type;
@@ -1123,6 +1125,7 @@ ivas_error IVAS_DEC_ReadFormat( 
    }



    st_ivas->ism_mode = ism_mode_old;

    st_ivas->mc_mode = mc_mode_old;

    st_ivas->nchan_transport = nchan_transport_old;

    st_ivas->intern_config = intern_config_old;

    st_ivas->renderer_type = renderer_type_old;