Commit c4ecfad0 authored by vaclav's avatar vaclav
Browse files

propagate error code from ivas_read_format()

parent e3248290

lib_dec/ivas_init_dec.c

+17 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ ivas_error ivas_dec_get_format( 
    int32_t ivas_total_brate;

    uint16_t *bit_stream_orig;

    AUDIO_CONFIG signaled_config;

#ifdef NONBE_FIX_1209_SID_SIGNALING

    ivas_error error;

#endif



    num_bits_read = 0;

    element_mode_flag = 0;
@@ -120,7 +123,14 @@ ivas_error ivas_dec_get_format( 
     * Read IVAS format

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



#ifdef NONBE_FIX_1209_SID_SIGNALING

    if ( ( error = ivas_read_format( st_ivas, &num_bits_read ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#else

    ivas_read_format( st_ivas, &num_bits_read );

#endif



    if ( st_ivas->ini_frame > 0 && st_ivas->ivas_format != st_ivas->last_ivas_format &&

         !( st_ivas->ivas_format == MASA_FORMAT && st_ivas->last_ivas_format == MASA_ISM_FORMAT ) &&
@@ -485,7 +495,14 @@ ivas_error ivas_dec_setup( 
     * Read IVAS format

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



#ifdef NONBE_FIX_1209_SID_SIGNALING

    if ( ( error = ivas_read_format( st_ivas, &num_bits_read ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#else

    ivas_read_format( st_ivas, &num_bits_read );

#endif



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

     * Read other signling (ISM/MC mode, number of channels, etc.)