Commit 6318d90e authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict

parents 3fabbf35 398d808c

Workspace_msvc/lib_enc.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs_fx.c" />

    <ClCompile Include="..\lib_enc\cod4t64_fast_fx.c" />

    <ClCompile Include="..\lib_enc\igf_scf_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ivas_core_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ivas_cpe_enc_fx.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ 
    <ClCompile Include="..\lib_enc\igf_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\igf_scf_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\igf_scf_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

apps/decoder.c

+10 −1
Original line number Diff line number Diff line
@@ -2962,6 +2962,10 @@ static ivas_error decodeVoIP( 


            *phIvasDec = hIvasDec; /* Update for main()' s free */

            ivasRtp.restartNeeded = false;

#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

            bitstreamReadDone = false;

            parametersAvailableForEditing = false;

#endif

        }



        /* reference vector */
@@ -3211,6 +3215,10 @@ static ivas_error decodeVoIP( 
                    }



                    *phIvasDec = hIvasDec; /* Update for main()' s free */

#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

                    bitstreamReadDone = false;

                    parametersAvailableForEditing = false;

#endif

                }



                /* Placeholder for memory reallocation */
@@ -3974,12 +3982,13 @@ static ivas_error restartDecoder( 
        }

    }



#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }



#endif

    /* ISAR frame size is set from command line, not renderer config file.

     * This will be ignored if output format is not split rendering. */

    if ( renderConfig != NULL )

lib_com/bitstream_fx.c

+12 −9
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static Word16 rate2AMRWB_IOmode( 
        case ACELP_23k85:

            return AMRWB_IO_2385;

        default:

            break;

            BREAK;

    }



    return -1;
@@ -298,7 +298,7 @@ Word16 rate2EVSmode( 
        case HQ_128k:

            return PRIMARY_128000;

        default:

            break;

            BREAK;

    }



    if ( is_amr_wb != NULL )
@@ -3206,12 +3206,15 @@ Word16 find_indice( 
{

    Word16 i;



    for ( i = 0; i < hBstr->nb_ind_tot; i++ )

    FOR( i = 0; i < hBstr->nb_ind_tot; i++ )

    {

        if ( hBstr->ind_list[i].id == id && hBstr->ind_list[i].nb_bits > 0 )

        test();

        IF( EQ_16( hBstr->ind_list[i].id, id ) && hBstr->ind_list[i].nb_bits > 0 )

        {

            *value = hBstr->ind_list[i].value;

            *nb_bits = hBstr->ind_list[i].nb_bits;

            move16();

            move16();

            return i;

        }

    }
@@ -3273,7 +3276,7 @@ UWord16 delete_indice( 
#endif

    }



    return i - j;

    return sub( i, j );

}
@@ -3949,13 +3952,13 @@ static void decoder_selectCodec( 
                case 2800:

                    st->codec_mode = MODE1;

                    move16();

                    break;

                    BREAK;

                default: /* validate that total_brate (derived from RTP packet or a file header) is one of the defined bitrates  */

                    st->codec_mode = st->last_codec_mode;

                    move16();

                    st->bfi = 1;

                    move16();

                    break;

                    BREAK;

            }

        }

    }
@@ -4417,7 +4420,7 @@ void ivas_set_bitstream_pointers( 
    num_bits = 0;



    /* set bitstream pointers for SCEs */

    for ( k = 0; k < st_ivas->nSCE; k++ )

    FOR( k = 0; k < st_ivas->nSCE; k++ )

    {

        sts = st_ivas->hSCE[k]->hCoreCoder;

        sts[0]->bit_stream = st_ivas->bit_stream + num_bits;
@@ -4425,7 +4428,7 @@ void ivas_set_bitstream_pointers( 
    }



    /* set bitstream pointers for CPEs */

    for ( k = 0; k < st_ivas->nCPE; k++ )

    FOR( k = 0; k < st_ivas->nCPE; k++ )

    {

        sts = st_ivas->hCPE[k]->hCoreCoder;

        sts[0]->bit_stream = st_ivas->bit_stream + num_bits;

lib_com/cng_exc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -872,11 +872,7 @@ void cng_params_upd_fx( 
            Word16 index = 0;

            move32();

            move16();

#ifdef HARM_2456_APPLY_SCALE

            index = apply_scale_ind( &att_fx, bwidth, last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );

#else

            apply_scale_ivas_fx( &att_fx, bwidth, last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO, &index );

#endif

            att_fx = pow_10_q23[index]; // Q23

            move32();

            tmp = extract_h( att_fx ); // Q7