Commit d4c03c2e authored by bayers's avatar bayers
Browse files

make sure 7.1.4 br does not crash any longer, still ParamUpmix needs to be... 

make sure 7.1.4 br does not crash any longer, still ParamUpmix needs to be fully implemented in the JBM path
parent f104d3bb

apps/decoder.c

+6 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static 
#define JBM_FRONTEND_FETCH_FRAMESIZE_MS 20

#ifdef API_5MS

#define HEADROTATION_FETCH_FRAMESIZE_MS 5

#define DEFAULT_FETCH_FRAMESIZE_MS      20

#endif



typedef struct
@@ -1734,7 +1735,7 @@ static ivas_error decodeG192( 
    }

    else

    {

        nOutSamples = (int16_t) ( arg.output_Fs / 1000 * VARIABLE_SPEED_FETCH_FRAMESIZE_MS );

        nOutSamples = (int16_t) ( arg.output_Fs / 1000 * DEFAULT_FETCH_FRAMESIZE_MS );

        vec_pos_len = 1;

    }

    /*------------------------------------------------------------------------------------------*
@@ -2201,7 +2202,11 @@ cleanup: 


    AudioFileWriter_close( &afWriter );

    MasaFileWriter_close( &masaWriter );

#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING

    TsmScaleFileReader_close( &tsmScaleFileReader );

#endif

#endif

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

    {

        IsmFileWriter_close( &ismWriters[i] );

lib_dec/ivas_jbm_dec.c

+15 −0
Original line number Diff line number Diff line
@@ -477,6 +477,21 @@ ivas_error ivas_jbm_dec_tc( 
                ivas_mono_stereo_downmix_mcmasa( st_ivas, output, output_frame );

            }

        }

#ifdef API_5MS

        else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {



            /* at least decode everything here, the rest is ToDo, for this we just output zeroes atm */

            ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, output_lfe_ch );



            ivas_mc_paramupmix_dec_read_BS( st_ivas, st, st_ivas->hMCParamUpmix, &nb_bits_metadata[0] );



            if ( ( error = ivas_mct_dec( st_ivas, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

#endif

    }