Commit 9343baf4 authored by vaclav's avatar vaclav
Browse files

Merge branch '1209-leftovers-in-ivas-sid-signalling' into 'main' 

Resolve "Leftovers in IVAS SID signalling"

See merge request !1832
parents 6e7273ab dd8c60d3

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -233,7 +233,11 @@ typedef enum 
#define SID_MDCT_STEREO                         0x1                         /*      1|      0|     0 */

#define SID_ISM                                 0x2                         /*      0|      1|     0 */

#define SID_MASA_1TC                            0x3                         /*      1|      1|     0 */

#ifdef FIX_1209_SID_SIGNALING

/*reserved*/                                  /*0x4*/                       /*      0|      0|     1 */

#else

#define SID_MULTICHANNEL                        0x4                         /*      0|      0|     1 */

#endif

#define SID_SBA_1TC                             0x5                         /*      1|      0|     1 */

#define SID_SBA_2TC                             0x6                         /*      0|      1|     1 */

#define SID_MASA_2TC                            0x7                         /*      1|      1|     1 */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
#define FIX_587_DEFAULT_REVERB                          /* Philips: issue 587: inconsistent default reverb parameters across renderers */



#define FIX_HRTF_LOAD                                   /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */

#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */





/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec.c

+21 −1
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 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 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 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.)
@@ -1048,11 +1065,12 @@ static ivas_error ivas_read_format( 
                break;

            case SID_ISM:

                st_ivas->ivas_format = ISM_FORMAT;



                break;

#ifndef FIX_1209_SID_SIGNALING

            case SID_MULTICHANNEL:

                st_ivas->ivas_format = MC_FORMAT;

                break;

#endif

            case SID_SBA_1TC:

                st_ivas->ivas_format = SBA_FORMAT;

                st_ivas->element_mode_init = IVAS_SCE;
@@ -1077,7 +1095,9 @@ static ivas_error ivas_read_format( 
                }

                break;

            default:

#ifndef FIX_1209_SID_SIGNALING

                /* This should actually be impossible, since only 3 bits are read, so if this happens something is broken */

#endif

                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Invalid value %c found in SID format field.", st_ivas->sid_format );

        }

lib_enc/ivas_init_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -161,9 +161,11 @@ void ivas_write_format_sid( 
        case ISM_FORMAT:

            ind = SID_ISM;

            break;

#ifndef FIX_1209_SID_SIGNALING

        case MC_FORMAT:

            ind = SID_MULTICHANNEL;

            break;

#endif

        case SBA_FORMAT:

            switch ( element_mode )

            {