Commit 8114d6b5 authored by multrus's avatar multrus
Browse files

[cleanup] accept COMBINED_FORMAT_SIGNALING

parent 88044861

lib_com/bitstream.c

+0 −10
Original line number Diff line number Diff line
@@ -2928,11 +2928,7 @@ ivas_error preview_indices( 
                k = IVAS_FORMAT_SIGNALING_NBITS;

                if ( st_ivas->ivas_format == MASA_FORMAT )

                {

#ifdef COMBINED_FORMAT_SIGNALING

                    k = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;

#else

                    k = IVAS_FORMAT_SIGNALING_NBITS_SBA;

#endif

                }



                if ( total_brate < MIN_BRATE_MDCT_STEREO )
@@ -2972,15 +2968,9 @@ ivas_error preview_indices( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            /* Read SBA planar flag and SBA order */

#ifdef COMBINED_FORMAT_SIGNALING

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED] == 1 );

            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 1] == 1 );

#else

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 );

            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );

#endif



            st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order );

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -78,11 +78,7 @@ typedef enum 
 *----------------------------------------------------------------------------------*/



#define IVAS_FORMAT_SIGNALING_NBITS             2                           /* number of bits for signaling the IVAS format */

#ifdef COMBINED_FORMAT_SIGNALING

#define IVAS_FORMAT_SIGNALING_NBITS_EXTENDED    ( IVAS_FORMAT_SIGNALING_NBITS + 1 )

#else

#define IVAS_FORMAT_SIGNALING_NBITS_SBA         ( IVAS_FORMAT_SIGNALING_NBITS + 1 )

#endif





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

lib_com/ivas_spar_com.c

+0 −5
Original line number Diff line number Diff line
@@ -2173,13 +2173,8 @@ void ivas_spar_set_bitrate_config( 
        max_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][1] / FRAMES_PER_SEC );

    }



#ifdef COMBINED_FORMAT_SIGNALING

    pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;

    pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_EXTENDED - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits;

#else

    pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;

    pSpar_md_cfg->max_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - max_bits;

#endif



    md_coding_bits_header = SPAR_NUM_CODING_STRAT_BITS + pSpar_md_cfg->quant_strat_bits;

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 


#define HR_METADATA                                     /* Nok: Contribution #45: encode directional MASA metadata with more bits at 384k and 512k */



#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */

#define FIX_446_STEREO_DMX_CRASH                        /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */



#define FIX_386_CORECODER_RECONFIG_2                    /* VA: Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig. */

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ static ivas_error ivas_read_format( 
                st_ivas->ivas_format = MC_FORMAT;

                break;

            case 2:

#ifdef COMBINED_FORMAT_SIGNALING

                st_ivas->ivas_format = ISM_FORMAT;



                if ( ivas_total_brate >= IVAS_24k4 )
@@ -399,9 +398,6 @@ static ivas_error ivas_read_format( 


                    ( *num_bits_read )++;

                }

#else

                st_ivas->ivas_format = ISM_FORMAT;

#endif



                break;

            case 3: