Commit 6f6b224d authored by Adam Mills's avatar Adam Mills
Browse files

Fixing bad merge

parent ed172821
Loading
Loading
Loading
Loading
Loading
+0 −140
Original line number Diff line number Diff line
@@ -863,150 +863,10 @@ void ivas_spar_md_dec_process(
#endif
                               st_ivas->hQMetaData->sba_inactive_mode, st_ivas->last_active_ivas_total_brate );

<<<<<<< HEAD
=======
#ifdef FIX_527_SBA_MONO_INPUT
    ivas_dec_mono_sba_handling( st_ivas, sba_order );
#endif

#if 0
    {
        char f_name[100];
        int16_t num_bands = nB;
        int16_t num_subframes = 1, num_block_groups = 1, num_elements = 1, byte_size = sizeof( float );
        int16_t num_ch = ivas_sba_get_nchan_metadata( sba_order, st_ivas->hDecoderConfig->ivas_total_brate );
        for ( b = 0; b < num_bands; b++ )
        {
            sprintf( f_name, "spar_band_pred_coeffs_dec.bin" );
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_bands, sizeof( num_bands ), 1, 1, f_name ) : false;
            num_elements = num_ch - 1;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_block_groups, sizeof( num_block_groups ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
            for ( j = 0; j < num_ch - 1; j++ )
            {
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[j], sizeof( float ), 1, 1, f_name );
            }
            sprintf( f_name, "spar_band_C_coeffs_dec.bin" );
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_bands, sizeof( num_bands ), 1, 1, f_name ) : false;
            num_elements = ( hMdDec->spar_md_cfg.num_decorr_per_band[bw * b] - hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] ) * ( hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] - 1 );
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_block_groups, sizeof( num_block_groups ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
            for ( j = 0; j < ( hMdDec->spar_md_cfg.num_decorr_per_band[bw * b] - hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] ); j++ )
            {
                for ( k = 0; k < hMdDec->spar_md_cfg.num_dmx_chans_per_band[bw * b] - 1; k++ )
                {
                    dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[j][k], sizeof( float ), 1, 1, f_name );
                }
            }
            sprintf( f_name, "spar_band_P_coeffs_dec.bin" );
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_bands, sizeof( num_bands ), 1, 1, f_name ) : false;
            num_elements = num_ch - 1;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &num_block_groups, sizeof( num_block_groups ), 1, 1, f_name ) : false;
            ( b == 0 && frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;
            for ( j = 0; j < num_ch - 1; j++ )
            {
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[j], sizeof( float ), 1, 1, f_name );
            }
        }
    }
#endif
#ifdef DEBUG_LBR_SBA
    /* Dumping SPAR HOA Coefficients */
    /*char f_name[100];
    int16_t nbands = 12;
    int16_t num_subframes = 1;
    int16_t num_elements = 7;
    int16_t num_block_group = 1;
    int16_t byte_size = sizeof( float );

    sprintf( f_name, "SBA_MD_values_dec_PR.bin" );
    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;

    for ( b = 0; b < nbands; b++ )
    {
        for ( int16_t sf = 0; sf < num_subframes; sf++ )
        {
            for ( int16_t bl = 0; bl < num_block_group; bl++ )
            {
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[0], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[1], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[2], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[3], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[4], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[5], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].pred_re[6], byte_size, 1, 1, f_name );
                // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat );
            }
        }
    }
    nbands = 12; // 6 total, just looking at SPAR
    num_subframes = 1;
    num_elements = 12;
    num_block_group = 1;
    byte_size = sizeof( float );

    sprintf( f_name, "SBA_MD_values_dec_C.bin" );
    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;

    for ( b = 0; b < nbands; b++ )
    {
        for ( int16_t sf = 0; sf < num_subframes; sf++ )
        {
            for ( int16_t bl = 0; bl < num_block_group; bl++ )
            {
                for ( int16_t p = 0; p < 4; p++ )
                {
                    for ( int16_t r = 0; r < 3; r++ )
                    {
                        dbgwrite( &hMdDec->spar_md.band_coeffs[b].C_re[p][r], byte_size, 1, 1, f_name );
                    }
                }
            }
        }
    }
    nbands = 12; // 6 total, just looking at SPAR
    num_subframes = 1;
    num_elements = 4;
    num_block_group = 1;
    byte_size = sizeof( float );

    sprintf( f_name, "SBA_MD_values_dec_P.bin" );
    ( frame == 0 ) ? dbgwrite( &nbands, sizeof( nbands ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_elements, sizeof( num_elements ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_subframes, sizeof( num_subframes ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &num_block_group, sizeof( num_block_group ), 1, 1, f_name ) : false;
    ( frame == 0 ) ? dbgwrite( &byte_size, sizeof( byte_size ), 1, 1, f_name ) : false;

    for ( b = 0; b < nbands; b++ )
    {
        for ( int16_t sf = 0; sf < num_subframes; sf++ )
        {
            for ( int16_t bl = 0; bl < num_block_group; bl++ )
            {
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[0], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[1], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[2], byte_size, 1, 1, f_name );
                dbgwrite( &hMdDec->spar_md.band_coeffs[b].P_re[3], byte_size, 1, 1, f_name );
                // fprintf(stdout, "%f\t%f\t%f\t%d\t%d\n", dirac_md_kbps, spar_md_kbps, sba_md_kbps, qsi, code_strat );
            }
        }
    }*/
#endif
>>>>>>> main
    /* SPAR to DirAC conversion */
    if ( hMdDec->spar_hoa_dirac2spar_md_flag == 1 )
    {