Loading lib_dec/ivas_dec.c +2 −2 Original line number Diff line number Diff line Loading @@ -730,7 +730,7 @@ ivas_error ivas_dec( #endif /* HP filtering */ for ( n = 0; n < getNumChanSynthesis( st_ivas ); n++ ) /*TODOfto:check what needs to be filtered here*/ for ( n = 0; n < getNumChanSynthesis( st_ivas ); n++ ) { hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); } Loading Loading @@ -839,7 +839,7 @@ ivas_error ivas_dec( } } #endif else /*HOA3 rendering for now*/ else /*EXT output = individual objects + HOA3*/ { #ifdef OSBA_EXT_OUT for ( n = 0; n < nchan_ism; n++ ) Loading lib_dec/ivas_init_dec.c +1 −3 Original line number Diff line number Diff line Loading @@ -1001,7 +1001,7 @@ ivas_error ivas_init_decoder( #ifdef OSBA_EXT_OUT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { hDecoderConfig->nchan_out = audioCfg2channels( AUDIO_CONFIG_HOA3 ); /*TODOfto: only hoa3 ouput for now*/ hDecoderConfig->nchan_out = audioCfg2channels( AUDIO_CONFIG_HOA3 ); hDecoderConfig->nchan_out += st_ivas->nchan_ism; } else Loading Loading @@ -1441,12 +1441,10 @@ ivas_error ivas_init_decoder( /* set CNA/CNG flags */ ivas_sba_set_cna_cng_flag( st_ivas ); #if 1 /*TODOfto: is this neede for OSBA?*/ if ( ( error = ivas_masa_ism_data_open( st_ivas ) ) != IVAS_ERR_OK ) { return error; } #endif } #endif #ifdef MASA_AND_OBJECTS Loading lib_enc/ivas_init_enc.c +1 −1 Original line number Diff line number Diff line Loading @@ -682,7 +682,7 @@ ivas_error ivas_init_encoder( st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); if ( ( error = ivas_spar_enc_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) /*TODOfto:remove this*/ if ( ( error = ivas_spar_enc_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) { return error; } Loading lib_enc/ivas_ism_metadata_enc.c +1 −1 Original line number Diff line number Diff line Loading @@ -267,7 +267,7 @@ ivas_error ivas_ism_metadata_enc( if ( hIsmMeta[ch]->ism_metadata_flag == 1 ) { #ifdef OSBA_DISC_OBJ_MCT if ( ism_mode != ISM_SBA_MODE_DISC ) /*TODOfto this may cost a few bits but it is supposed to be for the higher bitrates anyway*/ if ( ism_mode != ISM_SBA_MODE_DISC ) #endif { /* In case of low level noise for low bitrate inactive frames, do not sent metadata */ Loading lib_enc/ivas_mct_core_enc.c +1 −1 Original line number Diff line number Diff line Loading @@ -495,7 +495,7 @@ void ivas_mct_core_enc( nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; nAvailBits -= SBA_ORDER_BITS + SBA_PLANAR_BITS; #ifdef SBA_AND_OBJECTS if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 ) /*TODOfto: recheck this condition*/ if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 ) { nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS; } Loading Loading
lib_dec/ivas_dec.c +2 −2 Original line number Diff line number Diff line Loading @@ -730,7 +730,7 @@ ivas_error ivas_dec( #endif /* HP filtering */ for ( n = 0; n < getNumChanSynthesis( st_ivas ); n++ ) /*TODOfto:check what needs to be filtered here*/ for ( n = 0; n < getNumChanSynthesis( st_ivas ); n++ ) { hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs ); } Loading Loading @@ -839,7 +839,7 @@ ivas_error ivas_dec( } } #endif else /*HOA3 rendering for now*/ else /*EXT output = individual objects + HOA3*/ { #ifdef OSBA_EXT_OUT for ( n = 0; n < nchan_ism; n++ ) Loading
lib_dec/ivas_init_dec.c +1 −3 Original line number Diff line number Diff line Loading @@ -1001,7 +1001,7 @@ ivas_error ivas_init_decoder( #ifdef OSBA_EXT_OUT if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { hDecoderConfig->nchan_out = audioCfg2channels( AUDIO_CONFIG_HOA3 ); /*TODOfto: only hoa3 ouput for now*/ hDecoderConfig->nchan_out = audioCfg2channels( AUDIO_CONFIG_HOA3 ); hDecoderConfig->nchan_out += st_ivas->nchan_ism; } else Loading Loading @@ -1441,12 +1441,10 @@ ivas_error ivas_init_decoder( /* set CNA/CNG flags */ ivas_sba_set_cna_cng_flag( st_ivas ); #if 1 /*TODOfto: is this neede for OSBA?*/ if ( ( error = ivas_masa_ism_data_open( st_ivas ) ) != IVAS_ERR_OK ) { return error; } #endif } #endif #ifdef MASA_AND_OBJECTS Loading
lib_enc/ivas_init_enc.c +1 −1 Original line number Diff line number Diff line Loading @@ -682,7 +682,7 @@ ivas_error ivas_init_encoder( st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->hEncoderConfig->sba_order ); if ( ( error = ivas_spar_enc_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) /*TODOfto:remove this*/ if ( ( error = ivas_spar_enc_open( st_ivas, 0 ) ) != IVAS_ERR_OK ) { return error; } Loading
lib_enc/ivas_ism_metadata_enc.c +1 −1 Original line number Diff line number Diff line Loading @@ -267,7 +267,7 @@ ivas_error ivas_ism_metadata_enc( if ( hIsmMeta[ch]->ism_metadata_flag == 1 ) { #ifdef OSBA_DISC_OBJ_MCT if ( ism_mode != ISM_SBA_MODE_DISC ) /*TODOfto this may cost a few bits but it is supposed to be for the higher bitrates anyway*/ if ( ism_mode != ISM_SBA_MODE_DISC ) #endif { /* In case of low level noise for low bitrate inactive frames, do not sent metadata */ Loading
lib_enc/ivas_mct_core_enc.c +1 −1 Original line number Diff line number Diff line Loading @@ -495,7 +495,7 @@ void ivas_mct_core_enc( nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED; nAvailBits -= SBA_ORDER_BITS + SBA_PLANAR_BITS; #ifdef SBA_AND_OBJECTS if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 ) /*TODOfto: recheck this condition*/ if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 ) { nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS; } Loading