Commit 9d26ba65 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix compiler warning

parent 65edca7a

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -2773,8 +2773,12 @@ void reset_metadata_spatial( 
    int32_t *total_brate,                                       /* o  : total bitrate                           */

    const int32_t core_brate,                                   /* i  : core bitrate                            */

    const int16_t nb_bits_metadata,                             /* i  : number of meatdata bits                 */

#ifndef ALIGN_SID_SIZE

    const SBA_MODE sba_mode,                                    /* i  : SBA mode                                */

    const int16_t element_mode                                  /* i  : element mode                            */

#else

    const SBA_MODE sba_mode                                     /* i  : SBA mode                                */

#endif

);



/*! r: number of bits written */

lib_enc/ivas_cpe_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -460,7 +460,11 @@ ivas_error ivas_cpe_enc( 
    {

        if ( hCPE->element_mode == IVAS_CPE_DFT || hCPE->element_mode == IVAS_CPE_TD )

        {

#ifdef ALIGN_SID_SIZE

            reset_metadata_spatial( ivas_format, hCPE->hMetaData, hCPE->element_brate, &tmp, sts[0]->core_brate, nb_bits_metadata, st_ivas->sba_mode );

#else

            reset_metadata_spatial( ivas_format, hCPE->hMetaData, hCPE->element_brate, &tmp, sts[0]->core_brate, nb_bits_metadata, st_ivas->sba_mode, hCPE->element_mode );

#endif

        }

    }
@@ -472,7 +476,11 @@ ivas_error ivas_cpe_enc( 
        /* Reset metadata */

        if ( sts[0]->cng_sba_flag || ( ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) )

        {

#ifdef ALIGN_SID_SIZE

            reset_metadata_spatial( ivas_format, hCPE->hMetaData, hCPE->element_brate, &tmp, sts[0]->core_brate, nb_bits_metadata, st_ivas->sba_mode );

#else

            reset_metadata_spatial( ivas_format, hCPE->hMetaData, hCPE->element_brate, &tmp, sts[0]->core_brate, nb_bits_metadata, st_ivas->sba_mode, hCPE->element_mode );

#endif

        }

    }

lib_enc/ivas_qmetadata_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -934,8 +934,12 @@ void reset_metadata_spatial( 
    int32_t *total_brate,           /* o  : total bitrate                */

    const int32_t core_brate,       /* i  : core bitrate                 */

    const int16_t nb_bits_metadata, /* i  : number of meatdata bits      */

#ifndef ALIGN_SID_SIZE

    const SBA_MODE sba_mode,        /* i  : SBA mode                     */

    const int16_t element_mode      /* i  : element mode                 */

#else

    const SBA_MODE sba_mode        /* i  : SBA mode                     */

#endif

)

{

    int16_t i, next_ind_sid, last_ind_sid;

lib_enc/ivas_sce_enc.c

+5 −2
Original line number Diff line number Diff line
@@ -199,8 +199,11 @@ ivas_error ivas_sce_enc( 
     * Reset metadata

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



    reset_metadata_spatial( ivas_format, hSCE->hMetaData, hSCE->element_brate, &st->total_brate, st->core_brate, nb_bits_metadata, st_ivas->sba_mode,

                            IVAS_SCE );

#ifdef ALIGN_SID_SIZE

    reset_metadata_spatial( ivas_format, hSCE->hMetaData, hSCE->element_brate, &st->total_brate, st->core_brate, nb_bits_metadata, st_ivas->sba_mode );

#else

    reset_metadata_spatial( ivas_format, hSCE->hMetaData, hSCE->element_brate, &st->total_brate, st->core_brate, nb_bits_metadata, st_ivas->sba_mode, IVAS_SCE );

#endif



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

     * Write IVAS format signaling in SID frames