Commit cfd6eeef authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix compile errors

parent c2956a92

lib_dec/ivas_jbm_dec.c

+6 −18
Original line number Diff line number Diff line
@@ -3068,20 +3068,12 @@ void ivas_jbm_dec_prepare_renderer( 
            ivas_ism_dec_digest_tc( st_ivas );



            /* delay the objects here for all renderers where it is needed */

            if (

#ifdef SPLIT_REND_WITH_HEAD_ROT

                (

#endif

                    st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ||

            if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ||

                   st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ||

                   st_ivas->renderer_type == RENDERER_OSBA_AMBI ||

                   st_ivas->renderer_type == RENDERER_OSBA_LS ||

                    st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL

#ifdef SPLIT_REND_WITH_HEAD_ROT

                    ) &&

                ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#endif

            )

                   st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL ) &&

                 ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

            {

                for ( n = 0; n < st_ivas->nchan_ism; n++ )

                {
@@ -3150,14 +3142,10 @@ void ivas_jbm_dec_prepare_renderer( 
                    {

                        v_multc( st_ivas->hTcBuffer->tc[CPE_CHANNELS + n], OMASA_TDREND_MATCHING_GAIN, st_ivas->hTcBuffer->tc[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available );

                    }

#ifdef SPLIT_REND_WITH_HEAD_ROT

                    if ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

                    {

#endif

                        delay_signal( st_ivas->hTcBuffer->tc[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );

#ifdef SPLIT_REND_WITH_HEAD_ROT

                    }

#endif

                }

            }

        }

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
    uint16_t *serial,                           /* i  : buffer containing serial input bitstream. Each bit should be stored as a single uint16_t value  */

    const uint16_t num_bits,                    /* i  : number of bits in input bitstream                                       */

    int16_t bfi                                 /* i  : bad frame indicator flag                                                */

#if defined( OBJ_EDITING_API ) && defined( SPLIT_REND_WITH_HEAD_ROT )

#if defined( OBJ_EDITING_API )

    ,

    int16_t isSplitRend,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits