Commit ae549108 authored by vaclav's avatar vaclav
Browse files

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

Merge remote-tracking branch 'remotes/origin/main' into 1087-asan-sba-dtx-bitrate-switching-decoding
parents 9692af63 2e1035bc

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -1718,14 +1718,12 @@ static bool parseCmdlIVAS_dec( 
            return false;

        }



#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

        if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

            fprintf( stderr, "Error: Output split rendering metadata file is supported for BINAURAL_SPLIT_PCM output config. only\n\n" );

            usage_dec();

            return false;

        }

#endif

    }

    else

    {
@@ -2040,13 +2038,11 @@ static ivas_error initOnFirstGoodFrame( 
        }

        else

        {

#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

            if ( arg.outputMdFilename == NULL )

            {

                fprintf( stderr, "\nOutput split rendering metadata file not specified\n" );

                return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;

            }

#endif



            if ( ( error = split_rend_writer_open( splitRendWriter,

                                                   arg.outputMdFilename,

lib_com/ivas_dirac_com.c

+0 −4
Original line number Diff line number Diff line
@@ -345,11 +345,7 @@ void ivas_get_dirac_sba_max_md_bits( 
        /* OSBA needs an additional 5-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) -= 7;

#else

            ( *metadata_max_bits ) -= 3;

#endif

        }

    }

    else if ( sba_total_brate <= IVAS_32k )

lib_com/options.h

+3 −5
Original line number Diff line number Diff line
@@ -155,15 +155,15 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#endif



#define FIX_NUM_SUBFRAME_UPDATE

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

#define FIX_1077_MEMORY_TEST_MISSING                    /* orange: issue 1077 : add missing memory test*/

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */
@@ -174,8 +174,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 

#define NONBE_FIX_MC_LFE_LPF                            /* Dlb: Adding the LFE LPF filter back for MC content. */

#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

lib_dec/core_dec_init.c

+0 −4
Original line number Diff line number Diff line
@@ -150,11 +150,7 @@ void open_decoder_LPD( 
    {

        st->gamma = GAMMA16k;

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    else if ( st->element_mode > EVS_MONO && st->sr_core > INT_FS_16k )

#else

    else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT )

#endif

    {

        st->gamma = GAMMA16k;

    }

lib_dec/ivas_binRenderer_internal.c

+14 −14
Original line number Diff line number Diff line
@@ -1677,14 +1677,14 @@ void ivas_binaural_cldfb( 
                    idx_in++;

                }



                if ( st_ivas->hSplitBinRend.hCldfbDataOut != NULL )

                if ( st_ivas->hSplitBinRend->hCldfbDataOut != NULL )

                {

                    for ( ch = 0; ch < ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ); ch++ )

                    {

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_RealBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_ImagBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_RealBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_ImagBuffer[ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                    }

                    st_ivas->hSplitBinRend.hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                    st_ivas->hSplitBinRend->hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                }

            }

#endif
@@ -1694,7 +1694,7 @@ void ivas_binaural_cldfb( 
        ivas_binRenderer(

            st_ivas->hBinRenderer,

#ifdef SPLIT_REND_WITH_HEAD_ROT

            &st_ivas->hSplitBinRend.splitrend.multiBinPoseData,

            &st_ivas->hSplitBinRend->splitrend.multiBinPoseData,

#endif

            st_ivas->hCombinedOrientationData,

            JBM_CLDFB_SLOTS_IN_SUBFRAME,
@@ -1736,8 +1736,8 @@ void ivas_binaural_cldfb( 
                                   maxBand );

                        }



                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][( subframeIdx * JBM_CLDFB_SLOTS_IN_SUBFRAME ) + slot_idx], maxBand );

                    }

                }

            }
@@ -1855,14 +1855,14 @@ void ivas_binaural_cldfb_sf( 
                }



#ifdef SPLIT_REND_WITH_HEAD_ROT

                if ( st_ivas->hSplitBinRend.hCldfbDataOut != NULL )

                if ( st_ivas->hSplitBinRend->hCldfbDataOut != NULL )

                {

                    for ( ch = 0; ch < ( st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe ); ch++ )

                    {

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_RealBuffer[ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend.hCldfbDataOut->Cldfb_ImagBuffer[ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_RealBuffer[ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer[ch][slot_idx], st_ivas->hSplitBinRend->hCldfbDataOut->Cldfb_ImagBuffer[ch][slot_index_start + slot_idx], maxBand );

                    }

                    st_ivas->hSplitBinRend.hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                    st_ivas->hSplitBinRend->hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

                }

#endif

            }
@@ -1873,7 +1873,7 @@ void ivas_binaural_cldfb_sf( 
        ivas_binRenderer(

            st_ivas->hBinRenderer,

#ifdef SPLIT_REND_WITH_HEAD_ROT

            &st_ivas->hSplitBinRend.splitrend.multiBinPoseData,

            &st_ivas->hSplitBinRend->splitrend.multiBinPoseData,

#endif

            st_ivas->hCombinedOrientationData,

            st_ivas->hTcBuffer->subframe_nbslots[subframeIdx],
@@ -1895,8 +1895,8 @@ void ivas_binaural_cldfb_sf( 
                {

                    for ( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ )

                    {

                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend.hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_RealBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                        mvr2r( Cldfb_ImagBuffer_Binaural[pos_idx][ch][slot_idx], st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[( pos_idx * BINAURAL_CHANNELS ) + ch][slot_index_start + slot_idx], maxBand );

                    }

                }

            }