Commit 3f489e38 authored by vaclav's avatar vaclav
Browse files

maintenance

parent cf473bd0

apps/decoder.c

+0 −1
Original line number Diff line number Diff line
@@ -2329,7 +2329,6 @@ static ivas_error decodeG192( 
        }

    }

#endif



#endif

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

     * Loop for every packet (frame) of bitstream data

lib_dec/ivas_binRenderer_internal.c

+2 −4
Original line number Diff line number Diff line
@@ -1233,9 +1233,8 @@ ivas_error ivas_binRenderer_open( 
                                                  pRoomAcoustics,

                                                  st_ivas->hDecoderConfig->output_Fs,

                                                  st_ivas->hHrtfFastConv->fastconvReverberationTimes,

                                                  st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections

                                                  st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections,

#ifdef FIX_1139_REV_COLORATION_SHORT_T60

                                                  ,

                                                  hBinRenderer->earlyPartEneCorrection

#endif

                                                  ) ) != IVAS_ERR_OK )
@@ -1247,9 +1246,8 @@ ivas_error ivas_binRenderer_open( 
                                                  &( st_ivas->hRenderConfig->roomAcoustics ),

                                                  st_ivas->hDecoderConfig->output_Fs,

                                                  st_ivas->hHrtfFastConv->fastconvReverberationTimes,

                                                  st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections

                                                  st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections,

#ifdef FIX_1139_REV_COLORATION_SHORT_T60

                                                  ,

                                                  hBinRenderer->earlyPartEneCorrection

#endif

                                                  ) ) != IVAS_ERR_OK )

lib_dec/ivas_masa_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ ivas_error ivas_masa_decode( 
                                ( *nb_bits_read ) += ISM_METADATA_INACTIVE_FLAG_BITS;

                            }

                        }



                        st_ivas->flag_omasa_brate = 0;

                        if ( st_ivas->nchan_ism >= 3 && ivas_total_brate == IVAS_128k )

                        {

lib_dec/ivas_stat_dec.h

+2 −3
Original line number Diff line number Diff line
@@ -1108,6 +1108,7 @@ typedef struct Decoder_Struct 
    int16_t sba_planar;                                     /* Ambisonic (SBA) planar flag */

    int16_t sba_analysis_order;                             /* Ambisonic (SBA) order used for analysis and coding */

    int16_t sba_dirac_stereo_flag;                          /* flag indicating stereo output for SBA DirAC modes with 1 TC */

    int16_t flag_omasa_brate;                               /* OMASA bitrate adjustment flag */



    /* rendering modules */

    RENDERER_TYPE renderer_type;                               /* renderer type */
@@ -1139,8 +1140,6 @@ typedef struct Decoder_Struct 
    MASA_ISM_DATA_HANDLE hMasaIsmData;                         /* OMASA rendering handle */

    SBA_ISM_DATA_HANDLE hSbaIsmData;                           /* OSBA rendering handle */   



    int16_t flag_omasa_brate;



    ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE hSplitBinRend;          /* ISAR split binaural rendering handle */

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hTdRendHandles[MAX_HEAD_ROT_POSES - 1]; /* TD object renderer handles */

lib_dec/lib_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -1833,6 +1833,7 @@ ivas_error IVAS_DEC_GetSamples( 
#else

        nOutChannels = (uint8_t) hIvasDec->st_ivas->hDecoderConfig->nchan_out;

        hIvasDec->hasBeenFedFrame = false;



        /* check for possible flushed samples from a rate switch */

        if ( hIvasDec->nSamplesFlushed > 0 )

        {
@@ -2127,12 +2128,12 @@ static ivas_error IVAS_DEC_Setup( 
    ivas_error error;

    Decoder_Struct *st_ivas;



#ifndef FIX_HRTF_LOAD

    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifndef FIX_HRTF_LOAD

    *nSamplesRendered = 0;

#endif

    if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )