Commit 77ba3c67 authored by vaclav's avatar vaclav
Browse files

fixes

parent 90333f35

lib_dec/ivas_init_dec.c

+1 −9
Original line number Diff line number Diff line
@@ -289,17 +289,9 @@ ivas_error ivas_dec_get_format( 
            st_ivas->nchan_ism = nchan_ism;



            /* read Ambisonic (SBA) planar flag */

            sba_planar = st_ivas->bit_stream[num_bits_read];

            /*sba_planar = st_ivas->bit_stream[num_bits_read];*/

            num_bits_read += SBA_PLANAR_BITS;



            if ( st_ivas->ini_frame > 0 && sba_planar != st_ivas->sba_planar )

            {

#ifdef DEBUGGING

                fprintf( stderr, "\nError: Changing the SBA planar/3D layout is not supported!\n" );

#endif

                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Wrong SBA planar flag signalled!" );

            }



            /* read Ambisonic (SBA) order (0 for signaling OSBA format at low bitrates)*/

            sba_order = st_ivas->bit_stream[num_bits_read + 1];

            sba_order += 2 * st_ivas->bit_stream[num_bits_read];

lib_util/hrtf_file_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -1944,7 +1944,7 @@ ivas_error load_fastconv_HRTF_from_binary( 
               ( ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 && intern_audio_config == IVAS_AUDIO_CONFIG_HOA3 ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 && intern_audio_config == IVAS_AUDIO_CONFIG_HOA2 ) ||

                 ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA && intern_audio_config == IVAS_AUDIO_CONFIG_FOA ) ) ) ||

             ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM && room_reverb_flag == 1 ) ||

             ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV && room_reverb_flag == 1 ) ||

             ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV || hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) && intern_audio_config == IVAS_AUDIO_CONFIG_INVALID ) )

#else

        if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV ) || ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) )