mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
f2b6a8b7fe
--HG-- rename : modules/libfishsound/AUTHORS => media/libfishsound/AUTHORS rename : modules/libfishsound/COPYING => media/libfishsound/COPYING rename : modules/libfishsound/ChangeLog => media/libfishsound/ChangeLog rename : modules/libfishsound/Makefile.in => media/libfishsound/Makefile.in rename : modules/libfishsound/README => media/libfishsound/README rename : modules/libfishsound/README_MOZILLA => media/libfishsound/README_MOZILLA rename : modules/libfishsound/include/Makefile.in => media/libfishsound/include/Makefile.in rename : modules/libfishsound/include/fishsound/Makefile.in => media/libfishsound/include/fishsound/Makefile.in rename : modules/libfishsound/include/fishsound/comments.h => media/libfishsound/include/fishsound/comments.h rename : modules/libfishsound/include/fishsound/config.h => media/libfishsound/include/fishsound/config.h rename : modules/libfishsound/include/fishsound/constants.h => media/libfishsound/include/fishsound/constants.h rename : modules/libfishsound/include/fishsound/decode.h => media/libfishsound/include/fishsound/decode.h rename : modules/libfishsound/include/fishsound/deprecated.h => media/libfishsound/include/fishsound/deprecated.h rename : modules/libfishsound/include/fishsound/encode.h => media/libfishsound/include/fishsound/encode.h rename : modules/libfishsound/include/fishsound/fishsound.h => media/libfishsound/include/fishsound/fishsound.h rename : modules/libfishsound/src/Makefile.in => media/libfishsound/src/Makefile.in rename : modules/libfishsound/src/libfishsound/Makefile.in => media/libfishsound/src/libfishsound/Makefile.in rename : modules/libfishsound/src/libfishsound/config.h => media/libfishsound/src/libfishsound/config.h rename : modules/libfishsound/src/libfishsound/convert.h => media/libfishsound/src/libfishsound/convert.h rename : modules/libfishsound/src/libfishsound/convert_c.h => media/libfishsound/src/libfishsound/convert_c.h rename : modules/libfishsound/src/libfishsound/convert_oil.h => media/libfishsound/src/libfishsound/convert_oil.h rename : modules/libfishsound/src/libfishsound/fishsound.c => media/libfishsound/src/libfishsound/fishsound.c rename : modules/libfishsound/src/libfishsound/fishsound_comments.c => media/libfishsound/src/libfishsound/fishsound_comments.c rename : modules/libfishsound/src/libfishsound/fishsound_decode.c => media/libfishsound/src/libfishsound/fishsound_decode.c rename : modules/libfishsound/src/libfishsound/fishsound_encode.c => media/libfishsound/src/libfishsound/fishsound_encode.c rename : modules/libfishsound/src/libfishsound/fishsound_flac.c => media/libfishsound/src/libfishsound/fishsound_flac.c rename : modules/libfishsound/src/libfishsound/fishsound_speex.c => media/libfishsound/src/libfishsound/fishsound_speex.c rename : modules/libfishsound/src/libfishsound/fishsound_vorbis.c => media/libfishsound/src/libfishsound/fishsound_vorbis.c rename : modules/libfishsound/src/libfishsound/fs_compat.h => media/libfishsound/src/libfishsound/fs_compat.h rename : modules/libfishsound/src/libfishsound/fs_vector.c => media/libfishsound/src/libfishsound/fs_vector.c rename : modules/libfishsound/src/libfishsound/fs_vector.h => media/libfishsound/src/libfishsound/fs_vector.h rename : modules/libfishsound/src/libfishsound/private.h => media/libfishsound/src/libfishsound/private.h rename : modules/libfishsound/update.sh => media/libfishsound/update.sh rename : modules/libogg/AUTHORS => media/libogg/AUTHORS rename : modules/libogg/CHANGES => media/libogg/CHANGES rename : modules/libogg/COPYING => media/libogg/COPYING rename : modules/libogg/Makefile.in => media/libogg/Makefile.in rename : modules/libogg/README => media/libogg/README rename : modules/libogg/README_MOZILLA => media/libogg/README_MOZILLA rename : modules/libogg/include/Makefile.in => media/libogg/include/Makefile.in rename : modules/libogg/include/ogg/Makefile.in => media/libogg/include/ogg/Makefile.in rename : modules/libogg/include/ogg/config_types.h => media/libogg/include/ogg/config_types.h rename : modules/libogg/include/ogg/ogg.h => media/libogg/include/ogg/ogg.h rename : modules/libogg/include/ogg/os_types.h => media/libogg/include/ogg/os_types.h rename : modules/libogg/src/Makefile.in => media/libogg/src/Makefile.in rename : modules/libogg/src/bitwise.c => media/libogg/src/bitwise.c rename : modules/libogg/src/framing.c => media/libogg/src/framing.c rename : modules/libogg/src/ogg_bitwise.c => media/libogg/src/ogg_bitwise.c rename : modules/libogg/src/ogg_framing.c => media/libogg/src/ogg_framing.c rename : modules/libogg/update.sh => media/libogg/update.sh rename : modules/liboggplay/Makefile.in => media/liboggplay/Makefile.in rename : modules/liboggplay/README => media/liboggplay/README rename : modules/liboggplay/README_MOZILLA => media/liboggplay/README_MOZILLA rename : modules/liboggplay/include/Makefile.in => media/liboggplay/include/Makefile.in rename : modules/liboggplay/include/oggplay/Makefile.in => media/liboggplay/include/oggplay/Makefile.in rename : modules/liboggplay/include/oggplay/config_win32.h => media/liboggplay/include/oggplay/config_win32.h rename : modules/liboggplay/include/oggplay/oggplay.h => media/liboggplay/include/oggplay/oggplay.h rename : modules/liboggplay/include/oggplay/oggplay_callback_info.h => media/liboggplay/include/oggplay/oggplay_callback_info.h rename : modules/liboggplay/include/oggplay/oggplay_enums.h => media/liboggplay/include/oggplay/oggplay_enums.h rename : modules/liboggplay/include/oggplay/oggplay_query.h => media/liboggplay/include/oggplay/oggplay_query.h rename : modules/liboggplay/include/oggplay/oggplay_reader.h => media/liboggplay/include/oggplay/oggplay_reader.h rename : modules/liboggplay/include/oggplay/oggplay_seek.h => media/liboggplay/include/oggplay/oggplay_seek.h rename : modules/liboggplay/include/oggplay/oggplay_tools.h => media/liboggplay/include/oggplay/oggplay_tools.h rename : modules/liboggplay/src/Makefile.in => media/liboggplay/src/Makefile.in rename : modules/liboggplay/src/liboggplay/Makefile.in => media/liboggplay/src/liboggplay/Makefile.in rename : modules/liboggplay/src/liboggplay/config.h => media/liboggplay/src/liboggplay/config.h rename : modules/liboggplay/src/liboggplay/oggplay.c => media/liboggplay/src/liboggplay/oggplay.c rename : modules/liboggplay/src/liboggplay/oggplay_buffer.c => media/liboggplay/src/liboggplay/oggplay_buffer.c rename : modules/liboggplay/src/liboggplay/oggplay_buffer.h => media/liboggplay/src/liboggplay/oggplay_buffer.h rename : modules/liboggplay/src/liboggplay/oggplay_callback.c => media/liboggplay/src/liboggplay/oggplay_callback.c rename : modules/liboggplay/src/liboggplay/oggplay_callback.h => media/liboggplay/src/liboggplay/oggplay_callback.h rename : modules/liboggplay/src/liboggplay/oggplay_callback_info.c => media/liboggplay/src/liboggplay/oggplay_callback_info.c rename : modules/liboggplay/src/liboggplay/oggplay_data.c => media/liboggplay/src/liboggplay/oggplay_data.c rename : modules/liboggplay/src/liboggplay/oggplay_data.h => media/liboggplay/src/liboggplay/oggplay_data.h rename : modules/liboggplay/src/liboggplay/oggplay_file_reader.c => media/liboggplay/src/liboggplay/oggplay_file_reader.c rename : modules/liboggplay/src/liboggplay/oggplay_file_reader.h => media/liboggplay/src/liboggplay/oggplay_file_reader.h rename : modules/liboggplay/src/liboggplay/oggplay_private.h => media/liboggplay/src/liboggplay/oggplay_private.h rename : modules/liboggplay/src/liboggplay/oggplay_query.c => media/liboggplay/src/liboggplay/oggplay_query.c rename : modules/liboggplay/src/liboggplay/oggplay_seek.c => media/liboggplay/src/liboggplay/oggplay_seek.c rename : modules/liboggplay/src/liboggplay/oggplay_tcp_reader.c => media/liboggplay/src/liboggplay/oggplay_tcp_reader.c rename : modules/liboggplay/src/liboggplay/oggplay_tcp_reader.h => media/liboggplay/src/liboggplay/oggplay_tcp_reader.h rename : modules/liboggplay/src/liboggplay/oggplay_tools.c => media/liboggplay/src/liboggplay/oggplay_tools.c rename : modules/liboggplay/src/liboggplay/oggplay_yuv2rgb.c => media/liboggplay/src/liboggplay/oggplay_yuv2rgb.c rename : modules/liboggplay/src/liboggplay/std_semaphore.h => media/liboggplay/src/liboggplay/std_semaphore.h rename : modules/liboggplay/update.sh => media/liboggplay/update.sh rename : modules/liboggplay_audio/Makefile.in => media/liboggplay_audio/Makefile.in rename : modules/liboggplay_audio/README_MOZILLA => media/liboggplay_audio/README_MOZILLA rename : modules/liboggplay_audio/sydney_audio.h => media/liboggplay_audio/sydney_audio.h rename : modules/liboggplay_audio/sydney_audio_alsa.c => media/liboggplay_audio/sydney_audio_alsa.c rename : modules/liboggplay_audio/sydney_audio_mac.c => media/liboggplay_audio/sydney_audio_mac.c rename : modules/liboggplay_audio/sydney_audio_oss.c => media/liboggplay_audio/sydney_audio_oss.c rename : modules/liboggplay_audio/sydney_audio_waveapi.c => media/liboggplay_audio/sydney_audio_waveapi.c rename : modules/liboggplay_audio/update.sh => media/liboggplay_audio/update.sh rename : modules/liboggz/AUTHORS => media/liboggz/AUTHORS rename : modules/liboggz/COPYING => media/liboggz/COPYING rename : modules/liboggz/ChangeLog => media/liboggz/ChangeLog rename : modules/liboggz/Makefile.in => media/liboggz/Makefile.in rename : modules/liboggz/README => media/liboggz/README rename : modules/liboggz/README_MOZILLA => media/liboggz/README_MOZILLA rename : modules/liboggz/include/Makefile.in => media/liboggz/include/Makefile.in rename : modules/liboggz/include/oggz/Makefile.in => media/liboggz/include/oggz/Makefile.in rename : modules/liboggz/include/oggz/config.h => media/liboggz/include/oggz/config.h rename : modules/liboggz/include/oggz/config_win32.h => media/liboggz/include/oggz/config_win32.h rename : modules/liboggz/include/oggz/oggz.h => media/liboggz/include/oggz/oggz.h rename : modules/liboggz/include/oggz/oggz_comments.h => media/liboggz/include/oggz/oggz_comments.h rename : modules/liboggz/include/oggz/oggz_constants.h => media/liboggz/include/oggz/oggz_constants.h rename : modules/liboggz/include/oggz/oggz_deprecated.h => media/liboggz/include/oggz/oggz_deprecated.h rename : modules/liboggz/include/oggz/oggz_io.h => media/liboggz/include/oggz/oggz_io.h rename : modules/liboggz/include/oggz/oggz_off_t.h => media/liboggz/include/oggz/oggz_off_t.h rename : modules/liboggz/include/oggz/oggz_off_t_generated.h => media/liboggz/include/oggz/oggz_off_t_generated.h rename : modules/liboggz/include/oggz/oggz_read.h => media/liboggz/include/oggz/oggz_read.h rename : modules/liboggz/include/oggz/oggz_seek.h => media/liboggz/include/oggz/oggz_seek.h rename : modules/liboggz/include/oggz/oggz_stream.h => media/liboggz/include/oggz/oggz_stream.h rename : modules/liboggz/include/oggz/oggz_table.h => media/liboggz/include/oggz/oggz_table.h rename : modules/liboggz/include/oggz/oggz_write.h => media/liboggz/include/oggz/oggz_write.h rename : modules/liboggz/src/Makefile.in => media/liboggz/src/Makefile.in rename : modules/liboggz/src/liboggz/Makefile.in => media/liboggz/src/liboggz/Makefile.in rename : modules/liboggz/src/liboggz/metric_internal.c => media/liboggz/src/liboggz/metric_internal.c rename : modules/liboggz/src/liboggz/oggz.c => media/liboggz/src/liboggz/oggz.c rename : modules/liboggz/src/liboggz/oggz_auto.c => media/liboggz/src/liboggz/oggz_auto.c rename : modules/liboggz/src/liboggz/oggz_auto.h => media/liboggz/src/liboggz/oggz_auto.h rename : modules/liboggz/src/liboggz/oggz_byteorder.h => media/liboggz/src/liboggz/oggz_byteorder.h rename : modules/liboggz/src/liboggz/oggz_comments.c => media/liboggz/src/liboggz/oggz_comments.c rename : modules/liboggz/src/liboggz/oggz_compat.h => media/liboggz/src/liboggz/oggz_compat.h rename : modules/liboggz/src/liboggz/oggz_dlist.c => media/liboggz/src/liboggz/oggz_dlist.c rename : modules/liboggz/src/liboggz/oggz_dlist.h => media/liboggz/src/liboggz/oggz_dlist.h rename : modules/liboggz/src/liboggz/oggz_io.c => media/liboggz/src/liboggz/oggz_io.c rename : modules/liboggz/src/liboggz/oggz_macros.h => media/liboggz/src/liboggz/oggz_macros.h rename : modules/liboggz/src/liboggz/oggz_private.h => media/liboggz/src/liboggz/oggz_private.h rename : modules/liboggz/src/liboggz/oggz_read.c => media/liboggz/src/liboggz/oggz_read.c rename : modules/liboggz/src/liboggz/oggz_seek.c => media/liboggz/src/liboggz/oggz_seek.c rename : modules/liboggz/src/liboggz/oggz_stream.c => media/liboggz/src/liboggz/oggz_stream.c rename : modules/liboggz/src/liboggz/oggz_stream.h => media/liboggz/src/liboggz/oggz_stream.h rename : modules/liboggz/src/liboggz/oggz_stream_private.h => media/liboggz/src/liboggz/oggz_stream_private.h rename : modules/liboggz/src/liboggz/oggz_table.c => media/liboggz/src/liboggz/oggz_table.c rename : modules/liboggz/src/liboggz/oggz_vector.c => media/liboggz/src/liboggz/oggz_vector.c rename : modules/liboggz/src/liboggz/oggz_vector.h => media/liboggz/src/liboggz/oggz_vector.h rename : modules/liboggz/src/liboggz/oggz_write.c => media/liboggz/src/liboggz/oggz_write.c rename : modules/liboggz/update.sh => media/liboggz/update.sh rename : modules/libtheora/AUTHORS => media/libtheora/AUTHORS rename : modules/libtheora/CHANGES => media/libtheora/CHANGES rename : modules/libtheora/COPYING => media/libtheora/COPYING rename : modules/libtheora/LICENSE => media/libtheora/LICENSE rename : modules/libtheora/Makefile.in => media/libtheora/Makefile.in rename : modules/libtheora/README => media/libtheora/README rename : modules/libtheora/README_MOZILLA => media/libtheora/README_MOZILLA rename : modules/libtheora/changeset_r15144.diff => media/libtheora/changeset_r15144.diff rename : modules/libtheora/include/Makefile.in => media/libtheora/include/Makefile.in rename : modules/libtheora/include/theora/Makefile.in => media/libtheora/include/theora/Makefile.in rename : modules/libtheora/include/theora/codec.h => media/libtheora/include/theora/codec.h rename : modules/libtheora/include/theora/config.h => media/libtheora/include/theora/config.h rename : modules/libtheora/include/theora/theora.h => media/libtheora/include/theora/theora.h rename : modules/libtheora/include/theora/theoradec.h => media/libtheora/include/theora/theoradec.h rename : modules/libtheora/lib/Makefile.in => media/libtheora/lib/Makefile.in rename : modules/libtheora/lib/config.h => media/libtheora/lib/config.h rename : modules/libtheora/lib/cpu.c => media/libtheora/lib/cpu.c rename : modules/libtheora/lib/cpu.h => media/libtheora/lib/cpu.h rename : modules/libtheora/lib/dec/apiwrapper.c => media/libtheora/lib/dec/apiwrapper.c rename : modules/libtheora/lib/dec/apiwrapper.h => media/libtheora/lib/dec/apiwrapper.h rename : modules/libtheora/lib/dec/bitwise.c => media/libtheora/lib/dec/bitwise.c rename : modules/libtheora/lib/dec/bitwise.h => media/libtheora/lib/dec/bitwise.h rename : modules/libtheora/lib/dec/dct.h => media/libtheora/lib/dec/dct.h rename : modules/libtheora/lib/dec/decapiwrapper.c => media/libtheora/lib/dec/decapiwrapper.c rename : modules/libtheora/lib/dec/decinfo.c => media/libtheora/lib/dec/decinfo.c rename : modules/libtheora/lib/dec/decint.h => media/libtheora/lib/dec/decint.h rename : modules/libtheora/lib/dec/decode.c => media/libtheora/lib/dec/decode.c rename : modules/libtheora/lib/dec/dequant.c => media/libtheora/lib/dec/dequant.c rename : modules/libtheora/lib/dec/dequant.h => media/libtheora/lib/dec/dequant.h rename : modules/libtheora/lib/dec/enquant.h => media/libtheora/lib/dec/enquant.h rename : modules/libtheora/lib/dec/fragment.c => media/libtheora/lib/dec/fragment.c rename : modules/libtheora/lib/dec/huffdec.c => media/libtheora/lib/dec/huffdec.c rename : modules/libtheora/lib/dec/huffdec.h => media/libtheora/lib/dec/huffdec.h rename : modules/libtheora/lib/dec/huffman.h => media/libtheora/lib/dec/huffman.h rename : modules/libtheora/lib/dec/idct.c => media/libtheora/lib/dec/idct.c rename : modules/libtheora/lib/dec/idct.h => media/libtheora/lib/dec/idct.h rename : modules/libtheora/lib/dec/info.c => media/libtheora/lib/dec/info.c rename : modules/libtheora/lib/dec/internal.c => media/libtheora/lib/dec/internal.c rename : modules/libtheora/lib/dec/ocintrin.h => media/libtheora/lib/dec/ocintrin.h rename : modules/libtheora/lib/dec/quant.c => media/libtheora/lib/dec/quant.c rename : modules/libtheora/lib/dec/quant.h => media/libtheora/lib/dec/quant.h rename : modules/libtheora/lib/dec/state.c => media/libtheora/lib/dec/state.c rename : modules/libtheora/lib/dec/x86/mmxfrag.c => media/libtheora/lib/dec/x86/mmxfrag.c rename : modules/libtheora/lib/dec/x86/mmxidct.c => media/libtheora/lib/dec/x86/mmxidct.c rename : modules/libtheora/lib/dec/x86/mmxstate.c => media/libtheora/lib/dec/x86/mmxstate.c rename : modules/libtheora/lib/dec/x86/x86int.h => media/libtheora/lib/dec/x86/x86int.h rename : modules/libtheora/lib/dec/x86/x86state.c => media/libtheora/lib/dec/x86/x86state.c rename : modules/libtheora/lib/internal.h => media/libtheora/lib/internal.h rename : modules/libtheora/update.sh => media/libtheora/update.sh rename : modules/libvorbis/AUTHORS => media/libvorbis/AUTHORS rename : modules/libvorbis/COPYING => media/libvorbis/COPYING rename : modules/libvorbis/Makefile.in => media/libvorbis/Makefile.in rename : modules/libvorbis/README => media/libvorbis/README rename : modules/libvorbis/README_MOZILLA => media/libvorbis/README_MOZILLA rename : modules/libvorbis/include/Makefile.in => media/libvorbis/include/Makefile.in rename : modules/libvorbis/include/vorbis/Makefile.in => media/libvorbis/include/vorbis/Makefile.in rename : modules/libvorbis/include/vorbis/codec.h => media/libvorbis/include/vorbis/codec.h rename : modules/libvorbis/lib/Makefile.in => media/libvorbis/lib/Makefile.in rename : modules/libvorbis/lib/backends.h => media/libvorbis/lib/backends.h rename : modules/libvorbis/lib/bitrate.h => media/libvorbis/lib/bitrate.h rename : modules/libvorbis/lib/codebook.h => media/libvorbis/lib/codebook.h rename : modules/libvorbis/lib/codec_internal.h => media/libvorbis/lib/codec_internal.h rename : modules/libvorbis/lib/envelope.h => media/libvorbis/lib/envelope.h rename : modules/libvorbis/lib/highlevel.h => media/libvorbis/lib/highlevel.h rename : modules/libvorbis/lib/lookup.h => media/libvorbis/lib/lookup.h rename : modules/libvorbis/lib/lookup_data.h => media/libvorbis/lib/lookup_data.h rename : modules/libvorbis/lib/lpc.h => media/libvorbis/lib/lpc.h rename : modules/libvorbis/lib/lsp.h => media/libvorbis/lib/lsp.h rename : modules/libvorbis/lib/masking.h => media/libvorbis/lib/masking.h rename : modules/libvorbis/lib/mdct.h => media/libvorbis/lib/mdct.h rename : modules/libvorbis/lib/misc.h => media/libvorbis/lib/misc.h rename : modules/libvorbis/lib/os.h => media/libvorbis/lib/os.h rename : modules/libvorbis/lib/psy.h => media/libvorbis/lib/psy.h rename : modules/libvorbis/lib/registry.h => media/libvorbis/lib/registry.h rename : modules/libvorbis/lib/scales.h => media/libvorbis/lib/scales.h rename : modules/libvorbis/lib/smallft.h => media/libvorbis/lib/smallft.h rename : modules/libvorbis/lib/vorbis_analysis.c => media/libvorbis/lib/vorbis_analysis.c rename : modules/libvorbis/lib/vorbis_bitrate.c => media/libvorbis/lib/vorbis_bitrate.c rename : modules/libvorbis/lib/vorbis_block.c => media/libvorbis/lib/vorbis_block.c rename : modules/libvorbis/lib/vorbis_codebook.c => media/libvorbis/lib/vorbis_codebook.c rename : modules/libvorbis/lib/vorbis_envelope.c => media/libvorbis/lib/vorbis_envelope.c rename : modules/libvorbis/lib/vorbis_floor0.c => media/libvorbis/lib/vorbis_floor0.c rename : modules/libvorbis/lib/vorbis_floor1.c => media/libvorbis/lib/vorbis_floor1.c rename : modules/libvorbis/lib/vorbis_info.c => media/libvorbis/lib/vorbis_info.c rename : modules/libvorbis/lib/vorbis_lookup.c => media/libvorbis/lib/vorbis_lookup.c rename : modules/libvorbis/lib/vorbis_lpc.c => media/libvorbis/lib/vorbis_lpc.c rename : modules/libvorbis/lib/vorbis_lsp.c => media/libvorbis/lib/vorbis_lsp.c rename : modules/libvorbis/lib/vorbis_mapping0.c => media/libvorbis/lib/vorbis_mapping0.c rename : modules/libvorbis/lib/vorbis_mdct.c => media/libvorbis/lib/vorbis_mdct.c rename : modules/libvorbis/lib/vorbis_psy.c => media/libvorbis/lib/vorbis_psy.c rename : modules/libvorbis/lib/vorbis_registry.c => media/libvorbis/lib/vorbis_registry.c rename : modules/libvorbis/lib/vorbis_res0.c => media/libvorbis/lib/vorbis_res0.c rename : modules/libvorbis/lib/vorbis_sharedbook.c => media/libvorbis/lib/vorbis_sharedbook.c rename : modules/libvorbis/lib/vorbis_smallft.c => media/libvorbis/lib/vorbis_smallft.c rename : modules/libvorbis/lib/vorbis_synthesis.c => media/libvorbis/lib/vorbis_synthesis.c rename : modules/libvorbis/lib/vorbis_window.c => media/libvorbis/lib/vorbis_window.c rename : modules/libvorbis/lib/window.h => media/libvorbis/lib/window.h rename : modules/libvorbis/todo.txt => media/libvorbis/todo.txt rename : modules/libvorbis/update.sh => media/libvorbis/update.sh
845 lines
27 KiB
C
845 lines
27 KiB
C
/********************************************************************
|
|
* *
|
|
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
|
|
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
|
|
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
|
|
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
|
|
* *
|
|
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 *
|
|
* by the Xiph.Org Foundation http://www.xiph.org/ *
|
|
* *
|
|
********************************************************************
|
|
|
|
function: channel mapping 0 implementation
|
|
last mod: $Id: mapping0.c 13293 2007-07-24 00:09:47Z xiphmont $
|
|
|
|
********************************************************************/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <math.h>
|
|
#include <ogg/ogg.h>
|
|
#include "vorbis/codec.h"
|
|
#include "codec_internal.h"
|
|
#include "codebook.h"
|
|
#include "window.h"
|
|
#include "registry.h"
|
|
#include "psy.h"
|
|
#include "misc.h"
|
|
|
|
/* simplistic, wasteful way of doing this (unique lookup for each
|
|
mode/submapping); there should be a central repository for
|
|
identical lookups. That will require minor work, so I'm putting it
|
|
off as low priority.
|
|
|
|
Why a lookup for each backend in a given mode? Because the
|
|
blocksize is set by the mode, and low backend lookups may require
|
|
parameters from other areas of the mode/mapping */
|
|
|
|
static void mapping0_free_info(vorbis_info_mapping *i){
|
|
vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)i;
|
|
if(info){
|
|
memset(info,0,sizeof(*info));
|
|
_ogg_free(info);
|
|
}
|
|
}
|
|
|
|
static int ilog(unsigned int v){
|
|
int ret=0;
|
|
if(v)--v;
|
|
while(v){
|
|
ret++;
|
|
v>>=1;
|
|
}
|
|
return(ret);
|
|
}
|
|
|
|
static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm,
|
|
oggpack_buffer *opb){
|
|
int i;
|
|
vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)vm;
|
|
|
|
/* another 'we meant to do it this way' hack... up to beta 4, we
|
|
packed 4 binary zeros here to signify one submapping in use. We
|
|
now redefine that to mean four bitflags that indicate use of
|
|
deeper features; bit0:submappings, bit1:coupling,
|
|
bit2,3:reserved. This is backward compatable with all actual uses
|
|
of the beta code. */
|
|
|
|
if(info->submaps>1){
|
|
oggpack_write(opb,1,1);
|
|
oggpack_write(opb,info->submaps-1,4);
|
|
}else
|
|
oggpack_write(opb,0,1);
|
|
|
|
if(info->coupling_steps>0){
|
|
oggpack_write(opb,1,1);
|
|
oggpack_write(opb,info->coupling_steps-1,8);
|
|
|
|
for(i=0;i<info->coupling_steps;i++){
|
|
oggpack_write(opb,info->coupling_mag[i],ilog(vi->channels));
|
|
oggpack_write(opb,info->coupling_ang[i],ilog(vi->channels));
|
|
}
|
|
}else
|
|
oggpack_write(opb,0,1);
|
|
|
|
oggpack_write(opb,0,2); /* 2,3:reserved */
|
|
|
|
/* we don't write the channel submappings if we only have one... */
|
|
if(info->submaps>1){
|
|
for(i=0;i<vi->channels;i++)
|
|
oggpack_write(opb,info->chmuxlist[i],4);
|
|
}
|
|
for(i=0;i<info->submaps;i++){
|
|
oggpack_write(opb,0,8); /* time submap unused */
|
|
oggpack_write(opb,info->floorsubmap[i],8);
|
|
oggpack_write(opb,info->residuesubmap[i],8);
|
|
}
|
|
}
|
|
|
|
/* also responsible for range checking */
|
|
static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb){
|
|
int i;
|
|
vorbis_info_mapping0 *info=_ogg_calloc(1,sizeof(*info));
|
|
codec_setup_info *ci=vi->codec_setup;
|
|
memset(info,0,sizeof(*info));
|
|
|
|
if(oggpack_read(opb,1))
|
|
info->submaps=oggpack_read(opb,4)+1;
|
|
else
|
|
info->submaps=1;
|
|
|
|
if(oggpack_read(opb,1)){
|
|
info->coupling_steps=oggpack_read(opb,8)+1;
|
|
|
|
for(i=0;i<info->coupling_steps;i++){
|
|
int testM=info->coupling_mag[i]=oggpack_read(opb,ilog(vi->channels));
|
|
int testA=info->coupling_ang[i]=oggpack_read(opb,ilog(vi->channels));
|
|
|
|
if(testM<0 ||
|
|
testA<0 ||
|
|
testM==testA ||
|
|
testM>=vi->channels ||
|
|
testA>=vi->channels) goto err_out;
|
|
}
|
|
|
|
}
|
|
|
|
if(oggpack_read(opb,2)>0)goto err_out; /* 2,3:reserved */
|
|
|
|
if(info->submaps>1){
|
|
for(i=0;i<vi->channels;i++){
|
|
info->chmuxlist[i]=oggpack_read(opb,4);
|
|
if(info->chmuxlist[i]>=info->submaps)goto err_out;
|
|
}
|
|
}
|
|
for(i=0;i<info->submaps;i++){
|
|
oggpack_read(opb,8); /* time submap unused */
|
|
info->floorsubmap[i]=oggpack_read(opb,8);
|
|
if(info->floorsubmap[i]>=ci->floors)goto err_out;
|
|
info->residuesubmap[i]=oggpack_read(opb,8);
|
|
if(info->residuesubmap[i]>=ci->residues)goto err_out;
|
|
}
|
|
|
|
return info;
|
|
|
|
err_out:
|
|
mapping0_free_info(info);
|
|
return(NULL);
|
|
}
|
|
|
|
#include "os.h"
|
|
#include "lpc.h"
|
|
#include "lsp.h"
|
|
#include "envelope.h"
|
|
#include "mdct.h"
|
|
#include "psy.h"
|
|
#include "scales.h"
|
|
|
|
#if 0
|
|
static long seq=0;
|
|
static ogg_int64_t total=0;
|
|
static float FLOOR1_fromdB_LOOKUP[256]={
|
|
1.0649863e-07F, 1.1341951e-07F, 1.2079015e-07F, 1.2863978e-07F,
|
|
1.3699951e-07F, 1.4590251e-07F, 1.5538408e-07F, 1.6548181e-07F,
|
|
1.7623575e-07F, 1.8768855e-07F, 1.9988561e-07F, 2.128753e-07F,
|
|
2.2670913e-07F, 2.4144197e-07F, 2.5713223e-07F, 2.7384213e-07F,
|
|
2.9163793e-07F, 3.1059021e-07F, 3.3077411e-07F, 3.5226968e-07F,
|
|
3.7516214e-07F, 3.9954229e-07F, 4.2550680e-07F, 4.5315863e-07F,
|
|
4.8260743e-07F, 5.1396998e-07F, 5.4737065e-07F, 5.8294187e-07F,
|
|
6.2082472e-07F, 6.6116941e-07F, 7.0413592e-07F, 7.4989464e-07F,
|
|
7.9862701e-07F, 8.5052630e-07F, 9.0579828e-07F, 9.6466216e-07F,
|
|
1.0273513e-06F, 1.0941144e-06F, 1.1652161e-06F, 1.2409384e-06F,
|
|
1.3215816e-06F, 1.4074654e-06F, 1.4989305e-06F, 1.5963394e-06F,
|
|
1.7000785e-06F, 1.8105592e-06F, 1.9282195e-06F, 2.0535261e-06F,
|
|
2.1869758e-06F, 2.3290978e-06F, 2.4804557e-06F, 2.6416497e-06F,
|
|
2.8133190e-06F, 2.9961443e-06F, 3.1908506e-06F, 3.3982101e-06F,
|
|
3.6190449e-06F, 3.8542308e-06F, 4.1047004e-06F, 4.3714470e-06F,
|
|
4.6555282e-06F, 4.9580707e-06F, 5.2802740e-06F, 5.6234160e-06F,
|
|
5.9888572e-06F, 6.3780469e-06F, 6.7925283e-06F, 7.2339451e-06F,
|
|
7.7040476e-06F, 8.2047000e-06F, 8.7378876e-06F, 9.3057248e-06F,
|
|
9.9104632e-06F, 1.0554501e-05F, 1.1240392e-05F, 1.1970856e-05F,
|
|
1.2748789e-05F, 1.3577278e-05F, 1.4459606e-05F, 1.5399272e-05F,
|
|
1.6400004e-05F, 1.7465768e-05F, 1.8600792e-05F, 1.9809576e-05F,
|
|
2.1096914e-05F, 2.2467911e-05F, 2.3928002e-05F, 2.5482978e-05F,
|
|
2.7139006e-05F, 2.8902651e-05F, 3.0780908e-05F, 3.2781225e-05F,
|
|
3.4911534e-05F, 3.7180282e-05F, 3.9596466e-05F, 4.2169667e-05F,
|
|
4.4910090e-05F, 4.7828601e-05F, 5.0936773e-05F, 5.4246931e-05F,
|
|
5.7772202e-05F, 6.1526565e-05F, 6.5524908e-05F, 6.9783085e-05F,
|
|
7.4317983e-05F, 7.9147585e-05F, 8.4291040e-05F, 8.9768747e-05F,
|
|
9.5602426e-05F, 0.00010181521F, 0.00010843174F, 0.00011547824F,
|
|
0.00012298267F, 0.00013097477F, 0.00013948625F, 0.00014855085F,
|
|
0.00015820453F, 0.00016848555F, 0.00017943469F, 0.00019109536F,
|
|
0.00020351382F, 0.00021673929F, 0.00023082423F, 0.00024582449F,
|
|
0.00026179955F, 0.00027881276F, 0.00029693158F, 0.00031622787F,
|
|
0.00033677814F, 0.00035866388F, 0.00038197188F, 0.00040679456F,
|
|
0.00043323036F, 0.00046138411F, 0.00049136745F, 0.00052329927F,
|
|
0.00055730621F, 0.00059352311F, 0.00063209358F, 0.00067317058F,
|
|
0.00071691700F, 0.00076350630F, 0.00081312324F, 0.00086596457F,
|
|
0.00092223983F, 0.00098217216F, 0.0010459992F, 0.0011139742F,
|
|
0.0011863665F, 0.0012634633F, 0.0013455702F, 0.0014330129F,
|
|
0.0015261382F, 0.0016253153F, 0.0017309374F, 0.0018434235F,
|
|
0.0019632195F, 0.0020908006F, 0.0022266726F, 0.0023713743F,
|
|
0.0025254795F, 0.0026895994F, 0.0028643847F, 0.0030505286F,
|
|
0.0032487691F, 0.0034598925F, 0.0036847358F, 0.0039241906F,
|
|
0.0041792066F, 0.0044507950F, 0.0047400328F, 0.0050480668F,
|
|
0.0053761186F, 0.0057254891F, 0.0060975636F, 0.0064938176F,
|
|
0.0069158225F, 0.0073652516F, 0.0078438871F, 0.0083536271F,
|
|
0.0088964928F, 0.009474637F, 0.010090352F, 0.010746080F,
|
|
0.011444421F, 0.012188144F, 0.012980198F, 0.013823725F,
|
|
0.014722068F, 0.015678791F, 0.016697687F, 0.017782797F,
|
|
0.018938423F, 0.020169149F, 0.021479854F, 0.022875735F,
|
|
0.024362330F, 0.025945531F, 0.027631618F, 0.029427276F,
|
|
0.031339626F, 0.033376252F, 0.035545228F, 0.037855157F,
|
|
0.040315199F, 0.042935108F, 0.045725273F, 0.048696758F,
|
|
0.051861348F, 0.055231591F, 0.058820850F, 0.062643361F,
|
|
0.066714279F, 0.071049749F, 0.075666962F, 0.080584227F,
|
|
0.085821044F, 0.091398179F, 0.097337747F, 0.10366330F,
|
|
0.11039993F, 0.11757434F, 0.12521498F, 0.13335215F,
|
|
0.14201813F, 0.15124727F, 0.16107617F, 0.17154380F,
|
|
0.18269168F, 0.19456402F, 0.20720788F, 0.22067342F,
|
|
0.23501402F, 0.25028656F, 0.26655159F, 0.28387361F,
|
|
0.30232132F, 0.32196786F, 0.34289114F, 0.36517414F,
|
|
0.38890521F, 0.41417847F, 0.44109412F, 0.46975890F,
|
|
0.50028648F, 0.53279791F, 0.56742212F, 0.60429640F,
|
|
0.64356699F, 0.68538959F, 0.72993007F, 0.77736504F,
|
|
0.82788260F, 0.88168307F, 0.9389798F, 1.F,
|
|
};
|
|
|
|
#endif
|
|
|
|
extern int *floor1_fit(vorbis_block *vb,vorbis_look_floor *look,
|
|
const float *logmdct, /* in */
|
|
const float *logmask);
|
|
extern int *floor1_interpolate_fit(vorbis_block *vb,vorbis_look_floor *look,
|
|
int *A,int *B,
|
|
int del);
|
|
extern int floor1_encode(oggpack_buffer *opb,vorbis_block *vb,
|
|
vorbis_look_floor *look,
|
|
int *post,int *ilogmask);
|
|
|
|
|
|
static int mapping0_forward(vorbis_block *vb){
|
|
vorbis_dsp_state *vd=vb->vd;
|
|
vorbis_info *vi=vd->vi;
|
|
codec_setup_info *ci=vi->codec_setup;
|
|
private_state *b=vb->vd->backend_state;
|
|
vorbis_block_internal *vbi=(vorbis_block_internal *)vb->internal;
|
|
int n=vb->pcmend;
|
|
int i,j,k;
|
|
|
|
int *nonzero = alloca(sizeof(*nonzero)*vi->channels);
|
|
float **gmdct = _vorbis_block_alloc(vb,vi->channels*sizeof(*gmdct));
|
|
int **ilogmaskch= _vorbis_block_alloc(vb,vi->channels*sizeof(*ilogmaskch));
|
|
int ***floor_posts = _vorbis_block_alloc(vb,vi->channels*sizeof(*floor_posts));
|
|
|
|
float global_ampmax=vbi->ampmax;
|
|
float *local_ampmax=alloca(sizeof(*local_ampmax)*vi->channels);
|
|
int blocktype=vbi->blocktype;
|
|
|
|
int modenumber=vb->W;
|
|
vorbis_info_mapping0 *info=ci->map_param[modenumber];
|
|
vorbis_look_psy *psy_look=
|
|
b->psy+blocktype+(vb->W?2:0);
|
|
|
|
vb->mode=modenumber;
|
|
|
|
for(i=0;i<vi->channels;i++){
|
|
float scale=4.f/n;
|
|
float scale_dB;
|
|
|
|
float *pcm =vb->pcm[i];
|
|
float *logfft =pcm;
|
|
|
|
gmdct[i]=_vorbis_block_alloc(vb,n/2*sizeof(**gmdct));
|
|
|
|
scale_dB=todB(&scale) + .345; /* + .345 is a hack; the original
|
|
todB estimation used on IEEE 754
|
|
compliant machines had a bug that
|
|
returned dB values about a third
|
|
of a decibel too high. The bug
|
|
was harmless because tunings
|
|
implicitly took that into
|
|
account. However, fixing the bug
|
|
in the estimator requires
|
|
changing all the tunings as well.
|
|
For now, it's easier to sync
|
|
things back up here, and
|
|
recalibrate the tunings in the
|
|
next major model upgrade. */
|
|
|
|
#if 0
|
|
if(vi->channels==2)
|
|
if(i==0)
|
|
_analysis_output("pcmL",seq,pcm,n,0,0,total-n/2);
|
|
else
|
|
_analysis_output("pcmR",seq,pcm,n,0,0,total-n/2);
|
|
#endif
|
|
|
|
/* window the PCM data */
|
|
_vorbis_apply_window(pcm,b->window,ci->blocksizes,vb->lW,vb->W,vb->nW);
|
|
|
|
#if 0
|
|
if(vi->channels==2)
|
|
if(i==0)
|
|
_analysis_output("windowedL",seq,pcm,n,0,0,total-n/2);
|
|
else
|
|
_analysis_output("windowedR",seq,pcm,n,0,0,total-n/2);
|
|
#endif
|
|
|
|
/* transform the PCM data */
|
|
/* only MDCT right now.... */
|
|
mdct_forward(b->transform[vb->W][0],pcm,gmdct[i]);
|
|
|
|
/* FFT yields more accurate tonal estimation (not phase sensitive) */
|
|
drft_forward(&b->fft_look[vb->W],pcm);
|
|
logfft[0]=scale_dB+todB(pcm) + .345; /* + .345 is a hack; the
|
|
original todB estimation used on
|
|
IEEE 754 compliant machines had a
|
|
bug that returned dB values about
|
|
a third of a decibel too high.
|
|
The bug was harmless because
|
|
tunings implicitly took that into
|
|
account. However, fixing the bug
|
|
in the estimator requires
|
|
changing all the tunings as well.
|
|
For now, it's easier to sync
|
|
things back up here, and
|
|
recalibrate the tunings in the
|
|
next major model upgrade. */
|
|
local_ampmax[i]=logfft[0];
|
|
for(j=1;j<n-1;j+=2){
|
|
float temp=pcm[j]*pcm[j]+pcm[j+1]*pcm[j+1];
|
|
temp=logfft[(j+1)>>1]=scale_dB+.5f*todB(&temp) + .345; /* +
|
|
.345 is a hack; the original todB
|
|
estimation used on IEEE 754
|
|
compliant machines had a bug that
|
|
returned dB values about a third
|
|
of a decibel too high. The bug
|
|
was harmless because tunings
|
|
implicitly took that into
|
|
account. However, fixing the bug
|
|
in the estimator requires
|
|
changing all the tunings as well.
|
|
For now, it's easier to sync
|
|
things back up here, and
|
|
recalibrate the tunings in the
|
|
next major model upgrade. */
|
|
if(temp>local_ampmax[i])local_ampmax[i]=temp;
|
|
}
|
|
|
|
if(local_ampmax[i]>0.f)local_ampmax[i]=0.f;
|
|
if(local_ampmax[i]>global_ampmax)global_ampmax=local_ampmax[i];
|
|
|
|
#if 0
|
|
if(vi->channels==2){
|
|
if(i==0){
|
|
_analysis_output("fftL",seq,logfft,n/2,1,0,0);
|
|
}else{
|
|
_analysis_output("fftR",seq,logfft,n/2,1,0,0);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
}
|
|
|
|
{
|
|
float *noise = _vorbis_block_alloc(vb,n/2*sizeof(*noise));
|
|
float *tone = _vorbis_block_alloc(vb,n/2*sizeof(*tone));
|
|
|
|
for(i=0;i<vi->channels;i++){
|
|
/* the encoder setup assumes that all the modes used by any
|
|
specific bitrate tweaking use the same floor */
|
|
|
|
int submap=info->chmuxlist[i];
|
|
|
|
/* the following makes things clearer to *me* anyway */
|
|
float *mdct =gmdct[i];
|
|
float *logfft =vb->pcm[i];
|
|
|
|
float *logmdct =logfft+n/2;
|
|
float *logmask =logfft;
|
|
|
|
vb->mode=modenumber;
|
|
|
|
floor_posts[i]=_vorbis_block_alloc(vb,PACKETBLOBS*sizeof(**floor_posts));
|
|
memset(floor_posts[i],0,sizeof(**floor_posts)*PACKETBLOBS);
|
|
|
|
for(j=0;j<n/2;j++)
|
|
logmdct[j]=todB(mdct+j) + .345; /* + .345 is a hack; the original
|
|
todB estimation used on IEEE 754
|
|
compliant machines had a bug that
|
|
returned dB values about a third
|
|
of a decibel too high. The bug
|
|
was harmless because tunings
|
|
implicitly took that into
|
|
account. However, fixing the bug
|
|
in the estimator requires
|
|
changing all the tunings as well.
|
|
For now, it's easier to sync
|
|
things back up here, and
|
|
recalibrate the tunings in the
|
|
next major model upgrade. */
|
|
|
|
#if 0
|
|
if(vi->channels==2){
|
|
if(i==0)
|
|
_analysis_output("mdctL",seq,logmdct,n/2,1,0,0);
|
|
else
|
|
_analysis_output("mdctR",seq,logmdct,n/2,1,0,0);
|
|
}else{
|
|
_analysis_output("mdct",seq,logmdct,n/2,1,0,0);
|
|
}
|
|
#endif
|
|
|
|
/* first step; noise masking. Not only does 'noise masking'
|
|
give us curves from which we can decide how much resolution
|
|
to give noise parts of the spectrum, it also implicitly hands
|
|
us a tonality estimate (the larger the value in the
|
|
'noise_depth' vector, the more tonal that area is) */
|
|
|
|
_vp_noisemask(psy_look,
|
|
logmdct,
|
|
noise); /* noise does not have by-frequency offset
|
|
bias applied yet */
|
|
#if 0
|
|
if(vi->channels==2){
|
|
if(i==0)
|
|
_analysis_output("noiseL",seq,noise,n/2,1,0,0);
|
|
else
|
|
_analysis_output("noiseR",seq,noise,n/2,1,0,0);
|
|
}
|
|
#endif
|
|
|
|
/* second step: 'all the other crap'; all the stuff that isn't
|
|
computed/fit for bitrate management goes in the second psy
|
|
vector. This includes tone masking, peak limiting and ATH */
|
|
|
|
_vp_tonemask(psy_look,
|
|
logfft,
|
|
tone,
|
|
global_ampmax,
|
|
local_ampmax[i]);
|
|
|
|
#if 0
|
|
if(vi->channels==2){
|
|
if(i==0)
|
|
_analysis_output("toneL",seq,tone,n/2,1,0,0);
|
|
else
|
|
_analysis_output("toneR",seq,tone,n/2,1,0,0);
|
|
}
|
|
#endif
|
|
|
|
/* third step; we offset the noise vectors, overlay tone
|
|
masking. We then do a floor1-specific line fit. If we're
|
|
performing bitrate management, the line fit is performed
|
|
multiple times for up/down tweakage on demand. */
|
|
|
|
#if 0
|
|
{
|
|
float aotuv[psy_look->n];
|
|
#endif
|
|
|
|
_vp_offset_and_mix(psy_look,
|
|
noise,
|
|
tone,
|
|
1,
|
|
logmask,
|
|
mdct,
|
|
logmdct);
|
|
|
|
#if 0
|
|
if(vi->channels==2){
|
|
if(i==0)
|
|
_analysis_output("aotuvM1_L",seq,aotuv,psy_look->n,1,1,0);
|
|
else
|
|
_analysis_output("aotuvM1_R",seq,aotuv,psy_look->n,1,1,0);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
|
|
#if 0
|
|
if(vi->channels==2){
|
|
if(i==0)
|
|
_analysis_output("mask1L",seq,logmask,n/2,1,0,0);
|
|
else
|
|
_analysis_output("mask1R",seq,logmask,n/2,1,0,0);
|
|
}
|
|
#endif
|
|
|
|
/* this algorithm is hardwired to floor 1 for now; abort out if
|
|
we're *not* floor1. This won't happen unless someone has
|
|
broken the encode setup lib. Guard it anyway. */
|
|
if(ci->floor_type[info->floorsubmap[submap]]!=1)return(-1);
|
|
|
|
floor_posts[i][PACKETBLOBS/2]=
|
|
floor1_fit(vb,b->flr[info->floorsubmap[submap]],
|
|
logmdct,
|
|
logmask);
|
|
|
|
/* are we managing bitrate? If so, perform two more fits for
|
|
later rate tweaking (fits represent hi/lo) */
|
|
if(vorbis_bitrate_managed(vb) && floor_posts[i][PACKETBLOBS/2]){
|
|
/* higher rate by way of lower noise curve */
|
|
|
|
_vp_offset_and_mix(psy_look,
|
|
noise,
|
|
tone,
|
|
2,
|
|
logmask,
|
|
mdct,
|
|
logmdct);
|
|
|
|
#if 0
|
|
if(vi->channels==2){
|
|
if(i==0)
|
|
_analysis_output("mask2L",seq,logmask,n/2,1,0,0);
|
|
else
|
|
_analysis_output("mask2R",seq,logmask,n/2,1,0,0);
|
|
}
|
|
#endif
|
|
|
|
floor_posts[i][PACKETBLOBS-1]=
|
|
floor1_fit(vb,b->flr[info->floorsubmap[submap]],
|
|
logmdct,
|
|
logmask);
|
|
|
|
/* lower rate by way of higher noise curve */
|
|
_vp_offset_and_mix(psy_look,
|
|
noise,
|
|
tone,
|
|
0,
|
|
logmask,
|
|
mdct,
|
|
logmdct);
|
|
|
|
#if 0
|
|
if(vi->channels==2)
|
|
if(i==0)
|
|
_analysis_output("mask0L",seq,logmask,n/2,1,0,0);
|
|
else
|
|
_analysis_output("mask0R",seq,logmask,n/2,1,0,0);
|
|
#endif
|
|
|
|
floor_posts[i][0]=
|
|
floor1_fit(vb,b->flr[info->floorsubmap[submap]],
|
|
logmdct,
|
|
logmask);
|
|
|
|
/* we also interpolate a range of intermediate curves for
|
|
intermediate rates */
|
|
for(k=1;k<PACKETBLOBS/2;k++)
|
|
floor_posts[i][k]=
|
|
floor1_interpolate_fit(vb,b->flr[info->floorsubmap[submap]],
|
|
floor_posts[i][0],
|
|
floor_posts[i][PACKETBLOBS/2],
|
|
k*65536/(PACKETBLOBS/2));
|
|
for(k=PACKETBLOBS/2+1;k<PACKETBLOBS-1;k++)
|
|
floor_posts[i][k]=
|
|
floor1_interpolate_fit(vb,b->flr[info->floorsubmap[submap]],
|
|
floor_posts[i][PACKETBLOBS/2],
|
|
floor_posts[i][PACKETBLOBS-1],
|
|
(k-PACKETBLOBS/2)*65536/(PACKETBLOBS/2));
|
|
}
|
|
}
|
|
}
|
|
vbi->ampmax=global_ampmax;
|
|
|
|
/*
|
|
the next phases are performed once for vbr-only and PACKETBLOB
|
|
times for bitrate managed modes.
|
|
|
|
1) encode actual mode being used
|
|
2) encode the floor for each channel, compute coded mask curve/res
|
|
3) normalize and couple.
|
|
4) encode residue
|
|
5) save packet bytes to the packetblob vector
|
|
|
|
*/
|
|
|
|
/* iterate over the many masking curve fits we've created */
|
|
|
|
{
|
|
float **res_bundle=alloca(sizeof(*res_bundle)*vi->channels);
|
|
float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels);
|
|
int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
|
|
int **sortindex=alloca(sizeof(*sortindex)*vi->channels);
|
|
float **mag_memo;
|
|
int **mag_sort;
|
|
|
|
if(info->coupling_steps){
|
|
mag_memo=_vp_quantize_couple_memo(vb,
|
|
&ci->psy_g_param,
|
|
psy_look,
|
|
info,
|
|
gmdct);
|
|
|
|
mag_sort=_vp_quantize_couple_sort(vb,
|
|
psy_look,
|
|
info,
|
|
mag_memo);
|
|
|
|
hf_reduction(&ci->psy_g_param,
|
|
psy_look,
|
|
info,
|
|
mag_memo);
|
|
}
|
|
|
|
memset(sortindex,0,sizeof(*sortindex)*vi->channels);
|
|
if(psy_look->vi->normal_channel_p){
|
|
for(i=0;i<vi->channels;i++){
|
|
float *mdct =gmdct[i];
|
|
sortindex[i]=alloca(sizeof(**sortindex)*n/2);
|
|
_vp_noise_normalize_sort(psy_look,mdct,sortindex[i]);
|
|
}
|
|
}
|
|
|
|
for(k=(vorbis_bitrate_managed(vb)?0:PACKETBLOBS/2);
|
|
k<=(vorbis_bitrate_managed(vb)?PACKETBLOBS-1:PACKETBLOBS/2);
|
|
k++){
|
|
oggpack_buffer *opb=vbi->packetblob[k];
|
|
|
|
/* start out our new packet blob with packet type and mode */
|
|
/* Encode the packet type */
|
|
oggpack_write(opb,0,1);
|
|
/* Encode the modenumber */
|
|
/* Encode frame mode, pre,post windowsize, then dispatch */
|
|
oggpack_write(opb,modenumber,b->modebits);
|
|
if(vb->W){
|
|
oggpack_write(opb,vb->lW,1);
|
|
oggpack_write(opb,vb->nW,1);
|
|
}
|
|
|
|
/* encode floor, compute masking curve, sep out residue */
|
|
for(i=0;i<vi->channels;i++){
|
|
int submap=info->chmuxlist[i];
|
|
float *mdct =gmdct[i];
|
|
float *res =vb->pcm[i];
|
|
int *ilogmask=ilogmaskch[i]=
|
|
_vorbis_block_alloc(vb,n/2*sizeof(**gmdct));
|
|
|
|
nonzero[i]=floor1_encode(opb,vb,b->flr[info->floorsubmap[submap]],
|
|
floor_posts[i][k],
|
|
ilogmask);
|
|
#if 0
|
|
{
|
|
char buf[80];
|
|
sprintf(buf,"maskI%c%d",i?'R':'L',k);
|
|
float work[n/2];
|
|
for(j=0;j<n/2;j++)
|
|
work[j]=FLOOR1_fromdB_LOOKUP[ilogmask[j]];
|
|
_analysis_output(buf,seq,work,n/2,1,1,0);
|
|
}
|
|
#endif
|
|
_vp_remove_floor(psy_look,
|
|
mdct,
|
|
ilogmask,
|
|
res,
|
|
ci->psy_g_param.sliding_lowpass[vb->W][k]);
|
|
|
|
_vp_noise_normalize(psy_look,res,res+n/2,sortindex[i]);
|
|
|
|
|
|
#if 0
|
|
{
|
|
char buf[80];
|
|
float work[n/2];
|
|
for(j=0;j<n/2;j++)
|
|
work[j]=FLOOR1_fromdB_LOOKUP[ilogmask[j]]*(res+n/2)[j];
|
|
sprintf(buf,"resI%c%d",i?'R':'L',k);
|
|
_analysis_output(buf,seq,work,n/2,1,1,0);
|
|
|
|
}
|
|
#endif
|
|
}
|
|
|
|
/* our iteration is now based on masking curve, not prequant and
|
|
coupling. Only one prequant/coupling step */
|
|
|
|
/* quantize/couple */
|
|
/* incomplete implementation that assumes the tree is all depth
|
|
one, or no tree at all */
|
|
if(info->coupling_steps){
|
|
_vp_couple(k,
|
|
&ci->psy_g_param,
|
|
psy_look,
|
|
info,
|
|
vb->pcm,
|
|
mag_memo,
|
|
mag_sort,
|
|
ilogmaskch,
|
|
nonzero,
|
|
ci->psy_g_param.sliding_lowpass[vb->W][k]);
|
|
}
|
|
|
|
/* classify and encode by submap */
|
|
for(i=0;i<info->submaps;i++){
|
|
int ch_in_bundle=0;
|
|
long **classifications;
|
|
int resnum=info->residuesubmap[i];
|
|
|
|
for(j=0;j<vi->channels;j++){
|
|
if(info->chmuxlist[j]==i){
|
|
zerobundle[ch_in_bundle]=0;
|
|
if(nonzero[j])zerobundle[ch_in_bundle]=1;
|
|
res_bundle[ch_in_bundle]=vb->pcm[j];
|
|
couple_bundle[ch_in_bundle++]=vb->pcm[j]+n/2;
|
|
}
|
|
}
|
|
|
|
classifications=_residue_P[ci->residue_type[resnum]]->
|
|
class(vb,b->residue[resnum],couple_bundle,zerobundle,ch_in_bundle);
|
|
|
|
_residue_P[ci->residue_type[resnum]]->
|
|
forward(opb,vb,b->residue[resnum],
|
|
couple_bundle,NULL,zerobundle,ch_in_bundle,classifications);
|
|
}
|
|
|
|
/* ok, done encoding. Next protopacket. */
|
|
}
|
|
|
|
}
|
|
|
|
#if 0
|
|
seq++;
|
|
total+=ci->blocksizes[vb->W]/4+ci->blocksizes[vb->nW]/4;
|
|
#endif
|
|
return(0);
|
|
}
|
|
|
|
static int mapping0_inverse(vorbis_block *vb,vorbis_info_mapping *l){
|
|
vorbis_dsp_state *vd=vb->vd;
|
|
vorbis_info *vi=vd->vi;
|
|
codec_setup_info *ci=vi->codec_setup;
|
|
private_state *b=vd->backend_state;
|
|
vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l;
|
|
int hs=ci->halfrate_flag;
|
|
|
|
int i,j;
|
|
long n=vb->pcmend=ci->blocksizes[vb->W];
|
|
|
|
float **pcmbundle=alloca(sizeof(*pcmbundle)*vi->channels);
|
|
int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
|
|
|
|
int *nonzero =alloca(sizeof(*nonzero)*vi->channels);
|
|
void **floormemo=alloca(sizeof(*floormemo)*vi->channels);
|
|
|
|
/* recover the spectral envelope; store it in the PCM vector for now */
|
|
for(i=0;i<vi->channels;i++){
|
|
int submap=info->chmuxlist[i];
|
|
floormemo[i]=_floor_P[ci->floor_type[info->floorsubmap[submap]]]->
|
|
inverse1(vb,b->flr[info->floorsubmap[submap]]);
|
|
if(floormemo[i])
|
|
nonzero[i]=1;
|
|
else
|
|
nonzero[i]=0;
|
|
memset(vb->pcm[i],0,sizeof(*vb->pcm[i])*n/2);
|
|
}
|
|
|
|
/* channel coupling can 'dirty' the nonzero listing */
|
|
for(i=0;i<info->coupling_steps;i++){
|
|
if(nonzero[info->coupling_mag[i]] ||
|
|
nonzero[info->coupling_ang[i]]){
|
|
nonzero[info->coupling_mag[i]]=1;
|
|
nonzero[info->coupling_ang[i]]=1;
|
|
}
|
|
}
|
|
|
|
/* recover the residue into our working vectors */
|
|
for(i=0;i<info->submaps;i++){
|
|
int ch_in_bundle=0;
|
|
for(j=0;j<vi->channels;j++){
|
|
if(info->chmuxlist[j]==i){
|
|
if(nonzero[j])
|
|
zerobundle[ch_in_bundle]=1;
|
|
else
|
|
zerobundle[ch_in_bundle]=0;
|
|
pcmbundle[ch_in_bundle++]=vb->pcm[j];
|
|
}
|
|
}
|
|
|
|
_residue_P[ci->residue_type[info->residuesubmap[i]]]->
|
|
inverse(vb,b->residue[info->residuesubmap[i]],
|
|
pcmbundle,zerobundle,ch_in_bundle);
|
|
}
|
|
|
|
/* channel coupling */
|
|
for(i=info->coupling_steps-1;i>=0;i--){
|
|
float *pcmM=vb->pcm[info->coupling_mag[i]];
|
|
float *pcmA=vb->pcm[info->coupling_ang[i]];
|
|
|
|
for(j=0;j<n/2;j++){
|
|
float mag=pcmM[j];
|
|
float ang=pcmA[j];
|
|
|
|
if(mag>0)
|
|
if(ang>0){
|
|
pcmM[j]=mag;
|
|
pcmA[j]=mag-ang;
|
|
}else{
|
|
pcmA[j]=mag;
|
|
pcmM[j]=mag+ang;
|
|
}
|
|
else
|
|
if(ang>0){
|
|
pcmM[j]=mag;
|
|
pcmA[j]=mag+ang;
|
|
}else{
|
|
pcmA[j]=mag;
|
|
pcmM[j]=mag-ang;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* compute and apply spectral envelope */
|
|
for(i=0;i<vi->channels;i++){
|
|
float *pcm=vb->pcm[i];
|
|
int submap=info->chmuxlist[i];
|
|
_floor_P[ci->floor_type[info->floorsubmap[submap]]]->
|
|
inverse2(vb,b->flr[info->floorsubmap[submap]],
|
|
floormemo[i],pcm);
|
|
}
|
|
|
|
/* transform the PCM data; takes PCM vector, vb; modifies PCM vector */
|
|
/* only MDCT right now.... */
|
|
for(i=0;i<vi->channels;i++){
|
|
float *pcm=vb->pcm[i];
|
|
mdct_backward(b->transform[vb->W][0],pcm,pcm);
|
|
}
|
|
|
|
/* all done! */
|
|
return(0);
|
|
}
|
|
|
|
/* export hooks */
|
|
vorbis_func_mapping mapping0_exportbundle={
|
|
&mapping0_pack,
|
|
&mapping0_unpack,
|
|
&mapping0_free_info,
|
|
&mapping0_forward,
|
|
&mapping0_inverse
|
|
};
|
|
|