Commit 0a93dc25 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 775-osba-bitrate-switching-crashes-with-foa-and-hoa2-output-with-higher-order-input
parents ad4fcda0 e5f1900f

apps/decoder.c

+192 −281

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+8 −21
Original line number Diff line number Diff line
@@ -406,16 +406,7 @@ int main( 
            }

            break;

        case IVAS_ENC_INPUT_SBA:

            if ( ( error =

                       IVAS_ENC_ConfigureForAmbisonics(

                           hIvasEnc,

                           arg.inputFs,

                           totalBitrate,

                           arg.max_bwidth_user,

                           bandwidth,

                           arg.dtxConfig,

                           arg.inputFormatConfig.sba.order,

                           arg.inputFormatConfig.sba.isPlanar,

            if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar,

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

                                                            arg.agc,

#endif
@@ -445,7 +436,6 @@ int main( 
                goto cleanup;

            }

            break;



        case IVAS_ENC_INPUT_SBA_ISM:

            if ( ( error = IVAS_ENC_ConfigureForSBAObjects( hIvasEnc, arg.inputFs, totalBitrate, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba_ism.numObjects, arg.inputFormatConfig.sba_ism.order, arg.inputFormatConfig.sba_ism.isPlanar, arg.pca ) ) != IVAS_ERR_OK )

            {
@@ -453,7 +443,6 @@ int main( 
                exit( -1 );

            }

            break;



        case IVAS_ENC_INPUT_MASA_ISM:

            if ( ( error = IVAS_ENC_ConfigureForMASAObjects( hIvasEnc, arg.inputFs, totalBitrate, bandwidth, arg.dtxConfig, arg.inputFormatConfig.masa_ism.numObjects, arg.inputFormatConfig.masa_ism.masaVariant ) ) != IVAS_ERR_OK )

            {
@@ -461,7 +450,6 @@ int main( 
                exit( -1 );

            }

            break;



        default:

            fprintf( stderr, "\nInvalid input type\n\n" );

            goto cleanup;
@@ -512,6 +500,7 @@ int main( 
        fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



    int16_t inFileNumChannels = 0;

    error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels );

    switch ( error )
@@ -546,9 +535,7 @@ int main( 
        }

    }



    const int16_t numIsmInputs = ( arg.inputFormat == IVAS_ENC_INPUT_ISM || arg.inputFormat == IVAS_ENC_INPUT_MASA_ISM || arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM )

                                     ? arg.inputFormatConfig.ism.numObjects

                                     : 0;

    const int16_t numIsmInputs = ( arg.inputFormat == IVAS_ENC_INPUT_ISM || arg.inputFormat == IVAS_ENC_INPUT_MASA_ISM || arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM ) ? arg.inputFormatConfig.ism.numObjects : 0;



    for ( i = 0; i < numIsmInputs; ++i )

    {

apps/renderer.c

+127 −84

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/bitstream.c

+2 −4
Original line number Diff line number Diff line
@@ -1662,8 +1662,7 @@ static ivas_error write_indices_element( 
            reset_indices_enc( st_ivas->hSCE[element_id]->hMetaData, st_ivas->hSCE[element_id]->hMetaData->nb_ind_tot );

        }



        reset_indices_enc( sts[0]->hBstr,

                           sts[0]->hBstr->nb_ind_tot );

        reset_indices_enc( sts[0]->hBstr, sts[0]->hBstr->nb_ind_tot );

    }

    else

    {
@@ -1674,8 +1673,7 @@ static ivas_error write_indices_element( 


        for ( n = 0; n < n_channels; n++ )

        {

            reset_indices_enc( sts[n]->hBstr,

                               sts[n]->hBstr->nb_ind_tot );

            reset_indices_enc( sts[n]->hBstr, sts[n]->hBstr->nb_ind_tot );

        }

    }

lib_com/ivas_arith.c

+13 −0
Original line number Diff line number Diff line
@@ -95,6 +95,12 @@ static uint16_t ivas_ari_get_symbol( 
}





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

 * Function ivas_ari_decode_14bits_bit_ext_1_lfe()

 *

 *

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



uint16_t ivas_ari_decode_14bits_bit_ext_1_lfe(

    Decoder_State *st,

    Tastat *s,
@@ -164,6 +170,12 @@ uint16_t ivas_ari_decode_14bits_bit_ext_1_lfe( 
}





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

 * Function ivas_ari_done_decoding_14bits_ext_1_lfe()

 *

 *

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



void ivas_ari_done_decoding_14bits_ext_1_lfe(

    Decoder_State *st,

    const int16_t extra_bits_read )
@@ -216,6 +228,7 @@ void ivas_ari_done_encoding_14bits( 
    return;

}





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

 * Function ivas_ari_encode_14bits_ext()

 *