Loading lib_com/ivas_dirac_com.c +18 −6 Original line number Diff line number Diff line Loading @@ -60,8 +60,12 @@ ivas_error ivas_dirac_config( ) { IVAS_FORMAT ivas_format; #ifndef SBA_MODE_CLEAN_UP int16_t sba_order; int16_t *nSCE, *nCPE, *element_mode, *nchan_transport; #else int16_t *element_mode; #endif int32_t ivas_total_brate; DIRAC_CONFIG_DATA_HANDLE hConfig; IVAS_QMETADATA_HANDLE hQMetaData; Loading @@ -80,11 +84,15 @@ ivas_error ivas_dirac_config( if ( enc_dec == ENC ) { ivas_format = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_format; #ifndef SBA_MODE_CLEAN_UP nSCE = &( ( (Encoder_Struct *) st_ivas )->nSCE ); nCPE = &( (Encoder_Struct *) st_ivas )->nCPE; #endif element_mode = &( (Encoder_Struct *) st_ivas )->hEncoderConfig->element_mode_init; #ifndef SBA_MODE_CLEAN_UP nchan_transport = &( (Encoder_Struct *) st_ivas )->nchan_transport; sba_order = ( (Encoder_Struct *) st_ivas )->sba_analysis_order; #endif ivas_total_brate = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_total_brate; Fs = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->input_Fs; band_grouping = ( (Encoder_Struct *) st_ivas )->hDirAC->band_grouping; Loading @@ -106,11 +114,15 @@ ivas_error ivas_dirac_config( else { ivas_format = ( (Decoder_Struct *) st_ivas )->ivas_format; #ifndef SBA_MODE_CLEAN_UP nSCE = &( (Decoder_Struct *) st_ivas )->nSCE; nCPE = &( (Decoder_Struct *) st_ivas )->nCPE; #endif element_mode = &( (Decoder_Struct *) st_ivas )->element_mode_init; #ifndef SBA_MODE_CLEAN_UP nchan_transport = &( (Decoder_Struct *) st_ivas )->nchan_transport; sba_order = ( (Decoder_Struct *) st_ivas )->sba_analysis_order; #endif ivas_total_brate = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->ivas_total_brate; Fs = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->output_Fs; band_grouping = ( (Decoder_Struct *) st_ivas )->hDirAC->band_grouping; Loading lib_enc/ivas_dirac_enc.c +4 −1 Original line number Diff line number Diff line Loading @@ -62,7 +62,9 @@ ivas_error ivas_dirac_enc_open( ) { int16_t i, j; #ifndef SBA_MODE_CLEAN_UP int32_t input_Fs; #endif DIRAC_ENC_HANDLE hDirAC; #ifndef SBA_MODE_CLEAN_UP IVAS_FB_CFG *fb_cfg; Loading @@ -87,8 +89,9 @@ ivas_error ivas_dirac_enc_open( *-----------------------------------------------------------------*/ st_ivas->hDirAC = hDirAC; #ifndef SBA_MODE_CLEAN_UP input_Fs = st_ivas->hEncoderConfig->input_Fs; #endif if ( ( error = ivas_dirac_config( (void *) st_ivas, ENC ) ) != IVAS_ERR_OK ) { return error; Loading lib_rend/lib_rend.c +6 −6 File changed.Contains only whitespace changes. Show changes Loading
lib_com/ivas_dirac_com.c +18 −6 Original line number Diff line number Diff line Loading @@ -60,8 +60,12 @@ ivas_error ivas_dirac_config( ) { IVAS_FORMAT ivas_format; #ifndef SBA_MODE_CLEAN_UP int16_t sba_order; int16_t *nSCE, *nCPE, *element_mode, *nchan_transport; #else int16_t *element_mode; #endif int32_t ivas_total_brate; DIRAC_CONFIG_DATA_HANDLE hConfig; IVAS_QMETADATA_HANDLE hQMetaData; Loading @@ -80,11 +84,15 @@ ivas_error ivas_dirac_config( if ( enc_dec == ENC ) { ivas_format = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_format; #ifndef SBA_MODE_CLEAN_UP nSCE = &( ( (Encoder_Struct *) st_ivas )->nSCE ); nCPE = &( (Encoder_Struct *) st_ivas )->nCPE; #endif element_mode = &( (Encoder_Struct *) st_ivas )->hEncoderConfig->element_mode_init; #ifndef SBA_MODE_CLEAN_UP nchan_transport = &( (Encoder_Struct *) st_ivas )->nchan_transport; sba_order = ( (Encoder_Struct *) st_ivas )->sba_analysis_order; #endif ivas_total_brate = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_total_brate; Fs = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->input_Fs; band_grouping = ( (Encoder_Struct *) st_ivas )->hDirAC->band_grouping; Loading @@ -106,11 +114,15 @@ ivas_error ivas_dirac_config( else { ivas_format = ( (Decoder_Struct *) st_ivas )->ivas_format; #ifndef SBA_MODE_CLEAN_UP nSCE = &( (Decoder_Struct *) st_ivas )->nSCE; nCPE = &( (Decoder_Struct *) st_ivas )->nCPE; #endif element_mode = &( (Decoder_Struct *) st_ivas )->element_mode_init; #ifndef SBA_MODE_CLEAN_UP nchan_transport = &( (Decoder_Struct *) st_ivas )->nchan_transport; sba_order = ( (Decoder_Struct *) st_ivas )->sba_analysis_order; #endif ivas_total_brate = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->ivas_total_brate; Fs = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->output_Fs; band_grouping = ( (Decoder_Struct *) st_ivas )->hDirAC->band_grouping; Loading
lib_enc/ivas_dirac_enc.c +4 −1 Original line number Diff line number Diff line Loading @@ -62,7 +62,9 @@ ivas_error ivas_dirac_enc_open( ) { int16_t i, j; #ifndef SBA_MODE_CLEAN_UP int32_t input_Fs; #endif DIRAC_ENC_HANDLE hDirAC; #ifndef SBA_MODE_CLEAN_UP IVAS_FB_CFG *fb_cfg; Loading @@ -87,8 +89,9 @@ ivas_error ivas_dirac_enc_open( *-----------------------------------------------------------------*/ st_ivas->hDirAC = hDirAC; #ifndef SBA_MODE_CLEAN_UP input_Fs = st_ivas->hEncoderConfig->input_Fs; #endif if ( ( error = ivas_dirac_config( (void *) st_ivas, ENC ) ) != IVAS_ERR_OK ) { return error; Loading