Commit 95a1970c authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

bypass mono dmx in mdct stereo in CPE for pre-rendered OSBA

parent bfdeba06
Loading
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -498,7 +498,11 @@ ivas_error ivas_cpe_dec(
        synchro_synthesis( ivas_total_brate, hCPE, output, output_frame, 0 );
    }

    if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && ( is_DTXrate( ivas_total_brate ) == 0 || ( is_DTXrate( ivas_total_brate ) == 1 && is_DTXrate( st_ivas->hDecoderConfig->last_ivas_total_brate ) == 0 ) ) )
    if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->nchan_out == 1 && ( is_DTXrate( ivas_total_brate ) == 0 || ( is_DTXrate( ivas_total_brate ) == 1 && is_DTXrate( st_ivas->hDecoderConfig->last_ivas_total_brate ) == 0 ) ) 
#ifdef FIX_1518
        && !(st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_NONE)
#endif
    )
    {
        applyDmxMdctStereo( hCPE, output, output_frame );
    }
+15 −0
Original line number Diff line number Diff line
@@ -434,6 +434,21 @@ ivas_error ivas_dec(
            }
        }

        {
        	static FILE* f_foa = 0;
        	if (f_foa == 0)
        		f_foa = fopen("chans.raw","wb");
        
        	for (int16_t  j=0; j < 960;j++)
        	{
        		for ( int n = 0; n < 1; n++)
        		{
                    int16_t s1 = p_output[n][j];
        			fwrite(&s1,sizeof(int16_t),1,f_foa);
        		}
            }
        }

        if ( st_ivas->sba_dirac_stereo_flag )
        {
            ivas_agc_dec_process( st_ivas->hSpar->hAgcDec, &p_output[sba_ch_idx], &p_output[sba_ch_idx], st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame );
+15 −0
Original line number Diff line number Diff line
@@ -418,6 +418,21 @@ ivas_error ivas_enc(
        }
#endif

        {
        	static FILE* f_foa = 0;
        	if (f_foa == 0)
        		f_foa = fopen("chans_in.raw","wb");
        
        	for (int16_t  j=0; j < 960;j++)
        	{
        		for ( int n = 0; n < 1; n++)
        		{
                    int16_t s1 = data_f[n][j];
        			fwrite(&s1,sizeof(int16_t),1,f_foa);
        		}
            }
        }

        /* core-coding of transport channels */
        if ( st_ivas->nSCE == 1 )
        {