Commit b560fbd9 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

fix compiler error for rotateFrame_()

parent 1af1f798

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -4516,7 +4516,9 @@ ivas_error ivas_headTrack_open( 
void rotateFrame_shd(

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,                      /* i  : head track handle                                       */

    float output[][L_FRAME48k],                                 /* i/o: unrotated HOA3 signal buffer in TD                      */

#ifndef EXT_RENDERER

    const int32_t output_fs,                                    /* i  : output sampling frequency                               */

#endif

    const int16_t subframe_len,                                 /* i  : subframe length per channel                             */

    const IVAS_OUTPUT_SETUP hTransSetup,                        /* i  : format for rotation                                     */

    const int16_t subframe_idx                                  /* i  : subframe index                                          */
@@ -4525,7 +4527,9 @@ void rotateFrame_shd( 
void rotateFrame_sd(

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,                      /* i  : head track handle                                       */

    float output[][L_FRAME48k],                                 /* i/o: unrotated SD signal buffer in TD                        */

#ifndef EXT_RENDERER

    const int32_t output_fs,                                    /* i  : output sampling frequency                               */

#endif

    const int16_t subframe_len,                                 /* i  : subframe length per channel                             */

    const IVAS_OUTPUT_SETUP hTransSetup,                        /* i  : format for rotation                                     */

    const EFAP_HANDLE hEFAPdata,                                /* i  : EFAP structure                                          */

lib_rend/ivas_crend.c

+8 −0
Original line number Diff line number Diff line
@@ -1073,12 +1073,20 @@ ivas_error ivas_crend_process( 
            */

            if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 )

            {

#ifdef EXT_RENDERER

                rotateFrame_shd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, subframe_idx );

#else

                rotateFrame_shd( st_ivas->hHeadTrackData, output, st_ivas->hDecoderConfig->output_Fs, subframe_len, st_ivas->hIntSetup, subframe_idx );

#endif

            }

            /* Rotation in SD for MC -> BINAURAL_ROOM */

            else if ( st_ivas->ivas_format != ISM_FORMAT && st_ivas->hIntSetup.is_loudspeaker_setup )

            {

#ifdef EXT_RENDERER

                rotateFrame_sd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, st_ivas->hEFAPdata, subframe_idx );

#else

                rotateFrame_sd( st_ivas->hHeadTrackData, output, st_ivas->hDecoderConfig->output_Fs, subframe_len, st_ivas->hIntSetup, st_ivas->hEFAPdata, subframe_idx );

#endif

            }

        }

lib_rend/ivas_rotation.c

+4 −0
Original line number Diff line number Diff line
@@ -302,7 +302,9 @@ void rotateAziEle_DirAC( 
void rotateFrame_shd(

    HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i  : head track handle                  */

    float output[][L_FRAME48k],            /* i/o: unrotated HOA3 signal buffer in TD */

#ifndef EXT_RENDERER

    const int32_t output_fs,               /* i  : output sampling frequency          */

#endif

    const int16_t subframe_len,            /* i  : subframe length per channel        */

    const IVAS_OUTPUT_SETUP hTransSetup,   /* i  : format for rotation                */

    const int16_t subframe_idx             /* i  : subframe index                     */
@@ -435,7 +437,9 @@ void rotateFrame_shd( 
void rotateFrame_sd(

    HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i  : head track handle                */

    float output[][L_FRAME48k],            /* i/o: unrotated SD signal buffer in TD */

#ifndef EXT_RENDERER

    const int32_t output_Fs,               /* i  : output sampling frequency        */

#endif

    const int16_t subframe_len,            /* i  : subframe length per channel      */

    const IVAS_OUTPUT_SETUP hTransSetup,   /* i  : format for rotation              */

    const EFAP_HANDLE hEFAPdata,           /* i  : EFAP structure                   */

lib_rend/lib_rend.c

+3 −3
Original line number Diff line number Diff line
@@ -1835,7 +1835,7 @@ static void renderAmbiToBinaural( 
            {

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

                {

                    rotateFrame_sd( st->decDummyAmbiBin->hHeadTrackData, tmpBuffer, st->sampleRate, subFrameLength, st->decDummyAmbiBin->hIntSetup, st->decDummyAmbiBin->hEFAPdata, i );

                    rotateFrame_sd( st->decDummyAmbiBin->hHeadTrackData, tmpBuffer, subFrameLength, st->decDummyAmbiBin->hIntSetup, st->decDummyAmbiBin->hEFAPdata, i );

                }

            }

        }
@@ -1845,7 +1845,7 @@ static void renderAmbiToBinaural( 
            {

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

                {

                    rotateFrame_shd( st->decDummyAmbiBin->hHeadTrackData, tmpBuffer, st->sampleRate, subFrameLength, st->decDummyAmbiBin->hTransSetup, i );

                    rotateFrame_shd( st->decDummyAmbiBin->hHeadTrackData, tmpBuffer, subFrameLength, st->decDummyAmbiBin->hTransSetup, i );

                }

            }

        }
@@ -1901,7 +1901,7 @@ static void renderChannelsToBinaural( 
        {

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

            {

                rotateFrame_sd( st->decDummyMcBin->hHeadTrackData, tmpBuffer, st->sampleRate, subFrameLength, st->decDummyMcBin->hTransSetup, st->decDummyMcBin->hEFAPdata, i );

                rotateFrame_sd( st->decDummyMcBin->hHeadTrackData, tmpBuffer, subFrameLength, st->decDummyMcBin->hTransSetup, st->decDummyMcBin->hEFAPdata, i );

            }

        }