Commit 7facab45 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Resolution tuning for 384k and cleaning

parent 72bbb502

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1214,9 +1214,7 @@ enum 
#define MASA_BIT_REDUCT_PARAM                   10

#ifdef HR_METADATA

#define MASA_MAXIMUM_TWO_DIR_BANDS             24

#ifdef HR_METADATA_HR_COH

#define NBITS_HR_COH                          4

#endif

#else

#define MASA_MAXIMUM_TWO_DIR_BANDS             18

#endif

lib_com/ivas_prot.h

+12 −18
Original line number Diff line number Diff line
@@ -2987,14 +2987,20 @@ ivas_error ivas_qmetadata_enc_encode( 
);



#ifdef HR_METADATA

ivas_error ivas_qmetadata_enc_encode_hr(

    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: metadata bitstream handle               */

    IVAS_QMETADATA *hQMetaData                                  /* i/o: q_metadata handle                       */

); 



ivas_error ivas_qmetadata_enc_encode_hr_512(

ivas_error ivas_qmetadata_enc_encode_hr_384_512(

    BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */

    IVAS_QMETADATA *hQMetaData /* i/o: metadata handle           */

    IVAS_QMETADATA *hQMetaData, /* i/o: metadata handle           */

    int16_t bits_sph_idx,

    int16_t bits_sp_coh

);

int16_t ivas_qmetadata_dec_decode_hr_384_512(

    IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle  */

    uint16_t *bitstream,              /* i  : bitstream          */

    int16_t *index,                   /* i/o: bitstream position */

    SPHERICAL_GRID_DATA *sph_grid16,   /* i: spherical grid for deindexing */

    int16_t bits_sph_idx,

    int16_t bits_sp_coh

);



void deindex_sph_idx(
@@ -3004,18 +3010,6 @@ void deindex_sph_idx( 
    float *phi                           /* o  : Azimuth                    */

);



int16_t ivas_qmetadata_dec_decode_hr_512(

    IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle  */

    uint16_t *bitstream,              /* i  : bitstream          */

    int16_t *index,                   /* i/o: bitstream position */

    SPHERICAL_GRID_DATA *sph_grid16   /* i: spherical grid for deindexing */

);



int16_t ivas_qmetadata_dec_decode_hr(

    IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle  */

    uint16_t *bitstream,              /* i  : bitstream          */

    int16_t *index                    /* i/o: bitstream position */

);



uint16_t index_theta_phi_16(

    float * p_theta,                  /* i/o  : input elevation to be indexed */

lib_com/options.h

+2 −4
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
/*#define DEBUG_DISABLE_DIRAC_DELAY_COMP */     /* temporarily disable delay compensation on DirAC encoder */

/*#define DEBUG_BS_READ_WRITE*/

/*#define DEBUG_MODE_DIRAC_NOCORE*/

/*#define DEBUG_MODE_QMETADATA*/                /* output q_metadata parameters */

#define DEBUG_MODE_QMETADATA                /* output q_metadata parameters */



/*MCT Debug switches*/

/*#define DEBUG_FORCE_MCT_CP*/                  /* force MCT Stereo pairs for verification with SPAR */
@@ -171,9 +171,7 @@ 




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

#ifdef HR_METADATA

#define HR_METADATA_HR_COH

#endif



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_dec/ivas_masa_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -199,13 +199,13 @@ ivas_error ivas_masa_decode( 
#ifdef HR_METADATA

        if ( ivas_total_brate >= IVAS_384k )

        {

            if ( ivas_total_brate == IVAS_512k )

            if ( ivas_total_brate >= IVAS_512k )

            {

                *nb_bits_read += ivas_qmetadata_dec_decode_hr_512( hQMetaData, st->bit_stream, &st->next_bit_pos, hMasa->data.sph_grid16 );

                *nb_bits_read += ivas_qmetadata_dec_decode_hr_384_512( hQMetaData, st->bit_stream, &st->next_bit_pos, hMasa->data.sph_grid16, 16, 4 );

            }

            else

            {

                *nb_bits_read += ivas_qmetadata_dec_decode_hr( hQMetaData, st->bit_stream, &st->next_bit_pos );

                *nb_bits_read += ivas_qmetadata_dec_decode_hr_384_512( hQMetaData, st->bit_stream, &st->next_bit_pos, hMasa->data.sph_grid16, 11, 3 );

            }

        }

        else

lib_dec/ivas_qmetadata_dec.c

+233 −590

File changed.

Preview size limit exceeded, changes collapsed.