gecko/media/libvorbis/lib/vorbis_bitrate.c
Chris Double f2b6a8b7fe Bug 448834. Move Ogg libraries from modules/ to media/. r+sr=roc
--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
2008-08-06 12:47:37 +12:00

254 lines
8.2 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: bitrate tracking and management
last mod: $Id: bitrate.c 13293 2007-07-24 00:09:47Z xiphmont $
********************************************************************/
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "os.h"
#include "misc.h"
#include "bitrate.h"
/* compute bitrate tracking setup */
void vorbis_bitrate_init(vorbis_info *vi,bitrate_manager_state *bm){
codec_setup_info *ci=vi->codec_setup;
bitrate_manager_info *bi=&ci->bi;
memset(bm,0,sizeof(*bm));
if(bi && (bi->reservoir_bits>0)){
long ratesamples=vi->rate;
int halfsamples=ci->blocksizes[0]>>1;
bm->short_per_long=ci->blocksizes[1]/ci->blocksizes[0];
bm->managed=1;
bm->avg_bitsper= rint(1.*bi->avg_rate*halfsamples/ratesamples);
bm->min_bitsper= rint(1.*bi->min_rate*halfsamples/ratesamples);
bm->max_bitsper= rint(1.*bi->max_rate*halfsamples/ratesamples);
bm->avgfloat=PACKETBLOBS/2;
/* not a necessary fix, but one that leads to a more balanced
typical initialization */
{
long desired_fill=bi->reservoir_bits*bi->reservoir_bias;
bm->minmax_reservoir=desired_fill;
bm->avg_reservoir=desired_fill;
}
}
}
void vorbis_bitrate_clear(bitrate_manager_state *bm){
memset(bm,0,sizeof(*bm));
return;
}
int vorbis_bitrate_managed(vorbis_block *vb){
vorbis_dsp_state *vd=vb->vd;
private_state *b=vd->backend_state;
bitrate_manager_state *bm=&b->bms;
if(bm && bm->managed)return(1);
return(0);
}
/* finish taking in the block we just processed */
int vorbis_bitrate_addblock(vorbis_block *vb){
vorbis_block_internal *vbi=vb->internal;
vorbis_dsp_state *vd=vb->vd;
private_state *b=vd->backend_state;
bitrate_manager_state *bm=&b->bms;
vorbis_info *vi=vd->vi;
codec_setup_info *ci=vi->codec_setup;
bitrate_manager_info *bi=&ci->bi;
int choice=rint(bm->avgfloat);
long this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
long min_target_bits=(vb->W?bm->min_bitsper*bm->short_per_long:bm->min_bitsper);
long max_target_bits=(vb->W?bm->max_bitsper*bm->short_per_long:bm->max_bitsper);
int samples=ci->blocksizes[vb->W]>>1;
long desired_fill=bi->reservoir_bits*bi->reservoir_bias;
if(!bm->managed){
/* not a bitrate managed stream, but for API simplicity, we'll
buffer the packet to keep the code path clean */
if(bm->vb)return(-1); /* one has been submitted without
being claimed */
bm->vb=vb;
return(0);
}
bm->vb=vb;
/* look ahead for avg floater */
if(bm->avg_bitsper>0){
double slew=0.;
long avg_target_bits=(vb->W?bm->avg_bitsper*bm->short_per_long:bm->avg_bitsper);
double slewlimit= 15./bi->slew_damp;
/* choosing a new floater:
if we're over target, we slew down
if we're under target, we slew up
choose slew as follows: look through packetblobs of this frame
and set slew as the first in the appropriate direction that
gives us the slew we want. This may mean no slew if delta is
already favorable.
Then limit slew to slew max */
if(bm->avg_reservoir+(this_bits-avg_target_bits)>desired_fill){
while(choice>0 && this_bits>avg_target_bits &&
bm->avg_reservoir+(this_bits-avg_target_bits)>desired_fill){
choice--;
this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
}
}else if(bm->avg_reservoir+(this_bits-avg_target_bits)<desired_fill){
while(choice+1<PACKETBLOBS && this_bits<avg_target_bits &&
bm->avg_reservoir+(this_bits-avg_target_bits)<desired_fill){
choice++;
this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
}
}
slew=rint(choice-bm->avgfloat)/samples*vi->rate;
if(slew<-slewlimit)slew=-slewlimit;
if(slew>slewlimit)slew=slewlimit;
choice=rint(bm->avgfloat+= slew/vi->rate*samples);
this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
}
/* enforce min(if used) on the current floater (if used) */
if(bm->min_bitsper>0){
/* do we need to force the bitrate up? */
if(this_bits<min_target_bits){
while(bm->minmax_reservoir-(min_target_bits-this_bits)<0){
choice++;
if(choice>=PACKETBLOBS)break;
this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
}
}
}
/* enforce max (if used) on the current floater (if used) */
if(bm->max_bitsper>0){
/* do we need to force the bitrate down? */
if(this_bits>max_target_bits){
while(bm->minmax_reservoir+(this_bits-max_target_bits)>bi->reservoir_bits){
choice--;
if(choice<0)break;
this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
}
}
}
/* Choice of packetblobs now made based on floater, and min/max
requirements. Now boundary check extreme choices */
if(choice<0){
/* choosing a smaller packetblob is insufficient to trim bitrate.
frame will need to be truncated */
long maxsize=(max_target_bits+(bi->reservoir_bits-bm->minmax_reservoir))/8;
bm->choice=choice=0;
if(oggpack_bytes(vbi->packetblob[choice])>maxsize){
oggpack_writetrunc(vbi->packetblob[choice],maxsize*8);
this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
}
}else{
long minsize=(min_target_bits-bm->minmax_reservoir+7)/8;
if(choice>=PACKETBLOBS)
choice=PACKETBLOBS-1;
bm->choice=choice;
/* prop up bitrate according to demand. pad this frame out with zeroes */
minsize-=oggpack_bytes(vbi->packetblob[choice]);
while(minsize-->0)oggpack_write(vbi->packetblob[choice],0,8);
this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
}
/* now we have the final packet and the final packet size. Update statistics */
/* min and max reservoir */
if(bm->min_bitsper>0 || bm->max_bitsper>0){
if(max_target_bits>0 && this_bits>max_target_bits){
bm->minmax_reservoir+=(this_bits-max_target_bits);
}else if(min_target_bits>0 && this_bits<min_target_bits){
bm->minmax_reservoir+=(this_bits-min_target_bits);
}else{
/* inbetween; we want to take reservoir toward but not past desired_fill */
if(bm->minmax_reservoir>desired_fill){
if(max_target_bits>0){ /* logical bulletproofing against initialization state */
bm->minmax_reservoir+=(this_bits-max_target_bits);
if(bm->minmax_reservoir<desired_fill)bm->minmax_reservoir=desired_fill;
}else{
bm->minmax_reservoir=desired_fill;
}
}else{
if(min_target_bits>0){ /* logical bulletproofing against initialization state */
bm->minmax_reservoir+=(this_bits-min_target_bits);
if(bm->minmax_reservoir>desired_fill)bm->minmax_reservoir=desired_fill;
}else{
bm->minmax_reservoir=desired_fill;
}
}
}
}
/* avg reservoir */
if(bm->avg_bitsper>0){
long avg_target_bits=(vb->W?bm->avg_bitsper*bm->short_per_long:bm->avg_bitsper);
bm->avg_reservoir+=this_bits-avg_target_bits;
}
return(0);
}
int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,ogg_packet *op){
private_state *b=vd->backend_state;
bitrate_manager_state *bm=&b->bms;
vorbis_block *vb=bm->vb;
int choice=PACKETBLOBS/2;
if(!vb)return 0;
if(op){
vorbis_block_internal *vbi=vb->internal;
if(vorbis_bitrate_managed(vb))
choice=bm->choice;
op->packet=oggpack_get_buffer(vbi->packetblob[choice]);
op->bytes=oggpack_bytes(vbi->packetblob[choice]);
op->b_o_s=0;
op->e_o_s=vb->eofflag;
op->granulepos=vb->granulepos;
op->packetno=vb->sequence; /* for sake of completeness */
}
bm->vb=0;
return(1);
}