Commit b1cedd90 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into my_maintenance

parents 3e2f0127 039cea34

apps/encoder.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

lib_com/bitstream.c

100755 → 100644
+0 −6
Original line number Diff line number Diff line
@@ -1981,15 +1981,9 @@ ivas_error preview_indices( 
            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 );



#ifdef SBA_ORDER_BITSTREAM

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

#endif



#ifdef SBA_ORDER_BITSTREAM

            ivas_sba_config( total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );

#else

            ivas_sba_config( total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );

#endif

        }

    }

lib_com/ivas_dirac_com.c

+0 −8
Original line number Diff line number Diff line
@@ -82,11 +82,7 @@ ivas_error ivas_dirac_config( 
        nCPE = &( (Encoder_Struct *) st_ivas )->nCPE;

        element_mode = &( (Encoder_Struct *) st_ivas )->hEncoderConfig->element_mode_init;

        nchan_transport = &( (Encoder_Struct *) st_ivas )->nchan_transport;

#ifndef SBA_ORDER_BITSTREAM

        sba_order = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_order;

#else

        sba_order = ( (Encoder_Struct *) st_ivas )->sba_analysis_order;

#endif

        sba_planar = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->sba_planar;

        ivas_total_brate = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->ivas_total_brate;

        Fs = ( (Encoder_Struct *) st_ivas )->hEncoderConfig->input_Fs;
@@ -111,11 +107,7 @@ ivas_error ivas_dirac_config( 
        nCPE = &( (Decoder_Struct *) st_ivas )->nCPE;

        element_mode = &( (Decoder_Struct *) st_ivas )->element_mode_init;

        nchan_transport = &( (Decoder_Struct *) st_ivas )->nchan_transport;

#ifndef SBA_ORDER_BITSTREAM

        sba_order = ( (Decoder_Struct *) st_ivas )->sba_order;

#else

        sba_order = ( (Decoder_Struct *) st_ivas )->sba_analysis_order;

#endif

        sba_planar = ( (Decoder_Struct *) st_ivas )->sba_planar;

        ivas_total_brate = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->ivas_total_brate;

        Fs = ( (Decoder_Struct *) st_ivas )->hDecoderConfig->output_Fs;

lib_com/ivas_entropy_coder_common.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

lib_com/ivas_mdft_imdft.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file