diff options
Diffstat (limited to 'drivers')
97 files changed, 3652 insertions, 5527 deletions
diff --git a/drivers/chibi/cp_file_access_wrapper.cpp b/drivers/chibi/cp_file_access_wrapper.cpp deleted file mode 100644 index 8ccde3735c..0000000000 --- a/drivers/chibi/cp_file_access_wrapper.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/*************************************************************************/ -/* cp_file_access_wrapper.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* http://www.godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ -#include "cp_file_access_wrapper.h" - - -//CPFileAccessWrapper* (*CPFileAccessWrapper::create)()=0; - - - diff --git a/drivers/chibi/cp_player_data_reserved.cpp b/drivers/chibi/cp_player_data_reserved.cpp deleted file mode 100644 index a626ffd111..0000000000 --- a/drivers/chibi/cp_player_data_reserved.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/*************************************************************************/ -/* cp_player_data_reserved.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* http://www.godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ -#include "cp_player_data.h" - - - diff --git a/drivers/chibi/event_stream_chibi.cpp b/drivers/chibi/event_stream_chibi.cpp index 3449583d36..b88f4ee70e 100644 --- a/drivers/chibi/event_stream_chibi.cpp +++ b/drivers/chibi/event_stream_chibi.cpp @@ -616,7 +616,7 @@ void CPFileAccessWrapperImpl::store_dword(uint32_t p_dest){ Error EventStreamPlaybackChibi::_play() { last_order=0; - loops++; + loops=0; player->play_start_song(); total_usec=0; @@ -628,10 +628,12 @@ bool EventStreamPlaybackChibi::_update(AudioMixer* p_mixer, uint64_t p_usec){ total_usec+=p_usec; mixer.process_usecs(p_usec,volume,pitch_scale,tempo_scale); int order=player->get_current_order(); - if (order<last_order && !loop) { - stop(); - } else { - loops++; + if (order<last_order) { + if (!loop) { + stop(); + } else { + loops++; + } } last_order=order; return false; diff --git a/drivers/convex_decomp/b2d_decompose.cpp b/drivers/convex_decomp/b2d_decompose.cpp index 1567fd0d44..36fbfa1fee 100644 --- a/drivers/convex_decomp/b2d_decompose.cpp +++ b/drivers/convex_decomp/b2d_decompose.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* b2d_decompose.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "b2d_decompose.h" #include "b2Polygon.h" diff --git a/drivers/convex_decomp/b2d_decompose.h b/drivers/convex_decomp/b2d_decompose.h index 44aa004120..2a66b033a7 100644 --- a/drivers/convex_decomp/b2d_decompose.h +++ b/drivers/convex_decomp/b2d_decompose.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* b2d_decompose.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef B2D_DECOMPOSE_H #define B2D_DECOMPOSE_H diff --git a/drivers/dds/texture_loader_dds.cpp b/drivers/dds/texture_loader_dds.cpp index 9b2e401fd9..0cef77e638 100644 --- a/drivers/dds/texture_loader_dds.cpp +++ b/drivers/dds/texture_loader_dds.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* texture_loader_dds.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "texture_loader_dds.h" #include "os/file_access.h" diff --git a/drivers/dds/texture_loader_dds.h b/drivers/dds/texture_loader_dds.h index c8b3610063..371eb1858c 100644 --- a/drivers/dds/texture_loader_dds.h +++ b/drivers/dds/texture_loader_dds.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* texture_loader_dds.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef TEXTURE_LOADER_DDS_H #define TEXTURE_LOADER_DDS_H diff --git a/drivers/etc1/image_etc.cpp b/drivers/etc1/image_etc.cpp index 62a7364847..cf2384240b 100644 --- a/drivers/etc1/image_etc.cpp +++ b/drivers/etc1/image_etc.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* image_etc.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "image_etc.h" #include "image.h" #include "rg_etc1.h" diff --git a/drivers/etc1/image_etc.h b/drivers/etc1/image_etc.h index 44859690aa..edcff39bfd 100644 --- a/drivers/etc1/image_etc.h +++ b/drivers/etc1/image_etc.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* image_etc.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef IMAGE_ETC1_H #define IMAGE_ETC1_H diff --git a/drivers/gl_context/context_gl.cpp b/drivers/gl_context/context_gl.cpp index c1bf6b38ea..3e15783d5f 100644 --- a/drivers/gl_context/context_gl.cpp +++ b/drivers/gl_context/context_gl.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* context_gl.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* context_gl.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "context_gl.h" diff --git a/drivers/jpegd/image_loader_jpegd.cpp b/drivers/jpegd/image_loader_jpegd.cpp index 5339e9f69d..913a7bdf39 100644 --- a/drivers/jpegd/image_loader_jpegd.cpp +++ b/drivers/jpegd/image_loader_jpegd.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_jpg.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* image_loader_jpegd.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "image_loader_jpegd.h" #include "print_string.h" diff --git a/drivers/jpegd/image_loader_jpegd.h b/drivers/jpegd/image_loader_jpegd.h index 1b2165ab47..2c52309ab1 100644 --- a/drivers/jpegd/image_loader_jpegd.h +++ b/drivers/jpegd/image_loader_jpegd.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_jpg.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* image_loader_jpegd.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef IMAGE_LOADER_JPG_H #define IMAGE_LOADER_JPG_H diff --git a/drivers/mpc/audio_stream_mpc.cpp b/drivers/mpc/audio_stream_mpc.cpp index fe6aa05d00..9713eb3c77 100644 --- a/drivers/mpc/audio_stream_mpc.cpp +++ b/drivers/mpc/audio_stream_mpc.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* audio_stream_mpc.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "audio_stream_mpc.h" diff --git a/drivers/mpc/audio_stream_mpc.h b/drivers/mpc/audio_stream_mpc.h index 122d0d0bbb..27f55777d6 100644 --- a/drivers/mpc/audio_stream_mpc.h +++ b/drivers/mpc/audio_stream_mpc.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* audio_stream_mpc.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef AUDIO_STREAM_MPC_H #define AUDIO_STREAM_MPC_H diff --git a/drivers/nedmalloc/Benchmarks.xls b/drivers/nedmalloc/Benchmarks.xls Binary files differdeleted file mode 100644 index 5001a18a22..0000000000 --- a/drivers/nedmalloc/Benchmarks.xls +++ /dev/null diff --git a/drivers/nedmalloc/SCsub b/drivers/nedmalloc/SCsub index 8e6edd1f96..6699efef75 100644 --- a/drivers/nedmalloc/SCsub +++ b/drivers/nedmalloc/SCsub @@ -2,4 +2,3 @@ Import('env') Export('env'); env.add_source_files(env.drivers_sources,"*.cpp") -#env.add_source_files(env.drivers_sources,"*.c") diff --git a/drivers/nedmalloc/memory_pool_static_nedmalloc.cpp b/drivers/nedmalloc/memory_pool_static_nedmalloc.cpp index 301e94bb7b..21da056f07 100644 --- a/drivers/nedmalloc/memory_pool_static_nedmalloc.cpp +++ b/drivers/nedmalloc/memory_pool_static_nedmalloc.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* memory_pool_static_nedmalloc.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* memory_pool_static_nedmalloc.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifdef NEDMALLOC_ENABLED // diff --git a/drivers/nedmalloc/memory_pool_static_nedmalloc.h b/drivers/nedmalloc/memory_pool_static_nedmalloc.h index 20b060537c..0033353a67 100644 --- a/drivers/nedmalloc/memory_pool_static_nedmalloc.h +++ b/drivers/nedmalloc/memory_pool_static_nedmalloc.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* memory_pool_static_nedmalloc.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* memory_pool_static_nedmalloc.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifdef NEDMALLOC_ENABLED // diff --git a/drivers/nedmalloc/nedmalloc.sln b/drivers/nedmalloc/nedmalloc.sln deleted file mode 100644 index 6ffd9fb83f..0000000000 --- a/drivers/nedmalloc/nedmalloc.sln +++ /dev/null @@ -1,19 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nedmalloc", "nedmalloc.vcproj", "{B89384F5-360B-4AB2-8F43-2F5F98A947FE}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Debug|Win32.ActiveCfg = Debug|Win32
- {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Debug|Win32.Build.0 = Debug|Win32
- {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Release|Win32.ActiveCfg = Release|Win32
- {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/drivers/nedmalloc/nedmalloc.vcproj b/drivers/nedmalloc/nedmalloc.vcproj deleted file mode 100644 index c5b0563d4f..0000000000 --- a/drivers/nedmalloc/nedmalloc.vcproj +++ /dev/null @@ -1,259 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="nedmalloc"
- ProjectGUID="{B89384F5-360B-4AB2-8F43-2F5F98A947FE}"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/nedmalloc.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/nedmalloc.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/Ow"
- InlineFunctionExpansion="0"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="true"
- RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableEnhancedInstructionSet="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="false"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/nedmalloc.exe"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\nedmalloc.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\test.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\malloc.c.h"
- >
- </File>
- <File
- RelativePath=".\nedmalloc.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <File
- RelativePath="..\..\..\..\gcLink.cc"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\Readme.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/drivers/nedmalloc/test.c b/drivers/nedmalloc/test.c deleted file mode 100644 index 8b9fed81d0..0000000000 --- a/drivers/nedmalloc/test.c +++ /dev/null @@ -1,356 +0,0 @@ -/* test.c
-An example of how to use nedalloc
-(C) 2005-2007 Niall Douglas
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "nedmalloc.c"
-
-#define THREADS 5
-#define RECORDS (100000/THREADS)
-#define TORTURETEST 1
-
-static int whichmalloc;
-static int doRealloc;
-static struct threadstuff_t
-{
- int ops;
- unsigned int *toalloc;
- void **allocs;
- char cachesync1[128];
- int done;
- char cachesync2[128];
-} threadstuff[THREADS];
-
-static void threadcode(int);
-
-#ifdef WIN32
-static DWORD WINAPI _threadcode(LPVOID a)
-{
- threadcode((int)(size_t) a);
- return 0;
-}
-#define THREADVAR HANDLE
-#define THREADINIT(v, id) (*v=CreateThread(NULL, 0, _threadcode, (LPVOID)(size_t) id, 0, NULL))
-#define THREADSLEEP(v) SleepEx(v, FALSE)
-#define THREADWAIT(v) (WaitForSingleObject(v, INFINITE), 0)
-
-typedef unsigned __int64 usCount;
-static FORCEINLINE usCount GetUsCount()
-{
- static LARGE_INTEGER ticksPerSec;
- static double scalefactor;
- LARGE_INTEGER val;
- if(!scalefactor)
- {
- if(QueryPerformanceFrequency(&ticksPerSec))
- scalefactor=ticksPerSec.QuadPart/1000000000000.0;
- else
- scalefactor=1;
- }
- if(!QueryPerformanceCounter(&val))
- return (usCount) GetTickCount() * 1000000000;
- return (usCount) (val.QuadPart/scalefactor);
-}
-
-static HANDLE win32heap;
-static void *win32malloc(size_t size)
-{
- return HeapAlloc(win32heap, 0, size);
-}
-static void *win32realloc(void *p, size_t size)
-{
- return HeapReAlloc(win32heap, 0, p, size);
-}
-static void win32free(void *mem)
-{
- HeapFree(win32heap, 0, mem);
-}
-
-static void *(*const mallocs[])(size_t size)={ malloc, nedmalloc, win32malloc };
-static void *(*const reallocs[])(void *p, size_t size)={ realloc, nedrealloc, win32realloc };
-static void (*const frees[])(void *mem)={ free, nedfree, win32free };
-#else
-static void *_threadcode(void *a)
-{
- threadcode((int)(size_t) a);
- return 0;
-}
-#define THREADVAR pthread_t
-#define THREADINIT(v, id) pthread_create(v, NULL, _threadcode, (void *)(size_t) id)
-#define THREADSLEEP(v) usleep(v*1000)
-#define THREADWAIT(v) pthread_join(v, NULL)
-
-typedef unsigned long long usCount;
-static FORCEINLINE usCount GetUsCount()
-{
- struct timeval tv;
- gettimeofday(&tv, 0);
- return ((usCount) tv.tv_sec*1000000000000LL)+tv.tv_usec*1000000LL;
-}
-
-static void *(*const mallocs[])(size_t size)={ malloc, nedmalloc };
-static void *(*const reallocs[])(void *p, size_t size)={ realloc, nedrealloc };
-static void (*const frees[])(void *mem)={ free, nedfree };
-#endif
-static usCount times[THREADS];
-
-
-static FORCEINLINE unsigned int myrandom(unsigned int *seed)
-{
- *seed=1664525UL*(*seed)+1013904223UL;
- return *seed;
-}
-
-static void threadcode(int threadidx)
-{
- int n;
- unsigned int *toallocptr=threadstuff[threadidx].toalloc;
- void **allocptr=threadstuff[threadidx].allocs;
- unsigned int seed=threadidx;
- usCount start;
- threadstuff[threadidx].done=0;
- /*neddisablethreadcache(0);*/
- THREADSLEEP(100);
- start=GetUsCount();
-#ifdef TORTURETEST
- /* A randomised malloc/realloc/free test (torture test) */
- for(n=0; n<RECORDS*100; n++)
- {
- unsigned int r=myrandom(&seed), i;
- i=(int)(r % RECORDS);
- if(!allocptr[i])
- {
- allocptr[i]=mallocs[whichmalloc](r & 0x1FFF);
- threadstuff[threadidx].ops++;
- }
- else if(r & (1<<31))
- {
- allocptr[i]=reallocs[whichmalloc](allocptr[i], r & 0x1FFF);
- threadstuff[threadidx].ops++;
- }
- else
- {
- frees[whichmalloc](allocptr[i]);
- allocptr[i]=0;
- }
- }
- for(n=0; n<RECORDS; n++)
- {
- if(allocptr[n])
- {
- frees[whichmalloc](allocptr[n]);
- allocptr[n]=0;
- }
- }
-#else
- /* A simple stack which allocates and deallocates off the top (speed test) */
- for(n=0; n<RECORDS;)
- {
-#if 1
- r=myrandom(&seed);
- if(allocptr>threadstuff[threadidx].allocs && (r & 65535)<32760) /*<32760)*/
- { /* free */
- --toallocptr;
- --allocptr;
- --n;
- frees[whichmalloc](*allocptr);
- *allocptr=0;
- }
- else
-#endif
- {
- if(doRealloc && allocptr>threadstuff[threadidx].allocs && (r & 1))
- {
- allocptr[-1]=reallocs[whichmalloc](allocptr[-1], *toallocptr);
- }
- else
- {
- allocptr[0]=mallocs[whichmalloc](*toallocptr);
- allocptr++;
- }
- n++;
- toallocptr++;
- threadstuff[threadidx].ops++;
- }
- }
- while(allocptr>threadstuff[threadidx].allocs)
- {
- frees[whichmalloc](*--allocptr);
- }
-#endif
- times[threadidx]+=GetUsCount()-start;
- neddisablethreadcache(0);
- threadstuff[threadidx].done=1;
-}
-
-static double runtest()
-{
- unsigned int seed=1;
- int n, i;
- double opspersec=0;
- THREADVAR threads[THREADS];
- for(n=0; n<THREADS; n++)
- {
- unsigned int *toallocptr;
- int m;
- threadstuff[n].ops=0;
- times[n]=0;
- threadstuff[n].toalloc=toallocptr=calloc(RECORDS, sizeof(unsigned int));
- threadstuff[n].allocs=calloc(RECORDS, sizeof(void *));
- for(m=0; m<RECORDS; m++)
- {
- unsigned int size=myrandom(&seed);
- if(size<(1<<30))
- { /* Make it two power multiple of less than 512 bytes to
- model frequent C++ new's */
- size=4<<(size & 7);
- }
- else
- {
- size&=0x3FFF; /* < 16Kb */
- /*size&=0x1FFF;*/ /* < 8Kb */
- /*size=(1<<6)<<(size & 7);*/ /* < 8Kb */
- }
- *toallocptr++=size;
- }
- }
-#ifdef TORTURETEST
- for(n=0; n<THREADS; n++)
- {
- THREADINIT(&threads[n], n);
- }
- for(i=0; i<32; i++)
- {
- int found=-1;
- do
- {
- for(n=0; n<THREADS; n++)
- {
- THREADSLEEP(100);
- if(threadstuff[n].done)
- {
- found=n;
- break;
- }
- }
- } while(found<0);
- THREADWAIT(threads[found]);
- threads[found]=0;
- THREADINIT(&threads[found], found);
- printf("Relaunched thread %d\n", found);
- }
- for(n=THREADS-1; n>=0; n--)
- {
- THREADWAIT(threads[n]);
- threads[n]=0;
- }
-#else
-#if 1
- for(n=0; n<THREADS; n++)
- {
- THREADINIT(&threads[n], n);
- }
- for(n=THREADS-1; n>=0; n--)
- {
- THREADWAIT(threads[n]);
- threads[n]=0;
- }
-#else
- /* Quick realloc() test */
- doRealloc=1;
- for(n=0; n<THREADS; n++)
- {
- THREADINIT(&threads[n], n);
- }
- for(n=THREADS-1; n>=0; n--)
- {
- THREADWAIT(threads[n]);
- threads[n]=0;
- }
-#endif
-#endif
- {
- usCount totaltime=0;
- int totalops=0;
- for(n=0; n<THREADS; n++)
- {
- totaltime+=times[n];
- totalops+=threadstuff[n].ops;
- }
- opspersec=1000000000000.0*totalops/totaltime*THREADS;
- printf("This allocator achieves %lfops/sec under %d threads\n", opspersec, THREADS);
- }
- for(n=THREADS-1; n>=0; n--)
- {
- free(threadstuff[n].allocs); threadstuff[n].allocs=0;
- free(threadstuff[n].toalloc); threadstuff[n].toalloc=0;
- }
- return opspersec;
-}
-
-int main(void)
-{
- double std=0, ned=0;
-
-#if 0
- {
- usCount start, end;
- start=GetUsCount();
- THREADSLEEP(5000);
- end=GetUsCount();
- printf("Wait was %lf\n", (end-start)/1000000000000.0);
- }
-#endif
-#ifdef WIN32
- { /* Force load of user32.dll so we can debug */
- BOOL v;
- SystemParametersInfo(SPI_GETBEEP, 0, &v, 0);
- }
-#endif
-
- if(0)
- {
- printf("\nTesting standard allocator with %d threads ...\n", THREADS);
- std=runtest();
- }
- if(1)
- {
- printf("\nTesting nedmalloc with %d threads ...\n", THREADS);
- whichmalloc=1;
- ned=runtest();
- }
-#ifdef WIN32
- if(0)
- {
- ULONG data=2;
- win32heap=HeapCreate(0, 0, 0);
- HeapSetInformation(win32heap, HeapCompatibilityInformation, &data, sizeof(data));
- HeapQueryInformation(win32heap, HeapCompatibilityInformation, &data, sizeof(data), NULL);
- if(2!=data)
- {
- printf("The win32 low frag allocator won't work under a debugger!\n");
- }
- else
- {
- printf("Testing win32 low frag allocator with %d threads ...\n\n", THREADS);
- whichmalloc=2;
- runtest();
- }
- HeapDestroy(win32heap);
- }
-#endif
- if(std && ned)
- { // ned should have more ops/sec
- printf("\n\nnedmalloc allocator is %lf times faster than standard\n", ned/std);
- }
- printf("\nPress a key to trim\n");
- getchar();
- nedmalloc_trim(0);
-#ifdef _MSC_VER
- printf("\nPress a key to end\n");
- getchar();
-#endif
- return 0;
-}
diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp index 5d6c9583ef..7bf14d14ad 100644 --- a/drivers/nrex/regex.cpp +++ b/drivers/nrex/regex.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* regex.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* regex.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "regex.h" #include "nrex.hpp" #include "core/os/memory.h" diff --git a/drivers/nrex/regex.h b/drivers/nrex/regex.h index 4b063f0bf1..74495442c7 100644 --- a/drivers/nrex/regex.h +++ b/drivers/nrex/regex.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* regex.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* regex.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef REGEX_H #define REGEX_H diff --git a/drivers/ogg/bitwise.c b/drivers/ogg/bitwise.c index 3d02198094..145901d185 100644 --- a/drivers/ogg/bitwise.c +++ b/drivers/ogg/bitwise.c @@ -5,13 +5,13 @@ * 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-2010 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2014 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: packing variable sized words into an octet stream - last mod: $Id: bitwise.c 17287 2010-06-10 13:42:06Z tterribe $ + last mod: $Id: bitwise.c 19149 2014-05-27 16:26:23Z giles $ ********************************************************************/ @@ -93,11 +93,11 @@ void oggpack_write(oggpack_buffer *b,unsigned long value,int bits){ b->ptr=b->buffer+b->endbyte; } - value&=mask[bits]; + value&=mask[bits]; bits+=b->endbit; - b->ptr[0]|=value<<b->endbit; - + b->ptr[0]|=value<<b->endbit; + if(bits>=8){ b->ptr[1]=(unsigned char)(value>>(8-b->endbit)); if(bits>=16){ @@ -136,11 +136,11 @@ void oggpackB_write(oggpack_buffer *b,unsigned long value,int bits){ b->ptr=b->buffer+b->endbyte; } - value=(value&mask[bits])<<(32-bits); + value=(value&mask[bits])<<(32-bits); bits+=b->endbit; - b->ptr[0]|=value>>(24+b->endbit); - + b->ptr[0]|=value>>(24+b->endbit); + if(bits>=8){ b->ptr[1]=(unsigned char)(value>>(16+b->endbit)); if(bits>=16){ @@ -187,37 +187,41 @@ static void oggpack_writecopy_helper(oggpack_buffer *b, unsigned char *ptr=(unsigned char *)source; long bytes=bits/8; + long pbytes=(b->endbit+bits)/8; bits-=bytes*8; + /* expand storage up-front */ + if(b->endbyte+pbytes>=b->storage){ + void *ret; + if(!b->ptr) goto err; + if(b->storage>b->endbyte+pbytes+BUFFER_INCREMENT) goto err; + b->storage=b->endbyte+pbytes+BUFFER_INCREMENT; + ret=_ogg_realloc(b->buffer,b->storage); + if(!ret) goto err; + b->buffer=ret; + b->ptr=b->buffer+b->endbyte; + } + + /* copy whole octets */ if(b->endbit){ int i; /* unaligned copy. Do it the hard way. */ for(i=0;i<bytes;i++) - w(b,(unsigned long)(ptr[i]),8); + w(b,(unsigned long)(ptr[i]),8); }else{ /* aligned block copy */ - if(b->endbyte+bytes+1>=b->storage){ - void *ret; - if(!b->ptr) goto err; - if(b->endbyte+bytes+BUFFER_INCREMENT>b->storage) goto err; - b->storage=b->endbyte+bytes+BUFFER_INCREMENT; - ret=_ogg_realloc(b->buffer,b->storage); - if(!ret) goto err; - b->buffer=ret; - b->ptr=b->buffer+b->endbyte; - } - memmove(b->ptr,source,bytes); b->ptr+=bytes; b->endbyte+=bytes; *b->ptr=0; - } + + /* copy trailing bits */ if(bits){ if(msb) - w(b,(unsigned long)(ptr[bytes]>>(8-bits)),bits); + w(b,(unsigned long)(ptr[bytes]>>(8-bits)),bits); else - w(b,(unsigned long)(ptr[bytes]),bits); + w(b,(unsigned long)(ptr[bytes]),bits); } return; err: @@ -281,11 +285,11 @@ long oggpack_look(oggpack_buffer *b,int bits){ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]<<(32-b->endbit); } @@ -312,11 +316,11 @@ long oggpackB_look(oggpack_buffer *b,int bits){ ret=b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } @@ -386,11 +390,11 @@ long oggpack_read(oggpack_buffer *b,int bits){ ret=b->ptr[0]>>b->endbit; if(bits>8){ - ret|=b->ptr[1]<<(8-b->endbit); + ret|=b->ptr[1]<<(8-b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(16-b->endbit); + ret|=b->ptr[2]<<(16-b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(24-b->endbit); + ret|=b->ptr[3]<<(24-b->endbit); if(bits>32 && b->endbit){ ret|=b->ptr[4]<<(32-b->endbit); } @@ -429,11 +433,11 @@ long oggpackB_read(oggpack_buffer *b,int bits){ ret=b->ptr[0]<<(24+b->endbit); if(bits>8){ - ret|=b->ptr[1]<<(16+b->endbit); + ret|=b->ptr[1]<<(16+b->endbit); if(bits>16){ - ret|=b->ptr[2]<<(8+b->endbit); + ret|=b->ptr[2]<<(8+b->endbit); if(bits>24){ - ret|=b->ptr[3]<<(b->endbit); + ret|=b->ptr[3]<<(b->endbit); if(bits>32 && b->endbit) ret|=b->ptr[4]>>(8-b->endbit); } @@ -511,7 +515,7 @@ long oggpackB_bytes(oggpack_buffer *b){ long oggpackB_bits(oggpack_buffer *b){ return oggpack_bits(b); } - + unsigned char *oggpack_get_buffer(oggpack_buffer *b){ return(b->buffer); } @@ -534,7 +538,7 @@ static int ilog(unsigned int v){ } return(ret); } - + oggpack_buffer o; oggpack_buffer r; @@ -581,7 +585,7 @@ void cliptest(unsigned long *b,int vals,int bits,int *comp,int compsize){ void cliptestB(unsigned long *b,int vals,int bits,int *comp,int compsize){ long bytes,i; unsigned char *buffer; - + oggpackB_reset(&o); for(i=0;i<vals;i++) oggpackB_write(&o,b[i],bits?bits:ilog(b[i])); @@ -613,9 +617,190 @@ void cliptestB(unsigned long *b,int vals,int bits,int *comp,int compsize){ if(oggpackB_bytes(&r)!=bytes)report("leftover bytes after read!\n"); } +void copytest(int prefill, int copy){ + oggpack_buffer source_write; + oggpack_buffer dest_write; + oggpack_buffer source_read; + oggpack_buffer dest_read; + unsigned char *source; + unsigned char *dest; + long source_bytes,dest_bytes; + int i; + + oggpack_writeinit(&source_write); + oggpack_writeinit(&dest_write); + + for(i=0;i<(prefill+copy+7)/8;i++) + oggpack_write(&source_write,(i^0x5a)&0xff,8); + source=oggpack_get_buffer(&source_write); + source_bytes=oggpack_bytes(&source_write); + + /* prefill */ + oggpack_writecopy(&dest_write,source,prefill); + + /* check buffers; verify end byte masking */ + dest=oggpack_get_buffer(&dest_write); + dest_bytes=oggpack_bytes(&dest_write); + if(dest_bytes!=(prefill+7)/8){ + fprintf(stderr,"wrong number of bytes after prefill! %ld!=%d\n",dest_bytes,(prefill+7)/8); + exit(1); + } + oggpack_readinit(&source_read,source,source_bytes); + oggpack_readinit(&dest_read,dest,dest_bytes); + + for(i=0;i<prefill;i+=8){ + int s=oggpack_read(&source_read,prefill-i<8?prefill-i:8); + int d=oggpack_read(&dest_read,prefill-i<8?prefill-i:8); + if(s!=d){ + fprintf(stderr,"prefill=%d mismatch! byte %d, %x!=%x\n",prefill,i/8,s,d); + exit(1); + } + } + if(prefill<dest_bytes){ + if(oggpack_read(&dest_read,dest_bytes-prefill)!=0){ + fprintf(stderr,"prefill=%d mismatch! trailing bits not zero\n",prefill); + exit(1); + } + } + + /* second copy */ + oggpack_writecopy(&dest_write,source,copy); + + /* check buffers; verify end byte masking */ + dest=oggpack_get_buffer(&dest_write); + dest_bytes=oggpack_bytes(&dest_write); + if(dest_bytes!=(copy+prefill+7)/8){ + fprintf(stderr,"wrong number of bytes after prefill+copy! %ld!=%d\n",dest_bytes,(copy+prefill+7)/8); + exit(1); + } + oggpack_readinit(&source_read,source,source_bytes); + oggpack_readinit(&dest_read,dest,dest_bytes); + + for(i=0;i<prefill;i+=8){ + int s=oggpack_read(&source_read,prefill-i<8?prefill-i:8); + int d=oggpack_read(&dest_read,prefill-i<8?prefill-i:8); + if(s!=d){ + fprintf(stderr,"prefill=%d mismatch! byte %d, %x!=%x\n",prefill,i/8,s,d); + exit(1); + } + } + + oggpack_readinit(&source_read,source,source_bytes); + for(i=0;i<copy;i+=8){ + int s=oggpack_read(&source_read,copy-i<8?copy-i:8); + int d=oggpack_read(&dest_read,copy-i<8?copy-i:8); + if(s!=d){ + fprintf(stderr,"prefill=%d copy=%d mismatch! byte %d, %x!=%x\n",prefill,copy,i/8,s,d); + exit(1); + } + } + + if(copy+prefill<dest_bytes){ + if(oggpack_read(&dest_read,dest_bytes-copy-prefill)!=0){ + fprintf(stderr,"prefill=%d copy=%d mismatch! trailing bits not zero\n",prefill,copy); + exit(1); + } + } + + oggpack_writeclear(&source_write); + oggpack_writeclear(&dest_write); + + +} + +void copytestB(int prefill, int copy){ + oggpack_buffer source_write; + oggpack_buffer dest_write; + oggpack_buffer source_read; + oggpack_buffer dest_read; + unsigned char *source; + unsigned char *dest; + long source_bytes,dest_bytes; + int i; + + oggpackB_writeinit(&source_write); + oggpackB_writeinit(&dest_write); + + for(i=0;i<(prefill+copy+7)/8;i++) + oggpackB_write(&source_write,(i^0x5a)&0xff,8); + source=oggpackB_get_buffer(&source_write); + source_bytes=oggpackB_bytes(&source_write); + + /* prefill */ + oggpackB_writecopy(&dest_write,source,prefill); + + /* check buffers; verify end byte masking */ + dest=oggpackB_get_buffer(&dest_write); + dest_bytes=oggpackB_bytes(&dest_write); + if(dest_bytes!=(prefill+7)/8){ + fprintf(stderr,"wrong number of bytes after prefill! %ld!=%d\n",dest_bytes,(prefill+7)/8); + exit(1); + } + oggpackB_readinit(&source_read,source,source_bytes); + oggpackB_readinit(&dest_read,dest,dest_bytes); + + for(i=0;i<prefill;i+=8){ + int s=oggpackB_read(&source_read,prefill-i<8?prefill-i:8); + int d=oggpackB_read(&dest_read,prefill-i<8?prefill-i:8); + if(s!=d){ + fprintf(stderr,"prefill=%d mismatch! byte %d, %x!=%x\n",prefill,i/8,s,d); + exit(1); + } + } + if(prefill<dest_bytes){ + if(oggpackB_read(&dest_read,dest_bytes-prefill)!=0){ + fprintf(stderr,"prefill=%d mismatch! trailing bits not zero\n",prefill); + exit(1); + } + } + + /* second copy */ + oggpackB_writecopy(&dest_write,source,copy); + + /* check buffers; verify end byte masking */ + dest=oggpackB_get_buffer(&dest_write); + dest_bytes=oggpackB_bytes(&dest_write); + if(dest_bytes!=(copy+prefill+7)/8){ + fprintf(stderr,"wrong number of bytes after prefill+copy! %ld!=%d\n",dest_bytes,(copy+prefill+7)/8); + exit(1); + } + oggpackB_readinit(&source_read,source,source_bytes); + oggpackB_readinit(&dest_read,dest,dest_bytes); + + for(i=0;i<prefill;i+=8){ + int s=oggpackB_read(&source_read,prefill-i<8?prefill-i:8); + int d=oggpackB_read(&dest_read,prefill-i<8?prefill-i:8); + if(s!=d){ + fprintf(stderr,"prefill=%d mismatch! byte %d, %x!=%x\n",prefill,i/8,s,d); + exit(1); + } + } + + oggpackB_readinit(&source_read,source,source_bytes); + for(i=0;i<copy;i+=8){ + int s=oggpackB_read(&source_read,copy-i<8?copy-i:8); + int d=oggpackB_read(&dest_read,copy-i<8?copy-i:8); + if(s!=d){ + fprintf(stderr,"prefill=%d copy=%d mismatch! byte %d, %x!=%x\n",prefill,copy,i/8,s,d); + exit(1); + } + } + + if(copy+prefill<dest_bytes){ + if(oggpackB_read(&dest_read,dest_bytes-copy-prefill)!=0){ + fprintf(stderr,"prefill=%d copy=%d mismatch! trailing bits not zero\n",prefill,copy); + exit(1); + } + } + + oggpackB_writeclear(&source_write); + oggpackB_writeclear(&dest_write); + +} + int main(void){ unsigned char *buffer; - long bytes,i; + long bytes,i,j; static unsigned long testbuffer1[]= {18,12,103948,4325,543,76,432,52,3,65,4,56,32,42,34,21,1,23,32,546,456,7, 567,56,8,8,55,3,52,342,341,4,265,7,67,86,2199,21,7,1,5,1,4}; @@ -761,7 +946,31 @@ int main(void){ exit(1); } oggpack_writeclear(&o); - fprintf(stderr,"ok.\n"); + fprintf(stderr,"ok."); + + /* this is partly glassbox; we're mostly concerned about the allocation boundaries */ + + fprintf(stderr,"\nTesting aligned writecopies (LSb): "); + for(i=0;i<71;i++) + for(j=0;j<5;j++) + copytest(j*8,i); + for(i=BUFFER_INCREMENT*8-71;i<BUFFER_INCREMENT*8+71;i++) + for(j=0;j<5;j++) + copytest(j*8,i); + fprintf(stderr,"ok. "); + + fprintf(stderr,"\nTesting unaligned writecopies (LSb): "); + for(i=0;i<71;i++) + for(j=1;j<40;j++) + if(j&0x7) + copytest(j,i); + for(i=BUFFER_INCREMENT*8-71;i<BUFFER_INCREMENT*8+71;i++) + for(j=1;j<40;j++) + if(j&0x7) + copytest(j,i); + + fprintf(stderr,"ok. \n"); + /********** lazy, cut-n-paste retest with MSb packing ***********/ @@ -846,12 +1055,34 @@ int main(void){ fprintf(stderr,"failed; read past end without -1.\n"); exit(1); } + fprintf(stderr,"ok."); oggpackB_writeclear(&o); - fprintf(stderr,"ok.\n\n"); + /* this is partly glassbox; we're mostly concerned about the allocation boundaries */ + + fprintf(stderr,"\nTesting aligned writecopies (MSb): "); + for(i=0;i<71;i++) + for(j=0;j<5;j++) + copytestB(j*8,i); + for(i=BUFFER_INCREMENT*8-71;i<BUFFER_INCREMENT*8+71;i++) + for(j=0;j<5;j++) + copytestB(j*8,i); + fprintf(stderr,"ok. "); + + fprintf(stderr,"\nTesting unaligned writecopies (MSb): "); + for(i=0;i<71;i++) + for(j=1;j<40;j++) + if(j&0x7) + copytestB(j,i); + for(i=BUFFER_INCREMENT*8-71;i<BUFFER_INCREMENT*8+71;i++) + for(j=1;j<40;j++) + if(j&0x7) + copytestB(j,i); + + fprintf(stderr,"ok. \n\n"); return(0); -} +} #endif /* _V_SELFTEST */ #undef BUFFER_INCREMENT diff --git a/drivers/ogg/framing.c b/drivers/ogg/framing.c index 25f0e88dbc..3a2f0a6058 100644 --- a/drivers/ogg/framing.c +++ b/drivers/ogg/framing.c @@ -12,7 +12,7 @@ function: code raw packets into framed OggSquish stream and decode Ogg streams back into raw packets - last mod: $Id: framing.c 17592 2010-11-01 20:27:54Z xiphmont $ + last mod: $Id: framing.c 18758 2013-01-08 16:29:56Z tterribe $ note: The CRC code is directly derived from public domain code by Ross Williams (ross@guest.adelaide.edu.au). See docs/framing.html @@ -21,6 +21,7 @@ ********************************************************************/ #include <stdlib.h> +#include <limits.h> #include <string.h> #include <ogg/ogg.h> @@ -61,7 +62,7 @@ int ogg_page_serialno(const ogg_page *og){ (og->header[16]<<16) | (og->header[17]<<24)); } - + long ogg_page_pageno(const ogg_page *og){ return(og->header[18] | (og->header[19]<<8) | @@ -76,16 +77,16 @@ long ogg_page_pageno(const ogg_page *og){ page, it's counted */ /* NOTE: -If a page consists of a packet begun on a previous page, and a new -packet begun (but not completed) on this page, the return will be: - ogg_page_packets(page) ==1, - ogg_page_continued(page) !=0 - -If a page happens to be a single packet that was begun on a -previous page, and spans to the next page (in the case of a three or -more page packet), the return will be: - ogg_page_packets(page) ==0, - ogg_page_continued(page) !=0 + If a page consists of a packet begun on a previous page, and a new + packet begun (but not completed) on this page, the return will be: + ogg_page_packets(page) ==1, + ogg_page_continued(page) !=0 + + If a page happens to be a single packet that was begun on a + previous page, and spans to the next page (in the case of a three or + more page packet), the return will be: + ogg_page_packets(page) ==0, + ogg_page_continued(page) !=0 */ int ogg_page_packets(const ogg_page *og){ @@ -205,7 +206,7 @@ int ogg_stream_init(ogg_stream_state *os,int serialno){ return(0); } return(-1); -} +} /* async/delayed error detection for the ogg_stream_state */ int ogg_stream_check(ogg_stream_state *os){ @@ -220,10 +221,10 @@ int ogg_stream_clear(ogg_stream_state *os){ if(os->lacing_vals)_ogg_free(os->lacing_vals); if(os->granule_vals)_ogg_free(os->granule_vals); - memset(os,0,sizeof(*os)); + memset(os,0,sizeof(*os)); } return(0); -} +} int ogg_stream_destroy(ogg_stream_state *os){ if(os){ @@ -231,44 +232,56 @@ int ogg_stream_destroy(ogg_stream_state *os){ _ogg_free(os); } return(0); -} +} /* Helpers for ogg_stream_encode; this keeps the structure and what's happening fairly clear */ -static int _os_body_expand(ogg_stream_state *os,int needed){ - if(os->body_storage<=os->body_fill+needed){ +static int _os_body_expand(ogg_stream_state *os,long needed){ + if(os->body_storage-needed<=os->body_fill){ + long body_storage; void *ret; - ret=_ogg_realloc(os->body_data,(os->body_storage+needed+1024)* - sizeof(*os->body_data)); + if(os->body_storage>LONG_MAX-needed){ + ogg_stream_clear(os); + return -1; + } + body_storage=os->body_storage+needed; + if(body_storage<LONG_MAX-1024)body_storage+=1024; + ret=_ogg_realloc(os->body_data,body_storage*sizeof(*os->body_data)); if(!ret){ ogg_stream_clear(os); return -1; } - os->body_storage+=(needed+1024); + os->body_storage=body_storage; os->body_data=ret; } return 0; } -static int _os_lacing_expand(ogg_stream_state *os,int needed){ - if(os->lacing_storage<=os->lacing_fill+needed){ +static int _os_lacing_expand(ogg_stream_state *os,long needed){ + if(os->lacing_storage-needed<=os->lacing_fill){ + long lacing_storage; void *ret; - ret=_ogg_realloc(os->lacing_vals,(os->lacing_storage+needed+32)* - sizeof(*os->lacing_vals)); + if(os->lacing_storage>LONG_MAX-needed){ + ogg_stream_clear(os); + return -1; + } + lacing_storage=os->lacing_storage+needed; + if(lacing_storage<LONG_MAX-32)lacing_storage+=32; + ret=_ogg_realloc(os->lacing_vals,lacing_storage*sizeof(*os->lacing_vals)); if(!ret){ ogg_stream_clear(os); return -1; } os->lacing_vals=ret; - ret=_ogg_realloc(os->granule_vals,(os->lacing_storage+needed+32)* + ret=_ogg_realloc(os->granule_vals,lacing_storage* sizeof(*os->granule_vals)); if(!ret){ ogg_stream_clear(os); return -1; } os->granule_vals=ret; - os->lacing_storage+=(needed+32); + os->lacing_storage=lacing_storage; } return 0; } @@ -287,12 +300,12 @@ void ogg_page_checksum_set(ogg_page *og){ og->header[23]=0; og->header[24]=0; og->header[25]=0; - + for(i=0;i<og->header_len;i++) crc_reg=(crc_reg<<8)^crc_lookup[((crc_reg >> 24)&0xff)^og->header[i]]; for(i=0;i<og->body_len;i++) crc_reg=(crc_reg<<8)^crc_lookup[((crc_reg >> 24)&0xff)^og->body[i]]; - + og->header[22]=(unsigned char)(crc_reg&0xff); og->header[23]=(unsigned char)((crc_reg>>8)&0xff); og->header[24]=(unsigned char)((crc_reg>>16)&0xff); @@ -304,26 +317,31 @@ void ogg_page_checksum_set(ogg_page *og){ int ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov, int count, long e_o_s, ogg_int64_t granulepos){ - int bytes = 0, lacing_vals, i; + long bytes = 0, lacing_vals; + int i; if(ogg_stream_check(os)) return -1; if(!iov) return 0; - - for (i = 0; i < count; ++i) bytes += (int)iov[i].iov_len; + + for (i = 0; i < count; ++i){ + if(iov[i].iov_len>LONG_MAX) return -1; + if(bytes>LONG_MAX-(long)iov[i].iov_len) return -1; + bytes += (long)iov[i].iov_len; + } lacing_vals=bytes/255+1; if(os->body_returned){ /* advance packet data according to the body_returned pointer. We had to keep it around to return a pointer into the buffer last call */ - + os->body_fill-=os->body_returned; if(os->body_fill) memmove(os->body_data,os->body_data+os->body_returned, os->body_fill); os->body_returned=0; } - + /* make sure we have the buffer storage */ if(_os_body_expand(os,bytes) || _os_lacing_expand(os,lacing_vals)) return -1; @@ -467,33 +485,33 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int pageno>>=8; } } - + /* zero for computation; filled in later */ os->header[22]=0; os->header[23]=0; os->header[24]=0; os->header[25]=0; - + /* segment table */ os->header[26]=(unsigned char)(vals&0xff); for(i=0;i<vals;i++) bytes+=os->header[i+27]=(unsigned char)(os->lacing_vals[i]&0xff); - + /* set pointers in the ogg_page struct */ og->header=os->header; og->header_len=os->header_fill=vals+27; og->body=os->body_data+os->body_returned; og->body_len=bytes; - + /* advance the lacing data and set the body_returned pointer */ - + os->lacing_fill-=vals; memmove(os->lacing_vals,os->lacing_vals+vals,os->lacing_fill*sizeof(*os->lacing_vals)); memmove(os->granule_vals,os->granule_vals+vals,os->lacing_fill*sizeof(*os->granule_vals)); os->body_returned+=bytes; - + /* calculate the checksum */ - + ogg_page_checksum_set(og); /* done */ @@ -512,12 +530,20 @@ static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int since ogg_stream_flush will flush the last page in a stream even if it's undersized, you almost certainly want to use ogg_stream_pageout (and *not* ogg_stream_flush) unless you specifically need to flush - an page regardless of size in the middle of a stream. */ + a page regardless of size in the middle of a stream. */ int ogg_stream_flush(ogg_stream_state *os,ogg_page *og){ return ogg_stream_flush_i(os,og,1,4096); } +/* Like the above, but an argument is provided to adjust the nominal + page size for applications which are smart enough to provide their + own delay based flushing */ + +int ogg_stream_flush_fill(ogg_stream_state *os,ogg_page *og, int nfill){ + return ogg_stream_flush_i(os,og,1,nfill); +} + /* This constructs pages from buffered packet segments. The pointers returned are to static buffers; do not free. The returned buffers are good only until the next call (using the same ogg_stream_state) */ @@ -533,10 +559,10 @@ int ogg_stream_pageout(ogg_stream_state *os, ogg_page *og){ return(ogg_stream_flush_i(os,og,force,4096)); } -/* Like the above, but an argument is provided to adjust the nominal +/* Like the above, but an argument is provided to adjust the nominal page size for applications which are smart enough to provide their own delay based flushing */ - + int ogg_stream_pageout_fill(ogg_stream_state *os, ogg_page *og, int nfill){ int force=0; if(ogg_stream_check(os)) return 0; @@ -645,7 +671,7 @@ int ogg_sync_wrote(ogg_sync_state *oy, long bytes){ -n) skipped n bytes 0) page not ready; more data (no bytes skipped) n) page synced at current location; page length n bytes - + */ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ @@ -654,54 +680,54 @@ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ long bytes=oy->fill-oy->returned; if(ogg_sync_check(oy))return 0; - + if(oy->headerbytes==0){ int headerbytes,i; if(bytes<27)return(0); /* not enough for a header */ - + /* verify capture pattern */ if(memcmp(page,"OggS",4))goto sync_fail; - + headerbytes=page[26]+27; if(bytes<headerbytes)return(0); /* not enough for header + seg table */ - + /* count up body length in the segment table */ - + for(i=0;i<page[26];i++) oy->bodybytes+=page[27+i]; oy->headerbytes=headerbytes; } - + if(oy->bodybytes+oy->headerbytes>bytes)return(0); - + /* The whole test page is buffered. Verify the checksum */ { /* Grab the checksum bytes, set the header field to zero */ char chksum[4]; ogg_page log; - + memcpy(chksum,page+22,4); memset(page+22,0,4); - + /* set up a temp page struct and recompute the checksum */ log.header=page; log.header_len=oy->headerbytes; log.body=page+oy->headerbytes; log.body_len=oy->bodybytes; ogg_page_checksum_set(&log); - + /* Compare */ if(memcmp(chksum,page+22,4)){ /* D'oh. Mismatch! Corrupt page (or miscapture and not a page at all) */ /* replace the computed checksum with the one actually read in */ memcpy(page+22,chksum,4); - + /* Bad checksum. Lose sync */ goto sync_fail; } } - + /* yes, have a whole page all ready to go */ { unsigned char *page=oy->data+oy->returned; @@ -720,12 +746,12 @@ long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){ oy->bodybytes=0; return(bytes); } - + sync_fail: - + oy->headerbytes=0; oy->bodybytes=0; - + /* search for possible capture */ next=memchr(page+1,'O',bytes-1); if(!next) @@ -764,7 +790,7 @@ int ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og){ /* need more data */ return(0); } - + /* head did not start a synced page... skipped some bytes */ if(!oy->unsynced){ oy->unsynced=1; @@ -793,7 +819,7 @@ int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og){ int serialno=ogg_page_serialno(og); long pageno=ogg_page_pageno(og); int segments=header[26]; - + if(ogg_stream_check(os)) return -1; /* clean up 'returned data' */ @@ -848,7 +874,7 @@ int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og){ /* are we a 'continued packet' page? If so, we may need to skip some segments */ if(continued){ - if(os->lacing_fill<1 || + if(os->lacing_fill<1 || os->lacing_vals[os->lacing_fill-1]==0x400){ bos=0; for(;segptr<segments;segptr++){ @@ -862,7 +888,7 @@ int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og){ } } } - + if(bodysize){ if(_os_body_expand(os,bodysize)) return -1; memcpy(os->body_data+os->body_fill,body,bodysize); @@ -875,20 +901,20 @@ int ogg_stream_pagein(ogg_stream_state *os, ogg_page *og){ int val=header[27+segptr]; os->lacing_vals[os->lacing_fill]=val; os->granule_vals[os->lacing_fill]=-1; - + if(bos){ os->lacing_vals[os->lacing_fill]|=0x100; bos=0; } - + if(val<255)saved=os->lacing_fill; - + os->lacing_fill++; segptr++; - + if(val<255)os->lacing_packet=os->lacing_fill; } - + /* set the granulepos on the last granuleval of the last full packet */ if(saved!=-1){ os->granule_vals[saved]=granulepos; @@ -1493,7 +1519,7 @@ void test_pack(const int *pl, const int **headers, int byteskip, /* construct a test packet */ ogg_packet op; int len=pl[i]; - + op.packet=data+inptr; op.bytes=len; op.e_o_s=(pl[i+1]<0?1:0); @@ -1509,7 +1535,7 @@ void test_pack(const int *pl, const int **headers, int byteskip, /* retrieve any finished pages */ { ogg_page og; - + while(ogg_stream_pageout(&os_en,&og)){ /* We have a page. Check it carefully */ @@ -1558,7 +1584,7 @@ void test_pack(const int *pl, const int **headers, int byteskip, if(ret==0)break; if(ret<0)continue; /* got a page. Happy happy. Verify that it's good. */ - + fprintf(stderr,"(%d), ",pageout); check_page(data+deptr,headers[pageout],&og_de); @@ -1572,7 +1598,7 @@ void test_pack(const int *pl, const int **headers, int byteskip, while(ogg_stream_packetpeek(&os_de,&op_de2)>0){ ogg_stream_packetpeek(&os_de,NULL); ogg_stream_packetout(&os_de,&op_de); /* just catching them all */ - + /* verify peek and out match */ if(memcmp(&op_de,&op_de2,sizeof(op_de))){ fprintf(stderr,"packetout != packetpeek! pos=%ld\n", @@ -1598,7 +1624,7 @@ void test_pack(const int *pl, const int **headers, int byteskip, } bosflag=1; depacket+=op_de.bytes; - + /* check eos flag */ if(eosflag){ fprintf(stderr,"Multiple decoded packets with eos flag!\n"); @@ -1745,7 +1771,7 @@ int main(void){ 10,10,10,10,10,10,10,10, 10,10,10,10,10,10,10,50,-1}; const int *headret[]={head1_5,head2_5,head3_5,NULL}; - + fprintf(stderr,"testing max packet segments... "); test_pack(packets,headret,0,0,0); } @@ -1754,7 +1780,7 @@ int main(void){ /* packet that overspans over an entire page */ const int packets[]={0,100,130049,259,255,-1}; const int *headret[]={head1_6,head2_6,head3_6,head4_6,NULL}; - + fprintf(stderr,"testing very large packets... "); test_pack(packets,headret,0,0,0); } @@ -1764,7 +1790,7 @@ int main(void){ found by Josh Coalson) */ const int packets[]={0,100,130049,259,255,-1}; const int *headret[]={head1_6,head2_6,head3_6,head4_6,NULL}; - + fprintf(stderr,"testing continuation resync in very large packets... "); test_pack(packets,headret,100,2,3); } @@ -1773,7 +1799,7 @@ int main(void){ /* term only page. why not? */ const int packets[]={0,100,64770,-1}; const int *headret[]={head1_7,head2_7,head3_7,NULL}; - + fprintf(stderr,"testing zero data page (1 nil packet)... "); test_pack(packets,headret,0,0,0); } @@ -1786,13 +1812,13 @@ int main(void){ int pl[]={0, 1,1,98,4079, 1,1,2954,2057, 76,34,912,0,234,1000,1000, 1000,300,-1}; int inptr=0,i,j; ogg_page og[5]; - + ogg_stream_reset(&os_en); for(i=0;pl[i]!=-1;i++){ ogg_packet op; int len=pl[i]; - + op.packet=data+inptr; op.bytes=len; op.e_o_s=(pl[i+1]<0?1:0); @@ -1840,7 +1866,7 @@ int main(void){ ogg_stream_pagein(&os_de,&temp); /* do we get the expected results/packets? */ - + if(ogg_stream_packetout(&os_de,&test)!=1)error(); checkpacket(&test,0,0,0); if(ogg_stream_packetout(&os_de,&test)!=1)error(); @@ -1991,13 +2017,13 @@ int main(void){ fprintf(stderr,"ok.\n"); } - + /* Test recapture: garbage + page */ { ogg_page og_de; fprintf(stderr,"Testing search for capture... "); - ogg_sync_reset(&oy); - + ogg_sync_reset(&oy); + /* 'garbage' */ memcpy(ogg_sync_buffer(&oy,og[1].body_len),og[1].body, og[1].body_len); @@ -2033,7 +2059,7 @@ int main(void){ { ogg_page og_de; fprintf(stderr,"Testing recapture... "); - ogg_sync_reset(&oy); + ogg_sync_reset(&oy); memcpy(ogg_sync_buffer(&oy,og[1].header_len),og[1].header, og[1].header_len); @@ -2077,13 +2103,9 @@ int main(void){ free_page(&og[i]); } } - } + } return(0); } #endif - - - - diff --git a/drivers/ogg/ogg.h b/drivers/ogg/ogg.h index cea5c16edc..cea4ebed75 100644 --- a/drivers/ogg/ogg.h +++ b/drivers/ogg/ogg.h @@ -11,7 +11,7 @@ ******************************************************************** function: toplevel libogg include - last mod: $Id: ogg.h 17571 2010-10-27 13:28:20Z xiphmont $ + last mod: $Id: ogg.h 18044 2011-08-01 17:55:20Z gmaxwell $ ********************************************************************/ #ifndef _OGG_H @@ -161,6 +161,7 @@ extern int ogg_stream_iovecin(ogg_stream_state *os, ogg_iovec_t *iov, extern int ogg_stream_pageout(ogg_stream_state *os, ogg_page *og); extern int ogg_stream_pageout_fill(ogg_stream_state *os, ogg_page *og, int nfill); extern int ogg_stream_flush(ogg_stream_state *os, ogg_page *og); +extern int ogg_stream_flush_fill(ogg_stream_state *os, ogg_page *og, int nfill); /* Ogg BITSTREAM PRIMITIVES: decoding **************************/ diff --git a/drivers/ogg/os_types.h b/drivers/ogg/os_types.h index d6691b703d..8bf82107e5 100644 --- a/drivers/ogg/os_types.h +++ b/drivers/ogg/os_types.h @@ -11,7 +11,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h 17712 2010-12-03 17:10:02Z xiphmont $ + last mod: $Id: os_types.h 19098 2014-02-26 19:06:45Z giles $ ********************************************************************/ #ifndef _OS_TYPES_H @@ -24,7 +24,7 @@ #define _ogg_realloc realloc #define _ogg_free free -#if defined(_WIN32) +#if defined(_WIN32) # if defined(__CYGWIN__) # include <stdint.h> diff --git a/drivers/openssl/register_openssl.cpp b/drivers/openssl/register_openssl.cpp index ed2150bef5..0d2f9fd537 100644 --- a/drivers/openssl/register_openssl.cpp +++ b/drivers/openssl/register_openssl.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* register_openssl.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "register_openssl.h" #include "stream_peer_openssl.h" diff --git a/drivers/openssl/register_openssl.h b/drivers/openssl/register_openssl.h index e547a2b750..a66ca1e9c0 100644 --- a/drivers/openssl/register_openssl.h +++ b/drivers/openssl/register_openssl.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* register_openssl.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef REGISTER_OPENSSL_H #define REGISTER_OPENSSL_H diff --git a/drivers/openssl/stream_peer_openssl.cpp b/drivers/openssl/stream_peer_openssl.cpp index aad3a11b7e..67f58b6028 100644 --- a/drivers/openssl/stream_peer_openssl.cpp +++ b/drivers/openssl/stream_peer_openssl.cpp @@ -1,4 +1,31 @@ - +/*************************************************************************/ +/* stream_peer_openssl.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifdef OPENSSL_ENABLED #include "stream_peer_openssl.h" //hostname matching code from curl diff --git a/drivers/openssl/stream_peer_openssl.h b/drivers/openssl/stream_peer_openssl.h index 20266ee584..f1f25f4fc5 100644 --- a/drivers/openssl/stream_peer_openssl.h +++ b/drivers/openssl/stream_peer_openssl.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* stream_peer_openssl.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef STREAM_PEER_OPEN_SSL_H #define STREAM_PEER_OPEN_SSL_H diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 9dbffeed1f..96ef9fa5f8 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -3,7 +3,6 @@ Import('env_drivers') png_sources = [ - "png/example.c", "png/png.c", "png/pngerror.c", "png/pngget.c", diff --git a/drivers/png/example.c b/drivers/png/example.c deleted file mode 100644 index 7171d9847e..0000000000 --- a/drivers/png/example.c +++ /dev/null @@ -1,879 +0,0 @@ - -#if 0 /* in case someone actually tries to compile this */ - -/* example.c - an example of using libpng - * Last changed in libpng 1.5.19 [August 21, 2014] - * Maintained 1998-2014 Glenn Randers-Pehrson - * Maintained 1996, 1997 Andreas Dilger - * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc. - */ - -/* This is an example of how to use libpng to read and write PNG files. - * The file libpng-manual.txt is much more verbose then this. If you have not - * read it, do so first. This was designed to be a starting point of an - * implementation. This is not officially part of libpng, is hereby placed - * in the public domain, and therefore does not require a copyright notice. - * To the extent possible under law, the authors have waived all copyright and - * related or neighboring rights to this file. - * - * This file does not currently compile, because it is missing certain - * parts, like allocating memory to hold an image. You will have to - * supply these parts to get it to compile. For an example of a minimal - * working PNG reader/writer, see pngtest.c, included in this distribution; - * see also the programs in the contrib directory. - */ - -#define _POSIX_SOURCE 1 /* libpng and zlib are POSIX-compliant. You may - * change this if your application uses non-POSIX - * extensions. */ - -#include "png.h" - - /* The png_jmpbuf() macro, used in error handling, became available in - * libpng version 1.0.6. If you want to be able to run your code with older - * versions of libpng, you must define the macro yourself (but only if it - * is not already defined by libpng!). - */ - -#ifndef png_jmpbuf -# define png_jmpbuf(png_ptr) ((png_ptr)->png_jmpbuf) -#endif - -/* Check to see if a file is a PNG file using png_sig_cmp(). png_sig_cmp() - * returns zero if the image is a PNG and nonzero if it isn't a PNG. - * - * The function check_if_png() shown here, but not used, returns nonzero (true) - * if the file can be opened and is a PNG, 0 (false) otherwise. - * - * If this call is successful, and you are going to keep the file open, - * you should call png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK); once - * you have created the png_ptr, so that libpng knows your application - * has read that many bytes from the start of the file. Make sure you - * don't call png_set_sig_bytes() with more than 8 bytes read or give it - * an incorrect number of bytes read, or you will either have read too - * many bytes (your fault), or you are telling libpng to read the wrong - * number of magic bytes (also your fault). - * - * Many applications already read the first 2 or 4 bytes from the start - * of the image to determine the file type, so it would be easiest just - * to pass the bytes to png_sig_cmp() or even skip that if you know - * you have a PNG file, and call png_set_sig_bytes(). - */ -#define PNG_BYTES_TO_CHECK 4 -int check_if_png(char *file_name, FILE **fp) -{ - char buf[PNG_BYTES_TO_CHECK]; - - /* Open the prospective PNG file. */ - if ((*fp = fopen(file_name, "rb")) == NULL) - return 0; - - /* Read in some of the signature bytes */ - if (fread(buf, 1, PNG_BYTES_TO_CHECK, *fp) != PNG_BYTES_TO_CHECK) - return 0; - - /* Compare the first PNG_BYTES_TO_CHECK bytes of the signature. - Return nonzero (true) if they match */ - - return(!png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK)); -} - -/* Read a PNG file. You may want to return an error code if the read - * fails (depending upon the failure). There are two "prototypes" given - * here - one where we are given the filename, and we need to open the - * file, and the other where we are given an open file (possibly with - * some or all of the magic bytes read - see comments above). - */ -#ifdef open_file /* prototype 1 */ -void read_png(char *file_name) /* We need to open the file */ -{ - png_structp png_ptr; - png_infop info_ptr; - int sig_read = 0; - png_uint_32 width, height; - int bit_depth, color_type, interlace_type; - FILE *fp; - - if ((fp = fopen(file_name, "rb")) == NULL) - return (ERROR); - -#else no_open_file /* prototype 2 */ -void read_png(FILE *fp, int sig_read) /* File is already open */ -{ - png_structp png_ptr; - png_infop info_ptr; - png_uint_32 width, height; - int bit_depth, color_type, interlace_type; -#endif no_open_file /* Only use one prototype! */ - - /* Create and initialize the png_struct with the desired error handler - * functions. If you want to use the default stderr and longjump method, - * you can supply NULL for the last three parameters. We also supply the - * the compiler header file version, so that we know if the application - * was compiled with a compatible version of the library. REQUIRED - */ - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, - png_voidp user_error_ptr, user_error_fn, user_warning_fn); - - if (png_ptr == NULL) - { - fclose(fp); - return (ERROR); - } - - /* Allocate/initialize the memory for image information. REQUIRED. */ - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - { - fclose(fp); - png_destroy_read_struct(&png_ptr, NULL, NULL); - return (ERROR); - } - - /* Set error handling if you are using the setjmp/longjmp method (this is - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ - - if (setjmp(png_jmpbuf(png_ptr))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(fp); - /* If we get here, we had a problem reading the file */ - return (ERROR); - } - - /* One of the following I/O initialization methods is REQUIRED */ -#ifdef streams /* PNG file I/O method 1 */ - /* Set up the input control if you are using standard C streams */ - png_init_io(png_ptr, fp); - -#else no_streams /* PNG file I/O method 2 */ - /* If you are using replacement read functions, instead of calling - * png_init_io() here you would call: - */ - png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn); - /* where user_io_ptr is a structure you want available to the callbacks */ -#endif no_streams /* Use only one I/O method! */ - - /* If we have already read some of the signature */ - png_set_sig_bytes(png_ptr, sig_read); - -#ifdef hilevel - /* - * If you have enough memory to read in the entire image at once, - * and you need to specify only transforms that can be controlled - * with one of the PNG_TRANSFORM_* bits (this presently excludes - * quantizing, filling, setting background, and doing gamma - * adjustment), then you can read the entire image (including - * pixels) into the info structure with this call: - */ - png_read_png(png_ptr, info_ptr, png_transforms, NULL); - -#else - /* OK, you're doing it the hard way, with the lower-level functions */ - - /* The call to png_read_info() gives us all of the information from the - * PNG file before the first IDAT (image data chunk). REQUIRED - */ - png_read_info(png_ptr, info_ptr); - - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - &interlace_type, NULL, NULL); - - /* Set up the data transformations you want. Note that these are all - * optional. Only call them if you want/need them. Many of the - * transformations only work on specific types of images, and many - * are mutually exclusive. - */ - - /* Tell libpng to strip 16 bits/color files down to 8 bits/color. - * Use accurate scaling if it's available, otherwise just chop off the - * low byte. - */ -#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED - png_set_scale_16(png_ptr); -#else - png_set_strip_16(png_ptr); -#endif - - /* Strip alpha bytes from the input data without combining with the - * background (not recommended). - */ - png_set_strip_alpha(png_ptr); - - /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single - * byte into separate bytes (useful for paletted and grayscale images). - */ - png_set_packing(png_ptr); - - /* Change the order of packed pixels to least significant bit first - * (not useful if you are using png_set_packing). */ - png_set_packswap(png_ptr); - - /* Expand paletted colors into true RGB triplets */ - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb(png_ptr); - - /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_expand_gray_1_2_4_to_8(png_ptr); - - /* Expand paletted or RGB images with transparency to full alpha channels - * so the data will be available as RGBA quartets. - */ - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha(png_ptr); - - /* Set the background color to draw transparent and alpha images over. - * It is possible to set the red, green, and blue components directly - * for paletted images instead of supplying a palette index. Note that - * even if the PNG file supplies a background, you are not required to - * use it - you should use the (solid) application background if it has one. - */ - - png_color_16 my_background, *image_background; - - if (png_get_bKGD(png_ptr, info_ptr, &image_background)) - png_set_background(png_ptr, image_background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); - else - png_set_background(png_ptr, &my_background, - PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); - - /* Some suggestions as to how to get a screen gamma value - * - * Note that screen gamma is the display_exponent, which includes - * the CRT_exponent and any correction for viewing conditions - */ - if (/* We have a user-defined screen gamma value */) - { - screen_gamma = user-defined screen_gamma; - } - /* This is one way that applications share the same screen gamma value */ - else if ((gamma_str = getenv("SCREEN_GAMMA")) != NULL) - { - screen_gamma = atof(gamma_str); - } - /* If we don't have another value */ - else - { - screen_gamma = PNG_DEFAULT_sRGB; /* A good guess for a PC monitor - in a dimly lit room */ - screen_gamma = PNG_GAMMA_MAC_18 or 1.0; /* Good guesses for Mac systems */ - } - - /* Tell libpng to handle the gamma conversion for you. The final call - * is a good guess for PC generated images, but it should be configurable - * by the user at run time by the user. It is strongly suggested that - * your application support gamma correction. - */ - - int intent; - - if (png_get_sRGB(png_ptr, info_ptr, &intent)) - png_set_gamma(png_ptr, screen_gamma, PNG_DEFAULT_sRGB); - else - { - double image_gamma; - if (png_get_gAMA(png_ptr, info_ptr, &image_gamma)) - png_set_gamma(png_ptr, screen_gamma, image_gamma); - else - png_set_gamma(png_ptr, screen_gamma, 0.45455); - } - -#ifdef PNG_READ_QUANTIZE_SUPPORTED - /* Quantize RGB files down to 8-bit palette or reduce palettes - * to the number of colors available on your screen. - */ - if (color_type & PNG_COLOR_MASK_COLOR) - { - int num_palette; - png_colorp palette; - - /* This reduces the image to the application supplied palette */ - if (/* We have our own palette */) - { - /* An array of colors to which the image should be quantized */ - png_color std_color_cube[MAX_SCREEN_COLORS]; - - png_set_quantize(png_ptr, std_color_cube, MAX_SCREEN_COLORS, - MAX_SCREEN_COLORS, NULL, 0); - } - /* This reduces the image to the palette supplied in the file */ - else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) - { - png_uint_16p histogram = NULL; - - png_get_hIST(png_ptr, info_ptr, &histogram); - - png_set_quantize(png_ptr, palette, num_palette, - max_screen_colors, histogram, 0); - } - } -#endif /* PNG_READ_QUANTIZE_SUPPORTED */ - - /* Invert monochrome files to have 0 as white and 1 as black */ - png_set_invert_mono(png_ptr); - - /* If you want to shift the pixel values from the range [0,255] or - * [0,65535] to the original [0,7] or [0,31], or whatever range the - * colors were originally in: - */ - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT)) - { - png_color_8p sig_bit_p; - - png_get_sBIT(png_ptr, info_ptr, &sig_bit_p); - png_set_shift(png_ptr, sig_bit_p); - } - - /* Flip the RGB pixels to BGR (or RGBA to BGRA) */ - if (color_type & PNG_COLOR_MASK_COLOR) - png_set_bgr(png_ptr); - - /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */ - png_set_swap_alpha(png_ptr); - - /* Swap bytes of 16-bit files to least significant byte first */ - png_set_swap(png_ptr); - - /* Add filler (or alpha) byte (before/after each RGB triplet) */ - png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); - -#ifdef PNG_READ_INTERLACING_SUPPORTED - /* Turn on interlace handling. REQUIRED if you are not using - * png_read_image(). To see how to handle interlacing passes, - * see the png_read_row() method below: - */ - number_passes = png_set_interlace_handling(png_ptr); -#else - number_passes = 1; -#endif /* PNG_READ_INTERLACING_SUPPORTED */ - - - /* Optional call to gamma correct and add the background to the palette - * and update info structure. REQUIRED if you are expecting libpng to - * update the palette for you (ie you selected such a transform above). - */ - png_read_update_info(png_ptr, info_ptr); - - /* Allocate the memory to hold the image using the fields of info_ptr. */ - - /* The easiest way to read the image: */ - png_bytep row_pointers[height]; - - /* Clear the pointer array */ - for (row = 0; row < height; row++) - row_pointers[row] = NULL; - - for (row = 0; row < height; row++) - row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr, - info_ptr)); - - /* Now it's time to read the image. One of these methods is REQUIRED */ -#ifdef entire /* Read the entire image in one go */ - png_read_image(png_ptr, row_pointers); - -#else no_entire /* Read the image one or more scanlines at a time */ - /* The other way to read images - deal with interlacing: */ - - for (pass = 0; pass < number_passes; pass++) - { -#ifdef single /* Read the image a single row at a time */ - for (y = 0; y < height; y++) - { - png_read_rows(png_ptr, &row_pointers[y], NULL, 1); - } - -#else no_single /* Read the image several rows at a time */ - for (y = 0; y < height; y += number_of_rows) - { -#ifdef sparkle /* Read the image using the "sparkle" effect. */ - png_read_rows(png_ptr, &row_pointers[y], NULL, - number_of_rows); -#else no_sparkle /* Read the image using the "rectangle" effect */ - png_read_rows(png_ptr, NULL, &row_pointers[y], - number_of_rows); -#endif no_sparkle /* Use only one of these two methods */ - } - - /* If you want to display the image after every pass, do so here */ -#endif no_single /* Use only one of these two methods */ - } -#endif no_entire /* Use only one of these two methods */ - - /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */ - png_read_end(png_ptr, info_ptr); -#endif hilevel - - /* At this point you have read the entire image */ - - /* Clean up after the read, and free any memory allocated - REQUIRED */ - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - - /* Close the file */ - fclose(fp); - - /* That's it */ - return (OK); -} - -/* Progressively read a file */ - -int -initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr) -{ - /* Create and initialize the png_struct with the desired error handler - * functions. If you want to use the default stderr and longjump method, - * you can supply NULL for the last three parameters. We also check that - * the library version is compatible in case we are using dynamically - * linked libraries. - */ - *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, - png_voidp user_error_ptr, user_error_fn, user_warning_fn); - - if (*png_ptr == NULL) - { - *info_ptr = NULL; - return (ERROR); - } - - *info_ptr = png_create_info_struct(png_ptr); - - if (*info_ptr == NULL) - { - png_destroy_read_struct(png_ptr, info_ptr, NULL); - return (ERROR); - } - - if (setjmp(png_jmpbuf((*png_ptr)))) - { - png_destroy_read_struct(png_ptr, info_ptr, NULL); - return (ERROR); - } - - /* This one's new. You will need to provide all three - * function callbacks, even if you aren't using them all. - * If you aren't using all functions, you can specify NULL - * parameters. Even when all three functions are NULL, - * you need to call png_set_progressive_read_fn(). - * These functions shouldn't be dependent on global or - * static variables if you are decoding several images - * simultaneously. You should store stream specific data - * in a separate struct, given as the second parameter, - * and retrieve the pointer from inside the callbacks using - * the function png_get_progressive_ptr(png_ptr). - */ - png_set_progressive_read_fn(*png_ptr, (void *)stream_data, - info_callback, row_callback, end_callback); - - return (OK); -} - -int -process_data(png_structp *png_ptr, png_infop *info_ptr, - png_bytep buffer, png_uint_32 length) -{ - if (setjmp(png_jmpbuf((*png_ptr)))) - { - /* Free the png_ptr and info_ptr memory on error */ - png_destroy_read_struct(png_ptr, info_ptr, NULL); - return (ERROR); - } - - /* This one's new also. Simply give it chunks of data as - * they arrive from the data stream (in order, of course). - * On segmented machines, don't give it any more than 64K. - * The library seems to run fine with sizes of 4K, although - * you can give it much less if necessary (I assume you can - * give it chunks of 1 byte, but I haven't tried with less - * than 256 bytes yet). When this function returns, you may - * want to display any rows that were generated in the row - * callback, if you aren't already displaying them there. - */ - png_process_data(*png_ptr, *info_ptr, buffer, length); - return (OK); -} - -info_callback(png_structp png_ptr, png_infop info) -{ - /* Do any setup here, including setting any of the transformations - * mentioned in the Reading PNG files section. For now, you _must_ - * call either png_start_read_image() or png_read_update_info() - * after all the transformations are set (even if you don't set - * any). You may start getting rows before png_process_data() - * returns, so this is your last chance to prepare for that. - */ -} - -row_callback(png_structp png_ptr, png_bytep new_row, - png_uint_32 row_num, int pass) -{ - /* - * This function is called for every row in the image. If the - * image is interlaced, and you turned on the interlace handler, - * this function will be called for every row in every pass. - * - * In this function you will receive a pointer to new row data from - * libpng called new_row that is to replace a corresponding row (of - * the same data format) in a buffer allocated by your application. - * - * The new row data pointer "new_row" may be NULL, indicating there is - * no new data to be replaced (in cases of interlace loading). - * - * If new_row is not NULL then you need to call - * png_progressive_combine_row() to replace the corresponding row as - * shown below: - */ - - /* Get pointer to corresponding row in our - * PNG read buffer. - */ - png_bytep old_row = ((png_bytep *)our_data)[row_num]; - -#ifdef PNG_READ_INTERLACING_SUPPORTED - /* If both rows are allocated then copy the new row - * data to the corresponding row data. - */ - if ((old_row != NULL) && (new_row != NULL)) - png_progressive_combine_row(png_ptr, old_row, new_row); - - /* - * The rows and passes are called in order, so you don't really - * need the row_num and pass, but I'm supplying them because it - * may make your life easier. - * - * For the non-NULL rows of interlaced images, you must call - * png_progressive_combine_row() passing in the new row and the - * old row, as demonstrated above. You can call this function for - * NULL rows (it will just return) and for non-interlaced images - * (it just does the png_memcpy for you) if it will make the code - * easier. Thus, you can just do this for all cases: - */ - - png_progressive_combine_row(png_ptr, old_row, new_row); - - /* where old_row is what was displayed for previous rows. Note - * that the first pass (pass == 0 really) will completely cover - * the old row, so the rows do not have to be initialized. After - * the first pass (and only for interlaced images), you will have - * to pass the current row as new_row, and the function will combine - * the old row and the new row. - */ -#endif /* PNG_READ_INTERLACING_SUPPORTED */ -} - -end_callback(png_structp png_ptr, png_infop info) -{ - /* This function is called when the whole image has been read, - * including any chunks after the image (up to and including - * the IEND). You will usually have the same info chunk as you - * had in the header, although some data may have been added - * to the comments and time fields. - * - * Most people won't do much here, perhaps setting a flag that - * marks the image as finished. - */ -} - -/* Write a png file */ -void write_png(char *file_name /* , ... other image information ... */) -{ - FILE *fp; - png_structp png_ptr; - png_infop info_ptr; - png_colorp palette; - - /* Open the file */ - fp = fopen(file_name, "wb"); - if (fp == NULL) - return (ERROR); - - /* Create and initialize the png_struct with the desired error handler - * functions. If you want to use the default stderr and longjump method, - * you can supply NULL for the last three parameters. We also check that - * the library version is compatible with the one used at compile time, - * in case we are using dynamically linked libraries. REQUIRED. - */ - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, - png_voidp user_error_ptr, user_error_fn, user_warning_fn); - - if (png_ptr == NULL) - { - fclose(fp); - return (ERROR); - } - - /* Allocate/initialize the image information data. REQUIRED */ - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - { - fclose(fp); - png_destroy_write_struct(&png_ptr, NULL); - return (ERROR); - } - - /* Set error handling. REQUIRED if you aren't supplying your own - * error handling functions in the png_create_write_struct() call. - */ - if (setjmp(png_jmpbuf(png_ptr))) - { - /* If we get here, we had a problem writing the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); - return (ERROR); - } - - /* One of the following I/O initialization functions is REQUIRED */ - -#ifdef streams /* I/O initialization method 1 */ - /* Set up the output control if you are using standard C streams */ - png_init_io(png_ptr, fp); - -#else no_streams /* I/O initialization method 2 */ - /* If you are using replacement write functions, instead of calling - * png_init_io() here you would call - */ - png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn, - user_IO_flush_function); - /* where user_io_ptr is a structure you want available to the callbacks */ -#endif no_streams /* Only use one initialization method */ - -#ifdef hilevel - /* This is the easy way. Use it if you already have all the - * image info living in the structure. You could "|" many - * PNG_TRANSFORM flags into the png_transforms integer here. - */ - png_write_png(png_ptr, info_ptr, png_transforms, NULL); - -#else - /* This is the hard way */ - - /* Set the image information here. Width and height are up to 2^31, - * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on - * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY, - * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB, - * or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or - * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST - * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED - */ - png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???, - PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - /* Set the palette if there is one. REQUIRED for indexed-color images */ - palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH - * png_sizeof(png_color)); - /* ... Set palette colors ... */ - png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH); - /* You must not free palette here, because png_set_PLTE only makes a link to - * the palette that you malloced. Wait until you are about to destroy - * the png structure. - */ - - /* Optional significant bit (sBIT) chunk */ - png_color_8 sig_bit; - - /* If we are dealing with a grayscale image then */ - sig_bit.gray = true_bit_depth; - - /* Otherwise, if we are dealing with a color image then */ - sig_bit.red = true_red_bit_depth; - sig_bit.green = true_green_bit_depth; - sig_bit.blue = true_blue_bit_depth; - - /* If the image has an alpha channel then */ - sig_bit.alpha = true_alpha_bit_depth; - - png_set_sBIT(png_ptr, info_ptr, &sig_bit); - - - /* Optional gamma chunk is strongly suggested if you have any guess - * as to the correct gamma of the image. - */ - png_set_gAMA(png_ptr, info_ptr, gamma); - - /* Optionally write comments into the image */ - { - png_text text_ptr[3]; - - char key0[]="Title"; - char text0[]="Mona Lisa"; - text_ptr[0].key = key0; - text_ptr[0].text = text0; - text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE; - text_ptr[0].itxt_length = 0; - text_ptr[0].lang = NULL; - text_ptr[0].lang_key = NULL; - - char key1[]="Author"; - char text1[]="Leonardo DaVinci"; - text_ptr[1].key = key1; - text_ptr[1].text = text1; - text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE; - text_ptr[1].itxt_length = 0; - text_ptr[1].lang = NULL; - text_ptr[1].lang_key = NULL; - - char key2[]="Description"; - char text2[]="<long text>"; - text_ptr[2].key = key2; - text_ptr[2].text = text2; - text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt; - text_ptr[2].itxt_length = 0; - text_ptr[2].lang = NULL; - text_ptr[2].lang_key = NULL; - - png_set_text(write_ptr, write_info_ptr, text_ptr, 3); - } - - /* Other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs */ - - /* Note that if sRGB is present the gAMA and cHRM chunks must be ignored - * on read and, if your application chooses to write them, they must - * be written in accordance with the sRGB profile - */ - - /* Write the file header information. REQUIRED */ - png_write_info(png_ptr, info_ptr); - - /* If you want, you can write the info in two steps, in case you need to - * write your private chunk ahead of PLTE: - * - * png_write_info_before_PLTE(write_ptr, write_info_ptr); - * write_my_chunk(); - * png_write_info(png_ptr, info_ptr); - * - * However, given the level of known- and unknown-chunk support in 1.2.0 - * and up, this should no longer be necessary. - */ - - /* Once we write out the header, the compression type on the text - * chunk gets changed to PNG_TEXT_COMPRESSION_NONE_WR or - * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again - * at the end. - */ - - /* Set up the transformations you want. Note that these are - * all optional. Only call them if you want them. - */ - - /* Invert monochrome pixels */ - png_set_invert_mono(png_ptr); - - /* Shift the pixels up to a legal bit depth and fill in - * as appropriate to correctly scale the image. - */ - png_set_shift(png_ptr, &sig_bit); - - /* Pack pixels into bytes */ - png_set_packing(png_ptr); - - /* Swap location of alpha bytes from ARGB to RGBA */ - png_set_swap_alpha(png_ptr); - - /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into - * RGB (4 channels -> 3 channels). The second parameter is not used. - */ - png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE); - - /* Flip BGR pixels to RGB */ - png_set_bgr(png_ptr); - - /* Swap bytes of 16-bit files to most significant byte first */ - png_set_swap(png_ptr); - - /* Swap bits of 1-bit, 2-bit, 4-bit packed pixel formats */ - png_set_packswap(png_ptr); - - /* Turn on interlace handling if you are not using png_write_image() */ - if (interlacing != 0) - number_passes = png_set_interlace_handling(png_ptr); - - else - number_passes = 1; - - /* The easiest way to write the image (you may have a different memory - * layout, however, so choose what fits your needs best). You need to - * use the first method if you aren't handling interlacing yourself. - */ - png_uint_32 k, height, width; - - /* In this example, "image" is a one-dimensional array of bytes */ - png_byte image[height*width*bytes_per_pixel]; - - png_bytep row_pointers[height]; - - if (height > PNG_UINT_32_MAX/png_sizeof(png_bytep)) - png_error (png_ptr, "Image is too tall to process in memory"); - - /* Set up pointers into your "image" byte array */ - for (k = 0; k < height; k++) - row_pointers[k] = image + k*width*bytes_per_pixel; - - /* One of the following output methods is REQUIRED */ - -#ifdef entire /* Write out the entire image data in one call */ - png_write_image(png_ptr, row_pointers); - - /* The other way to write the image - deal with interlacing */ - -#else no_entire /* Write out the image data by one or more scanlines */ - - /* The number of passes is either 1 for non-interlaced images, - * or 7 for interlaced images. - */ - for (pass = 0; pass < number_passes; pass++) - { - /* Write a few rows at a time. */ - png_write_rows(png_ptr, &row_pointers[first_row], number_of_rows); - - /* If you are only writing one row at a time, this works */ - for (y = 0; y < height; y++) - png_write_rows(png_ptr, &row_pointers[y], 1); - } -#endif no_entire /* Use only one output method */ - - /* You can write optional chunks like tEXt, zTXt, and tIME at the end - * as well. Shouldn't be necessary in 1.2.0 and up as all the public - * chunks are supported and you can use png_set_unknown_chunks() to - * register unknown chunks into the info structure to be written out. - */ - - /* It is REQUIRED to call this to finish writing the rest of the file */ - png_write_end(png_ptr, info_ptr); -#endif hilevel - - /* If you png_malloced a palette, free it here (don't free info_ptr->palette, - * as recommended in versions 1.0.5m and earlier of this example; if - * libpng mallocs info_ptr->palette, libpng will free it). If you - * allocated it with malloc() instead of png_malloc(), use free() instead - * of png_free(). - */ - png_free(png_ptr, palette); - palette = NULL; - - /* Similarly, if you png_malloced any data that you passed in with - * png_set_something(), such as a hist or trans array, free it here, - * when you can be sure that libpng is through with it. - */ - png_free(png_ptr, trans); - trans = NULL; - /* Whenever you use png_free() it is a good idea to set the pointer to - * NULL in case your application inadvertently tries to png_free() it - * again. When png_free() sees a NULL it returns without action, thus - * avoiding the double-free security problem. - */ - - /* Clean up after the write, and free any memory allocated */ - png_destroy_write_struct(&png_ptr, &info_ptr); - - /* Close the file */ - fclose(fp); - - /* That's it */ - return (OK); -} - -#endif /* if 0 */ diff --git a/drivers/png/resource_saver_png.h b/drivers/png/resource_saver_png.h index 116d425d24..d2e0753b40 100644 --- a/drivers/png/resource_saver_png.h +++ b/drivers/png/resource_saver_png.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* resource_saver_png.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef RESOURCE_SAVER_PNG_H #define RESOURCE_SAVER_PNG_H diff --git a/drivers/pnm/bitmap_loader_pnm.cpp b/drivers/pnm/bitmap_loader_pnm.cpp index c9298be26a..e06d4c80f0 100644 --- a/drivers/pnm/bitmap_loader_pnm.cpp +++ b/drivers/pnm/bitmap_loader_pnm.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_jpg.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* bitmap_loader_pnm.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "bitmap_loader_pnm.h" #include "os/file_access.h" #include "scene/resources/bit_mask.h" diff --git a/drivers/pnm/bitmap_loader_pnm.h b/drivers/pnm/bitmap_loader_pnm.h index 6e6c8a59c8..965cf7a451 100644 --- a/drivers/pnm/bitmap_loader_pnm.h +++ b/drivers/pnm/bitmap_loader_pnm.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_jpg.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* bitmap_loader_pnm.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef BITMAP_LOADER_PNM_H #define BITMAP_LOADER_PNM_H diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index 813a95816b..4804bc5630 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* audio_driver_alsa.cpp */ +/* audio_driver_pulseaudio.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/drivers/pvr/texture_loader_pvr.cpp b/drivers/pvr/texture_loader_pvr.cpp index eb67dad8cf..3ab3240512 100644 --- a/drivers/pvr/texture_loader_pvr.cpp +++ b/drivers/pvr/texture_loader_pvr.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* texture_loader_pvr.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "texture_loader_pvr.h" #include "os/file_access.h" #include <string.h> diff --git a/drivers/pvr/texture_loader_pvr.h b/drivers/pvr/texture_loader_pvr.h index 735cb2b48b..5efb3b2507 100644 --- a/drivers/pvr/texture_loader_pvr.h +++ b/drivers/pvr/texture_loader_pvr.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* texture_loader_pvr.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef TEXTURE_LOADER_PVR_H #define TEXTURE_LOADER_PVR_H diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp index 2f9767440e..8354de8c6f 100644 --- a/drivers/register_driver_types.cpp +++ b/drivers/register_driver_types.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* register_driver_types.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* register_driver_types.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "register_driver_types.h" #include "png/image_loader_png.h" diff --git a/drivers/register_driver_types.h b/drivers/register_driver_types.h index 8a13ad4471..0d9ffff2c9 100644 --- a/drivers/register_driver_types.h +++ b/drivers/register_driver_types.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* register_driver_types.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* register_driver_types.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef REGISTER_DRIVER_TYPES_H #define REGISTER_DRIVER_TYPES_H diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp index b172ef6e09..1bea828680 100644 --- a/drivers/rtaudio/audio_driver_rtaudio.cpp +++ b/drivers/rtaudio/audio_driver_rtaudio.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* audio_driver_rtaudio.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* audio_driver_rtaudio.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "audio_driver_rtaudio.h" #include "globals.h" #include "os/os.h" diff --git a/drivers/rtaudio/audio_driver_rtaudio.h b/drivers/rtaudio/audio_driver_rtaudio.h index 115953ce1f..ccb3d005c1 100644 --- a/drivers/rtaudio/audio_driver_rtaudio.h +++ b/drivers/rtaudio/audio_driver_rtaudio.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* audio_driver_rtaudio.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* audio_driver_rtaudio.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef AUDIO_DRIVER_RTAUDIO_H #define AUDIO_DRIVER_RTAUDIO_H diff --git a/drivers/speex/audio_stream_speex.cpp b/drivers/speex/audio_stream_speex.cpp index 1bb4952cc8..79f3e58ac0 100644 --- a/drivers/speex/audio_stream_speex.cpp +++ b/drivers/speex/audio_stream_speex.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* audio_stream_speex.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "audio_stream_speex.h" #include "os_support.h" diff --git a/drivers/speex/audio_stream_speex.h b/drivers/speex/audio_stream_speex.h index f0617b302f..491c593e47 100644 --- a/drivers/speex/audio_stream_speex.h +++ b/drivers/speex/audio_stream_speex.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* audio_stream_speex.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef AUDIO_STREAM_SPEEX_H #define AUDIO_STREAM_SPEEX_H diff --git a/drivers/squish/image_compress_squish.cpp b/drivers/squish/image_compress_squish.cpp index 2c520bd1e9..95de83d5a5 100644 --- a/drivers/squish/image_compress_squish.cpp +++ b/drivers/squish/image_compress_squish.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* image_compress_squish.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "image_compress_squish.h" #include "squish/squish.h" #include "print_string.h" diff --git a/drivers/squish/image_compress_squish.h b/drivers/squish/image_compress_squish.h index 4fec8d7ef7..8c37ac2caa 100644 --- a/drivers/squish/image_compress_squish.h +++ b/drivers/squish/image_compress_squish.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* image_compress_squish.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef IMAGE_COMPRESS_SQUISH_H #define IMAGE_COMPRESS_SQUISH_H diff --git a/drivers/theora/codec.h b/drivers/theora/codec.h index 9b816e5cfd..5c2669630c 100644 --- a/drivers/theora/codec.h +++ b/drivers/theora/codec.h @@ -15,7 +15,7 @@ ********************************************************************/ -/**\file +/**\mainpage * * \section intro Introduction * diff --git a/drivers/theora/decode.c b/drivers/theora/decode.c index 882606ae77..7be66463d8 100644 --- a/drivers/theora/decode.c +++ b/drivers/theora/decode.c @@ -1611,35 +1611,28 @@ static void oc_filter_hedge(unsigned char *_dst,int _dst_ystride, int sum1; int bx; int by; - int _rlimit1; - int _rlimit2; rdst=_dst; rsrc=_src; - for(bx=0;bx<8;++bx){ + for(bx=0;bx<8;bx++){ cdst=rdst; csrc=rsrc; - _rlimit1 = _rlimit2 = _flimit; - for(by=0;by<10;++by){ + for(by=0;by<10;by++){ r[by]=*csrc; csrc+=_src_ystride; } sum0=sum1=0; - for(by=0;by<4;++by){ - int sumed = abs(r[by+1]-r[by]); - sum0+=sumed; - _rlimit1-=sumed; - sumed = abs(r[by+5]-r[by+6]); - sum1+=sumed; - _rlimit2-=sumed; + for(by=0;by<4;by++){ + sum0+=abs(r[by+1]-r[by]); + sum1+=abs(r[by+5]-r[by+6]); } *_variance0+=OC_MINI(255,sum0); *_variance1+=OC_MINI(255,sum1); - if(_rlimit1&&_rlimit2&&!(r[5]-r[4]-_qstep)&&!(r[4]-r[5]-_qstep)){ + if(sum0<_flimit&&sum1<_flimit&&r[5]-r[4]<_qstep&&r[4]-r[5]<_qstep){ *cdst=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3); cdst+=_dst_ystride; *cdst=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3); cdst+=_dst_ystride; - for(by=0;by<4;++by){ + for(by=0;by<4;by++){ *cdst=(unsigned char)(r[by]+r[by+1]+r[by+2]+r[by+3]*2+ r[by+4]+r[by+5]+r[by+6]+4>>3); cdst+=_dst_ystride; @@ -1649,13 +1642,13 @@ static void oc_filter_hedge(unsigned char *_dst,int _dst_ystride, *cdst=(unsigned char)(r[5]+r[6]+r[7]+r[8]*2+r[9]*3+4>>3); } else{ - for(by=1;by<=8;++by){ + for(by=1;by<=8;by++){ *cdst=(unsigned char)r[by]; cdst+=_dst_ystride; } } - ++rdst; - ++rsrc; + rdst++; + rsrc++; } } @@ -1670,26 +1663,19 @@ static void oc_filter_vedge(unsigned char *_dst,int _dst_ystride, int sum1; int bx; int by; - int _rlimit1; - int _rlimit2; cdst=_dst; - for(by=0;by<8;++by){ + for(by=0;by<8;by++){ rsrc=cdst-1; rdst=cdst; - for(bx=0;bx<10;++bx)r[bx]=*rsrc++; + for(bx=0;bx<10;bx++)r[bx]=*rsrc++; sum0=sum1=0; - _rlimit1 = _rlimit2 = _flimit; - for(bx=0;bx<4;++bx){ - int sumed = abs(r[bx+1]-r[bx]); - sum0+=sumed; - _rlimit1-=sumed; - sumed = abs(r[bx+5]-r[bx+6]); - sum1+=sumed; - _rlimit2-=sumed; + for(bx=0;bx<4;bx++){ + sum0+=abs(r[bx+1]-r[bx]); + sum1+=abs(r[bx+5]-r[bx+6]); } _variances[0]+=OC_MINI(255,sum0); _variances[1]+=OC_MINI(255,sum1); - if(_rlimit1&&_rlimit2&&!(r[5]-r[4]-_qstep)&&!(r[4]-r[5]-_qstep)){ + if(sum0<_flimit&&sum1<_flimit&&r[5]-r[4]<_qstep&&r[4]-r[5]<_qstep){ *rdst++=(unsigned char)(r[0]*3+r[1]*2+r[2]+r[3]+r[4]+4>>3); *rdst++=(unsigned char)(r[0]*2+r[1]+r[2]*2+r[3]+r[4]+r[5]+4>>3); for(bx=0;bx<4;bx++){ diff --git a/drivers/theora/encint.h b/drivers/theora/encint.h index 82338256dc..97897d5a04 100644 --- a/drivers/theora/encint.h +++ b/drivers/theora/encint.h @@ -14,7 +14,6 @@ last mod: $Id: encint.h 16503 2009-08-22 18:14:02Z giles $ ********************************************************************/ - #if !defined(_encint_H) # define _encint_H (1) # if defined(HAVE_CONFIG_H) diff --git a/drivers/theora/video_stream_theora.cpp b/drivers/theora/video_stream_theora.cpp index e577c3f932..fa2a79dc7b 100644 --- a/drivers/theora/video_stream_theora.cpp +++ b/drivers/theora/video_stream_theora.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* video_stream_theora.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifdef THEORA_ENABLED #include "video_stream_theora.h" @@ -513,7 +541,7 @@ void VideoStreamPlaybackTheora::update(float p_delta) { } bool frame_done=false; - bool audio_done=false; + bool audio_done=!vorbis_p; bool theora_done=false; diff --git a/drivers/theora/video_stream_theora.h b/drivers/theora/video_stream_theora.h index f07acb2935..5484815844 100644 --- a/drivers/theora/video_stream_theora.h +++ b/drivers/theora/video_stream_theora.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* video_stream_theora.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef VIDEO_STREAM_THEORA_H #define VIDEO_STREAM_THEORA_H diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index 8b097ad25e..f0e4511b1d 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -66,7 +66,7 @@ bool DirAccessUnix::file_exists(String p_file) { if (p_file.is_rel_path()) - p_file=current_dir+"/"+p_file; + p_file=current_dir.plus_file(p_file); else p_file=fix_path(p_file); @@ -104,7 +104,7 @@ bool DirAccessUnix::dir_exists(String p_dir) { uint64_t DirAccessUnix::get_modified_time(String p_file) { if (p_file.is_rel_path()) - p_file=current_dir+"/"+p_file; + p_file=current_dir.plus_file(p_file); else p_file=fix_path(p_file); @@ -138,11 +138,9 @@ String DirAccessUnix::get_next() { //typedef struct stat Stat; struct stat flags; - String fname; - if (fname.parse_utf8(entry->d_name)) - fname=entry->d_name; //no utf8, maybe latin? + String fname = fix_unicode_name(entry->d_name); - String f=current_dir+"/"+fname; + String f=current_dir.plus_file(fname); if (stat(f.utf8().get_data(),&flags)==0) { @@ -201,8 +199,17 @@ Error DirAccessUnix::make_dir(String p_dir) { GLOBAL_LOCK_FUNCTION - p_dir=fix_path(p_dir); - + if (p_dir.is_rel_path()) + p_dir=get_current_dir().plus_file(p_dir); + else + p_dir=fix_path(p_dir); +#if 1 + + + bool success=(mkdir(p_dir.utf8().get_data(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)==0); + int err = errno; + +#else char real_current_dir_name[2048]; getcwd(real_current_dir_name,2048); chdir(current_dir.utf8().get_data()); //ascii since this may be unicode or wathever the host os wants @@ -211,7 +218,7 @@ Error DirAccessUnix::make_dir(String p_dir) { int err = errno; chdir(real_current_dir_name); - +#endif if (success) { return OK; }; @@ -314,7 +321,7 @@ size_t DirAccessUnix::get_space_left() { struct statvfs vfs; if (statvfs(current_dir.utf8().get_data(), &vfs) != 0) { - return -1; + return 0; }; return vfs.f_bfree * vfs.f_bsize; diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index 9cba1ed3e0..b2f1aed10f 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -51,7 +51,10 @@ class DirAccessUnix : public DirAccess { String current_dir; bool _cisdir; bool _cishidden; - +protected: + + virtual String fix_unicode_name(const char* p_name) const { return String::utf8(p_name); } + public: virtual bool list_dir_begin(); ///< This starts dir listing diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp index 2111619080..0201a85651 100644 --- a/drivers/unix/packet_peer_udp_posix.cpp +++ b/drivers/unix/packet_peer_udp_posix.cpp @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* packet_peer_udp_posix.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "packet_peer_udp_posix.h" #ifdef UNIX_ENABLED @@ -96,7 +124,6 @@ Error PacketPeerUDPPosix::listen(int p_port, int p_recv_buffer_size){ close(); return ERR_UNAVAILABLE; } - printf("UDP Connection listening on port %i bufsize %i \n", p_port,p_recv_buffer_size); rb.resize(nearest_shift(p_recv_buffer_size)); return OK; } diff --git a/drivers/unix/packet_peer_udp_posix.h b/drivers/unix/packet_peer_udp_posix.h index b14568eb5f..a11282e5d6 100644 --- a/drivers/unix/packet_peer_udp_posix.h +++ b/drivers/unix/packet_peer_udp_posix.h @@ -1,3 +1,31 @@ +/*************************************************************************/ +/* packet_peer_udp_posix.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef PACKET_PEER_UDP_POSIX_H #define PACKET_PEER_UDP_POSIX_H diff --git a/drivers/unix/tcp_server_posix.cpp b/drivers/unix/tcp_server_posix.cpp index 98451957fd..c67bb51334 100644 --- a/drivers/unix/tcp_server_posix.cpp +++ b/drivers/unix/tcp_server_posix.cpp @@ -67,7 +67,6 @@ void TCPServerPosix::make_default() { Error TCPServerPosix::listen(uint16_t p_port,const List<String> *p_accepted_hosts) { - printf("********* listening on port %i\n", p_port); int sockfd; sockfd = socket(AF_INET, SOCK_STREAM, 0); ERR_FAIL_COND_V(sockfd == -1, FAILED); @@ -80,8 +79,7 @@ Error TCPServerPosix::listen(uint16_t p_port,const List<String> *p_accepted_host int reuse=1; if(setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) < 0) { - - printf("REUSEADDR failed!"); + WARN_PRINT("REUSEADDR failed!") } struct sockaddr_in my_addr; @@ -103,14 +101,11 @@ Error TCPServerPosix::listen(uint16_t p_port,const List<String> *p_accepted_host }; if (listen_sockfd != -1) { - - printf("FAILED\n"); stop(); }; listen_sockfd = sockfd; - printf("OK! %i\n", listen_sockfd); return OK; }; @@ -129,7 +124,6 @@ bool TCPServerPosix::is_connection_available() const { ERR_FAIL_COND_V(ret < 0, FAILED); if (ret && (pfd.revents & POLLIN)) { - printf("has connection!\n"); return true; }; @@ -164,7 +158,6 @@ Ref<StreamPeerTCP> TCPServerPosix::take_connection() { void TCPServerPosix::stop() { if (listen_sockfd != -1) { - print_line("CLOSING CONNECTION"); int ret = close(listen_sockfd); ERR_FAIL_COND(ret!=0); }; diff --git a/drivers/vorbis/COPYING b/drivers/vorbis/COPYING index 28de72a970..8f1d18cc2b 100644 --- a/drivers/vorbis/COPYING +++ b/drivers/vorbis/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2002-2008 Xiph.org Foundation +Copyright (c) 2002-2015 Xiph.org Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/drivers/vorbis/barkmel.c b/drivers/vorbis/barkmel.c index 6adb715406..37b6c4c7ba 100644 --- a/drivers/vorbis/barkmel.c +++ b/drivers/vorbis/barkmel.c @@ -11,7 +11,7 @@ ******************************************************************** function: bark scale utility - last mod: $Id: barkmel.c 16037 2009-05-26 21:10:58Z xiphmont $ + last mod: $Id: barkmel.c 19454 2015-03-02 22:39:28Z xiphmont $ ********************************************************************/ diff --git a/drivers/vorbis/block.c b/drivers/vorbis/block.c index eee9abfca7..345c042769 100644 --- a/drivers/vorbis/block.c +++ b/drivers/vorbis/block.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: PCM data vector blocking, windowing and dis/reassembly - last mod: $Id: block.c 17561 2010-10-23 10:34:24Z xiphmont $ + last mod: $Id: block.c 19457 2015-03-03 00:15:29Z giles $ Handle windowing, overlap-add, etc of the PCM vectors. This is made more amusing by Vorbis' current two allowed block sizes. @@ -31,16 +31,6 @@ #include "registry.h" #include "misc.h" -static int ilog2(unsigned int v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - /* pcm accumulator examples (not exhaustive): <-------------- lW ----------------> @@ -184,14 +174,19 @@ static int _vds_shared_init(vorbis_dsp_state *v,vorbis_info *vi,int encp){ private_state *b=NULL; int hs; - if(ci==NULL) return 1; + if(ci==NULL|| + ci->modes<=0|| + ci->blocksizes[0]<64|| + ci->blocksizes[1]<ci->blocksizes[0]){ + return 1; + } hs=ci->halfrate_flag; memset(v,0,sizeof(*v)); b=v->backend_state=_ogg_calloc(1,sizeof(*b)); v->vi=vi; - b->modebits=ilog2(ci->modes); + b->modebits=ov_ilog(ci->modes-1); b->transform[0]=_ogg_calloc(VI_TRANSFORMB,sizeof(*b->transform[0])); b->transform[1]=_ogg_calloc(VI_TRANSFORMB,sizeof(*b->transform[1])); @@ -204,8 +199,14 @@ static int _vds_shared_init(vorbis_dsp_state *v,vorbis_info *vi,int encp){ mdct_init(b->transform[1][0],ci->blocksizes[1]>>hs); /* Vorbis I uses only window type 0 */ - b->window[0]=ilog2(ci->blocksizes[0])-6; - b->window[1]=ilog2(ci->blocksizes[1])-6; + /* note that the correct computation below is technically: + b->window[0]=ov_ilog(ci->blocksizes[0]-1)-6; + b->window[1]=ov_ilog(ci->blocksizes[1]-1)-6; + but since blocksizes are always powers of two, + the below is equivalent. + */ + b->window[0]=ov_ilog(ci->blocksizes[0])-7; + b->window[1]=ov_ilog(ci->blocksizes[1])-7; if(encp){ /* encode/decode differ here */ @@ -771,14 +772,14 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ if(v->lW){ if(v->W){ /* large/large */ - float *w=_vorbis_window_get(b->window[1]-hs); + const float *w=_vorbis_window_get(b->window[1]-hs); float *pcm=v->pcm[j]+prevCenter; float *p=vb->pcm[j]; for(i=0;i<n1;i++) pcm[i]=pcm[i]*w[n1-i-1] + p[i]*w[i]; }else{ /* large/small */ - float *w=_vorbis_window_get(b->window[0]-hs); + const float *w=_vorbis_window_get(b->window[0]-hs); float *pcm=v->pcm[j]+prevCenter+n1/2-n0/2; float *p=vb->pcm[j]; for(i=0;i<n0;i++) @@ -787,7 +788,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ }else{ if(v->W){ /* small/large */ - float *w=_vorbis_window_get(b->window[0]-hs); + const float *w=_vorbis_window_get(b->window[0]-hs); float *pcm=v->pcm[j]+prevCenter; float *p=vb->pcm[j]+n1/2-n0/2; for(i=0;i<n0;i++) @@ -796,7 +797,7 @@ int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ pcm[i]=p[i]; }else{ /* small/small */ - float *w=_vorbis_window_get(b->window[0]-hs); + const float *w=_vorbis_window_get(b->window[0]-hs); float *pcm=v->pcm[j]+prevCenter; float *p=vb->pcm[j]; for(i=0;i<n0;i++) @@ -1035,7 +1036,7 @@ int vorbis_synthesis_lapout(vorbis_dsp_state *v,float ***pcm){ } -float *vorbis_window(vorbis_dsp_state *v,int W){ +const float *vorbis_window(vorbis_dsp_state *v,int W){ vorbis_info *vi=v->vi; codec_setup_info *ci=vi->codec_setup; int hs=ci->halfrate_flag; diff --git a/drivers/vorbis/books/Makefile.am b/drivers/vorbis/books/Makefile.am deleted file mode 100644 index 3697a7177e..0000000000 --- a/drivers/vorbis/books/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -## Process this file with automake to produce Makefile.in - -SUBDIRS = coupled uncoupled floor diff --git a/drivers/vorbis/books/Makefile.in b/drivers/vorbis/books/Makefile.in deleted file mode 100644 index 0d957f0cf6..0000000000 --- a/drivers/vorbis/books/Makefile.in +++ /dev/null @@ -1,514 +0,0 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = lib/books -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEBUG = @DEBUG@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_DOXYGEN = @HAVE_DOXYGEN@ -HTLATEX = @HTLATEX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PDFLATEX = @PDFLATEX@ -PKG_CONFIG = @PKG_CONFIG@ -PROFILE = @PROFILE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -VE_LIB_AGE = @VE_LIB_AGE@ -VE_LIB_CURRENT = @VE_LIB_CURRENT@ -VE_LIB_REVISION = @VE_LIB_REVISION@ -VF_LIB_AGE = @VF_LIB_AGE@ -VF_LIB_CURRENT = @VF_LIB_CURRENT@ -VF_LIB_REVISION = @VF_LIB_REVISION@ -VORBIS_LIBS = @VORBIS_LIBS@ -V_LIB_AGE = @V_LIB_AGE@ -V_LIB_CURRENT = @V_LIB_CURRENT@ -V_LIB_REVISION = @V_LIB_REVISION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pthread_lib = @pthread_lib@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = coupled uncoupled floor -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/books/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/books/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/drivers/vorbis/books/coupled/Makefile.am b/drivers/vorbis/books/coupled/Makefile.am deleted file mode 100644 index 1115201dd0..0000000000 --- a/drivers/vorbis/books/coupled/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = res_books_stereo.h res_books_51.h diff --git a/drivers/vorbis/books/coupled/Makefile.in b/drivers/vorbis/books/coupled/Makefile.in deleted file mode 100644 index ec9d98ead2..0000000000 --- a/drivers/vorbis/books/coupled/Makefile.in +++ /dev/null @@ -1,356 +0,0 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = lib/books/coupled -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEBUG = @DEBUG@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_DOXYGEN = @HAVE_DOXYGEN@ -HTLATEX = @HTLATEX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PDFLATEX = @PDFLATEX@ -PKG_CONFIG = @PKG_CONFIG@ -PROFILE = @PROFILE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -VE_LIB_AGE = @VE_LIB_AGE@ -VE_LIB_CURRENT = @VE_LIB_CURRENT@ -VE_LIB_REVISION = @VE_LIB_REVISION@ -VF_LIB_AGE = @VF_LIB_AGE@ -VF_LIB_CURRENT = @VF_LIB_CURRENT@ -VF_LIB_REVISION = @VF_LIB_REVISION@ -VORBIS_LIBS = @VORBIS_LIBS@ -V_LIB_AGE = @V_LIB_AGE@ -V_LIB_CURRENT = @V_LIB_CURRENT@ -V_LIB_REVISION = @V_LIB_REVISION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pthread_lib = @pthread_lib@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = res_books_stereo.h res_books_51.h -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/books/coupled/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/books/coupled/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/drivers/vorbis/books/coupled/res_books_51.h b/drivers/vorbis/books/coupled/res_books_51.h index 917a95583a..93910ff481 100644 --- a/drivers/vorbis/books/coupled/res_books_51.h +++ b/drivers/vorbis/books/coupled/res_books_51.h @@ -1,3 +1,20 @@ +/******************************************************************** + * * + * 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-2010 * + * by the Xiph.Org Foundation http://www.xiph.org/ * + * * + ******************************************************************** + * + * function: static codebooks for 5.1 surround + * last modified: $Id: res_books_51.h 19057 2014-01-22 12:32:31Z xiphmont $ + * + ********************************************************************/ + static const long _vq_quantlist__44p0_l0_0[] = { 6, 5, @@ -14,7 +31,7 @@ static const long _vq_quantlist__44p0_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p0_l0_0[] = { +static const char _vq_lengthlist__44p0_l0_0[] = { 1, 3, 4, 7, 7, 8, 8, 9, 9, 9,10,10,10, 5, 6, 5, 8, 7, 9, 8, 9, 9,10, 9,11,10, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, 8, 9, 8,10, 9,10, 9,10, 9, @@ -30,7 +47,7 @@ static const long _vq_lengthlist__44p0_l0_0[] = { static const static_codebook _44p0_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p0_l0_0, + (char *)_vq_lengthlist__44p0_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p0_l0_0, 0 @@ -44,14 +61,14 @@ static const long _vq_quantlist__44p0_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p0_l0_1[] = { +static const char _vq_lengthlist__44p0_l0_1[] = { 1, 4, 4, 6, 6, 5, 5, 5, 7, 5, 5, 5, 5, 6, 7, 7, 6, 7, 7, 7, 6, 7, 7, 7, 7, }; static const static_codebook _44p0_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p0_l0_1, + (char *)_vq_lengthlist__44p0_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p0_l0_1, 0 @@ -63,31 +80,31 @@ static const long _vq_quantlist__44p0_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p0_l1_0[] = { +static const char _vq_lengthlist__44p0_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p0_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p0_l1_0, + (char *)_vq_lengthlist__44p0_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p0_l1_0, 0 }; -static const long _huff_lengthlist__44p0_lfe[] = { +static const char _huff_lengthlist__44p0_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p0_lfe = { 2, 4, - (long *)_huff_lengthlist__44p0_lfe, + (char *)_huff_lengthlist__44p0_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p0_long[] = { +static const char _huff_lengthlist__44p0_long[] = { 2, 3, 6, 7,10,14,16, 3, 2, 5, 7,11,14,17, 6, 5, 5, 7,10,12,14, 7, 7, 6, 6, 7, 9,13,10,11, 9, 6, 6, 9,11,15,15,13,10, 9,10,12,18,18,16,14,12,13, @@ -96,7 +113,7 @@ static const long _huff_lengthlist__44p0_long[] = { static const static_codebook _huff_book__44p0_long = { 2, 49, - (long *)_huff_lengthlist__44p0_long, + (char *)_huff_lengthlist__44p0_long, 0, 0, 0, 0, 0, NULL, 0 @@ -108,7 +125,7 @@ static const long _vq_quantlist__44p0_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p1_0[] = { +static const char _vq_lengthlist__44p0_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -129,7 +146,7 @@ static const long _vq_lengthlist__44p0_p1_0[] = { static const static_codebook _44p0_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p1_0, + (char *)_vq_lengthlist__44p0_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p0_p1_0, 0 @@ -141,7 +158,7 @@ static const long _vq_quantlist__44p0_p2_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p2_0[] = { +static const char _vq_lengthlist__44p0_p2_0[] = { 1, 5, 5, 0, 7, 7, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 6, 6, 0,11, 11, 0,12,12, 0,12,12, 0,15,15, 0,11,11, 0,12,12, @@ -162,7 +179,7 @@ static const long _vq_lengthlist__44p0_p2_0[] = { static const static_codebook _44p0_p2_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p2_0, + (char *)_vq_lengthlist__44p0_p2_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p0_p2_0, 0 @@ -174,7 +191,7 @@ static const long _vq_quantlist__44p0_p2_1[] = { 2, }; -static const long _vq_lengthlist__44p0_p2_1[] = { +static const char _vq_lengthlist__44p0_p2_1[] = { 1, 3, 3, 0, 9, 9, 0, 9, 9, 0,10,10, 0, 9, 9, 0, 10,10, 0,10,10, 0, 9, 9, 0,10,10, 0, 7, 7, 0, 7, 7, 0, 6, 6, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 9, @@ -195,7 +212,7 @@ static const long _vq_lengthlist__44p0_p2_1[] = { static const static_codebook _44p0_p2_1 = { 5, 243, - (long *)_vq_lengthlist__44p0_p2_1, + (char *)_vq_lengthlist__44p0_p2_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p0_p2_1, 0 @@ -207,7 +224,7 @@ static const long _vq_quantlist__44p0_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p3_0[] = { +static const char _vq_lengthlist__44p0_p3_0[] = { 1, 6, 6, 7, 8, 8, 7, 8, 8, 7, 9, 9,10,12,11, 9, 8, 8, 7, 9, 9,11,12,12, 9, 9, 9, 6, 7, 7,10,11, 11,10,11,11,10,11,11,13,13,14,12,12,12,11,11,11, @@ -228,7 +245,7 @@ static const long _vq_lengthlist__44p0_p3_0[] = { static const static_codebook _44p0_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p3_0, + (char *)_vq_lengthlist__44p0_p3_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p0_p3_0, 0 @@ -242,7 +259,7 @@ static const long _vq_quantlist__44p0_p3_1[] = { 4, }; -static const long _vq_lengthlist__44p0_p3_1[] = { +static const char _vq_lengthlist__44p0_p3_1[] = { 2, 4, 4, 8, 8,10,12,12,11,11, 9,11,11,12,13,11, 12,12,11,11,11,12,12,12,12,10,13,12,13,13,11,12, 12,13,13,11,12,12,13,13,11,12,13,13,13,11,13,13, @@ -443,7 +460,7 @@ static const long _vq_lengthlist__44p0_p3_1[] = { static const static_codebook _44p0_p3_1 = { 5, 3125, - (long *)_vq_lengthlist__44p0_p3_1, + (char *)_vq_lengthlist__44p0_p3_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p0_p3_1, 0 @@ -457,7 +474,7 @@ static const long _vq_quantlist__44p0_p4_0[] = { 4, }; -static const long _vq_lengthlist__44p0_p4_0[] = { +static const char _vq_lengthlist__44p0_p4_0[] = { 2, 6, 6,14,14, 6, 8, 8,14,14, 7, 7, 7,14,14, 0, 13,13,15,16, 0,13,13,15,15, 7, 8, 8,15,15, 9,10, 10,16,16, 9, 8, 8,14,15, 0,13,13,17,17, 0,13,13, @@ -658,7 +675,7 @@ static const long _vq_lengthlist__44p0_p4_0[] = { static const static_codebook _44p0_p4_0 = { 5, 3125, - (long *)_vq_lengthlist__44p0_p4_0, + (char *)_vq_lengthlist__44p0_p4_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p0_p4_0, 0 @@ -674,13 +691,13 @@ static const long _vq_quantlist__44p0_p4_1[] = { 6, }; -static const long _vq_lengthlist__44p0_p4_1[] = { +static const char _vq_lengthlist__44p0_p4_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p0_p4_1 = { 1, 7, - (long *)_vq_lengthlist__44p0_p4_1, + (char *)_vq_lengthlist__44p0_p4_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p0_p4_1, 0 @@ -692,7 +709,7 @@ static const long _vq_quantlist__44p0_p5_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p5_0[] = { +static const char _vq_lengthlist__44p0_p5_0[] = { 1, 6, 6, 6, 8, 8, 7, 8, 8, 7, 9, 8,10,11,11, 9, 8, 8, 7, 8, 8,11,11,11, 9, 8, 8, 6, 7, 7,10,10, 10,10,10,10,10,10,10,14,13,13,12,11,11,10,10,10, @@ -713,7 +730,7 @@ static const long _vq_lengthlist__44p0_p5_0[] = { static const static_codebook _44p0_p5_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p5_0, + (char *)_vq_lengthlist__44p0_p5_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p0_p5_0, 0 @@ -725,7 +742,7 @@ static const long _vq_quantlist__44p0_p5_1[] = { 2, }; -static const long _vq_lengthlist__44p0_p5_1[] = { +static const char _vq_lengthlist__44p0_p5_1[] = { 2, 7, 7, 7, 8, 8, 7, 7, 7, 7, 8, 8, 8, 8, 9, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 7, 7, 6, 6, 6, 9, 7, 7, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -746,7 +763,7 @@ static const long _vq_lengthlist__44p0_p5_1[] = { static const static_codebook _44p0_p5_1 = { 5, 243, - (long *)_vq_lengthlist__44p0_p5_1, + (char *)_vq_lengthlist__44p0_p5_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p0_p5_1, 0 @@ -758,7 +775,7 @@ static const long _vq_quantlist__44p0_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p0_p6_0[] = { +static const char _vq_lengthlist__44p0_p6_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -779,7 +796,7 @@ static const long _vq_lengthlist__44p0_p6_0[] = { static const static_codebook _44p0_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p0_p6_0, + (char *)_vq_lengthlist__44p0_p6_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p0_p6_0, 0 @@ -813,14 +830,14 @@ static const long _vq_quantlist__44p0_p6_1[] = { 24, }; -static const long _vq_lengthlist__44p0_p6_1[] = { +static const char _vq_lengthlist__44p0_p6_1[] = { 1, 3, 2, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, 11,12,12,12,14,14,14,15,15, }; static const static_codebook _44p0_p6_1 = { 1, 25, - (long *)_vq_lengthlist__44p0_p6_1, + (char *)_vq_lengthlist__44p0_p6_1, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p0_p6_1, 0 @@ -854,20 +871,20 @@ static const long _vq_quantlist__44p0_p6_2[] = { 24, }; -static const long _vq_lengthlist__44p0_p6_2[] = { +static const char _vq_lengthlist__44p0_p6_2[] = { 3, 4, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p0_p6_2 = { 1, 25, - (long *)_vq_lengthlist__44p0_p6_2, + (char *)_vq_lengthlist__44p0_p6_2, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p0_p6_2, 0 }; -static const long _huff_lengthlist__44p0_short[] = { +static const char _huff_lengthlist__44p0_short[] = { 3, 3, 7, 8,10,13,16, 3, 2, 5, 7, 9,13,16, 6, 4, 4, 6,10,14,15, 7, 5, 5, 7,10,13,14, 9, 8, 9, 9, 9,11,13,12,11,12, 9, 7, 8,11,14,12,10, 6, 5, 7, @@ -876,7 +893,7 @@ static const long _huff_lengthlist__44p0_short[] = { static const static_codebook _huff_book__44p0_short = { 2, 49, - (long *)_huff_lengthlist__44p0_short, + (char *)_huff_lengthlist__44p0_short, 0, 0, 0, 0, 0, NULL, 0 @@ -898,7 +915,7 @@ static const long _vq_quantlist__44p1_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p1_l0_0[] = { +static const char _vq_lengthlist__44p1_l0_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 4, 6, 5, 8, 6, 9, 8,10, 9,10,10,11,10, 5, 5, 6, 6, 8, 8, 9, 9,10,10,10,10,11, 7, 8, 8, 9, 8,10, 9,10, 9, @@ -914,7 +931,7 @@ static const long _vq_lengthlist__44p1_l0_0[] = { static const static_codebook _44p1_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p1_l0_0, + (char *)_vq_lengthlist__44p1_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p1_l0_0, 0 @@ -928,14 +945,14 @@ static const long _vq_quantlist__44p1_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p1_l0_1[] = { +static const char _vq_lengthlist__44p1_l0_1[] = { 1, 4, 4, 6, 6, 5, 5, 5, 6, 6, 5, 6, 5, 6, 6, 6, 6, 7, 7, 7, 6, 7, 6, 7, 7, }; static const static_codebook _44p1_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p1_l0_1, + (char *)_vq_lengthlist__44p1_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p1_l0_1, 0 @@ -947,31 +964,31 @@ static const long _vq_quantlist__44p1_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p1_l1_0[] = { +static const char _vq_lengthlist__44p1_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p1_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p1_l1_0, + (char *)_vq_lengthlist__44p1_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p1_l1_0, 0 }; -static const long _huff_lengthlist__44p1_lfe[] = { +static const char _huff_lengthlist__44p1_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p1_lfe = { 2, 4, - (long *)_huff_lengthlist__44p1_lfe, + (char *)_huff_lengthlist__44p1_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p1_long[] = { +static const char _huff_lengthlist__44p1_long[] = { 3, 3, 7, 7, 9,13,16, 3, 2, 4, 6,10,13,17, 7, 4, 4, 6, 9,12,14, 7, 6, 6, 5, 7, 9,12,10,10, 9, 6, 6, 9,12,14,14,13, 9, 8,10,11,18,18,15,13,11,10, @@ -980,7 +997,7 @@ static const long _huff_lengthlist__44p1_long[] = { static const static_codebook _huff_book__44p1_long = { 2, 49, - (long *)_huff_lengthlist__44p1_long, + (char *)_huff_lengthlist__44p1_long, 0, 0, 0, 0, 0, NULL, 0 @@ -992,7 +1009,7 @@ static const long _vq_quantlist__44p1_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p1_0[] = { +static const char _vq_lengthlist__44p1_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1013,7 +1030,7 @@ static const long _vq_lengthlist__44p1_p1_0[] = { static const static_codebook _44p1_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p1_0, + (char *)_vq_lengthlist__44p1_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p1_p1_0, 0 @@ -1025,7 +1042,7 @@ static const long _vq_quantlist__44p1_p2_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p2_0[] = { +static const char _vq_lengthlist__44p1_p2_0[] = { 1, 4, 4, 0, 7, 7, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 6, 6, 0,11, 11, 0,11,11, 0,12,12, 0,14,14, 0,11,11, 0,12,12, @@ -1046,7 +1063,7 @@ static const long _vq_lengthlist__44p1_p2_0[] = { static const static_codebook _44p1_p2_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p2_0, + (char *)_vq_lengthlist__44p1_p2_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p1_p2_0, 0 @@ -1058,7 +1075,7 @@ static const long _vq_quantlist__44p1_p2_1[] = { 2, }; -static const long _vq_lengthlist__44p1_p2_1[] = { +static const char _vq_lengthlist__44p1_p2_1[] = { 1, 3, 3, 0, 8, 8, 0, 8, 8, 0,10,10, 0, 9, 9, 0, 10,10, 0,10,10, 0, 9, 9, 0,10,10, 0, 7, 7, 0, 7, 7, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 9, 9, @@ -1079,7 +1096,7 @@ static const long _vq_lengthlist__44p1_p2_1[] = { static const static_codebook _44p1_p2_1 = { 5, 243, - (long *)_vq_lengthlist__44p1_p2_1, + (char *)_vq_lengthlist__44p1_p2_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p1_p2_1, 0 @@ -1091,7 +1108,7 @@ static const long _vq_quantlist__44p1_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p3_0[] = { +static const char _vq_lengthlist__44p1_p3_0[] = { 1, 6, 6, 6, 7, 7, 7, 8, 8, 7, 8, 8,10,11,11, 9, 8, 8, 7, 9, 9,11,12,12, 9, 8, 8, 6, 7, 7, 9,11, 11,10,11,11,10,11,11,13,13,13,11,12,12,10,11,11, @@ -1112,7 +1129,7 @@ static const long _vq_lengthlist__44p1_p3_0[] = { static const static_codebook _44p1_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p3_0, + (char *)_vq_lengthlist__44p1_p3_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p1_p3_0, 0 @@ -1126,7 +1143,7 @@ static const long _vq_quantlist__44p1_p3_1[] = { 4, }; -static const long _vq_lengthlist__44p1_p3_1[] = { +static const char _vq_lengthlist__44p1_p3_1[] = { 2, 3, 4, 7, 7,10,12,12,12,12,10,11,11,13,13,11, 12,12,11,11,12,12,12,12,12,11,13,13,13,13,12,12, 12,13,14,12,13,13,13,13,12,13,13,13,13,12,13,13, @@ -1327,7 +1344,7 @@ static const long _vq_lengthlist__44p1_p3_1[] = { static const static_codebook _44p1_p3_1 = { 5, 3125, - (long *)_vq_lengthlist__44p1_p3_1, + (char *)_vq_lengthlist__44p1_p3_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p1_p3_1, 0 @@ -1341,7 +1358,7 @@ static const long _vq_quantlist__44p1_p4_0[] = { 4, }; -static const long _vq_lengthlist__44p1_p4_0[] = { +static const char _vq_lengthlist__44p1_p4_0[] = { 2, 6, 6,14,14, 6, 7, 7,14,14, 7, 7, 7,14,14, 0, 13,13,16,16, 0,13,13,15,14, 7, 8, 8,15,15, 9,10, 10,16,16, 9, 8, 8,15,15, 0,13,13,17,16, 0,13,13, @@ -1542,7 +1559,7 @@ static const long _vq_lengthlist__44p1_p4_0[] = { static const static_codebook _44p1_p4_0 = { 5, 3125, - (long *)_vq_lengthlist__44p1_p4_0, + (char *)_vq_lengthlist__44p1_p4_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p1_p4_0, 0 @@ -1558,13 +1575,13 @@ static const long _vq_quantlist__44p1_p4_1[] = { 6, }; -static const long _vq_lengthlist__44p1_p4_1[] = { +static const char _vq_lengthlist__44p1_p4_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p1_p4_1 = { 1, 7, - (long *)_vq_lengthlist__44p1_p4_1, + (char *)_vq_lengthlist__44p1_p4_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p1_p4_1, 0 @@ -1576,7 +1593,7 @@ static const long _vq_quantlist__44p1_p5_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p5_0[] = { +static const char _vq_lengthlist__44p1_p5_0[] = { 1, 6, 6, 7, 8, 8, 7, 8, 8, 7, 9, 8,10,11,11, 9, 8, 8, 7, 8, 8,11,11,11, 9, 8, 8, 6, 7, 7,10,10, 10,10,10,10,10,10,10,14,13,13,12,11,11,10,10,10, @@ -1597,7 +1614,7 @@ static const long _vq_lengthlist__44p1_p5_0[] = { static const static_codebook _44p1_p5_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p5_0, + (char *)_vq_lengthlist__44p1_p5_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p1_p5_0, 0 @@ -1609,7 +1626,7 @@ static const long _vq_quantlist__44p1_p5_1[] = { 2, }; -static const long _vq_lengthlist__44p1_p5_1[] = { +static const char _vq_lengthlist__44p1_p5_1[] = { 2, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 8, 8, 8, 7, 7, 8, 8, 8, 9, 8, 8, 9, 7, 7, 6, 6, 6, 9, 8, 7, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -1630,7 +1647,7 @@ static const long _vq_lengthlist__44p1_p5_1[] = { static const static_codebook _44p1_p5_1 = { 5, 243, - (long *)_vq_lengthlist__44p1_p5_1, + (char *)_vq_lengthlist__44p1_p5_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p1_p5_1, 0 @@ -1642,7 +1659,7 @@ static const long _vq_quantlist__44p1_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p1_p6_0[] = { +static const char _vq_lengthlist__44p1_p6_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -1663,7 +1680,7 @@ static const long _vq_lengthlist__44p1_p6_0[] = { static const static_codebook _44p1_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p1_p6_0, + (char *)_vq_lengthlist__44p1_p6_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p1_p6_0, 0 @@ -1697,14 +1714,14 @@ static const long _vq_quantlist__44p1_p6_1[] = { 24, }; -static const long _vq_lengthlist__44p1_p6_1[] = { +static const char _vq_lengthlist__44p1_p6_1[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,13,14,16,16,16,16, }; static const static_codebook _44p1_p6_1 = { 1, 25, - (long *)_vq_lengthlist__44p1_p6_1, + (char *)_vq_lengthlist__44p1_p6_1, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p1_p6_1, 0 @@ -1738,20 +1755,20 @@ static const long _vq_quantlist__44p1_p6_2[] = { 24, }; -static const long _vq_lengthlist__44p1_p6_2[] = { +static const char _vq_lengthlist__44p1_p6_2[] = { 3, 4, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p1_p6_2 = { 1, 25, - (long *)_vq_lengthlist__44p1_p6_2, + (char *)_vq_lengthlist__44p1_p6_2, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p1_p6_2, 0 }; -static const long _huff_lengthlist__44p1_short[] = { +static const char _huff_lengthlist__44p1_short[] = { 4, 5, 7, 8,10,13,14, 4, 2, 4, 6, 8,11,12, 7, 4, 3, 5, 8,12,14, 8, 5, 4, 4, 8,12,12, 9, 7, 7, 7, 9,10,11,13,11,11, 9, 7, 8,10,13,11,10, 6, 5, 7, @@ -1760,7 +1777,7 @@ static const long _huff_lengthlist__44p1_short[] = { static const static_codebook _huff_book__44p1_short = { 2, 49, - (long *)_huff_lengthlist__44p1_short, + (char *)_huff_lengthlist__44p1_short, 0, 0, 0, 0, 0, NULL, 0 @@ -1782,7 +1799,7 @@ static const long _vq_quantlist__44p2_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p2_l0_0[] = { +static const char _vq_lengthlist__44p2_l0_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9,10,10,11,11, 4, 6, 5, 8, 7, 9, 8,10, 9,11,10,11,11, 4, 5, 6, 7, 8, 8, 9, 9,10,10,10,10,11, 8, 9, 8,10, 8,10, 9,11,10, @@ -1798,7 +1815,7 @@ static const long _vq_lengthlist__44p2_l0_0[] = { static const static_codebook _44p2_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p2_l0_0, + (char *)_vq_lengthlist__44p2_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p2_l0_0, 0 @@ -1812,14 +1829,14 @@ static const long _vq_quantlist__44p2_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p2_l0_1[] = { +static const char _vq_lengthlist__44p2_l0_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 5, 6, 6, 6, 5, 6, 5, 6, 6, }; static const static_codebook _44p2_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p2_l0_1, + (char *)_vq_lengthlist__44p2_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_l0_1, 0 @@ -1831,31 +1848,31 @@ static const long _vq_quantlist__44p2_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p2_l1_0[] = { +static const char _vq_lengthlist__44p2_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p2_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p2_l1_0, + (char *)_vq_lengthlist__44p2_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p2_l1_0, 0 }; -static const long _huff_lengthlist__44p2_lfe[] = { +static const char _huff_lengthlist__44p2_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p2_lfe = { 2, 4, - (long *)_huff_lengthlist__44p2_lfe, + (char *)_huff_lengthlist__44p2_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p2_long[] = { +static const char _huff_lengthlist__44p2_long[] = { 3, 4, 9, 8, 8,10,13,16, 4, 2, 9, 5, 7,10,14,18, 9, 7, 6, 5, 7, 9,12,16, 7, 5, 5, 3, 5, 8,11,13, 8, 7, 7, 5, 5, 7, 9,11,10,10, 9, 8, 6, 6, 8,10, @@ -1864,7 +1881,7 @@ static const long _huff_lengthlist__44p2_long[] = { static const static_codebook _huff_book__44p2_long = { 2, 64, - (long *)_huff_lengthlist__44p2_long, + (char *)_huff_lengthlist__44p2_long, 0, 0, 0, 0, 0, NULL, 0 @@ -1876,7 +1893,7 @@ static const long _vq_quantlist__44p2_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p1_0[] = { +static const char _vq_lengthlist__44p2_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1897,7 +1914,7 @@ static const long _vq_lengthlist__44p2_p1_0[] = { static const static_codebook _44p2_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p1_0, + (char *)_vq_lengthlist__44p2_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p2_p1_0, 0 @@ -1911,7 +1928,7 @@ static const long _vq_quantlist__44p2_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p2_p2_0[] = { +static const char _vq_lengthlist__44p2_p2_0[] = { 1, 4, 4, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 10,10, 0, 0, 0, 0, 0, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,11,11, 0, 0, 0, 0, 0, @@ -2112,7 +2129,7 @@ static const long _vq_lengthlist__44p2_p2_0[] = { static const static_codebook _44p2_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p2_p2_0, + (char *)_vq_lengthlist__44p2_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_p2_0, 0 @@ -2124,7 +2141,7 @@ static const long _vq_quantlist__44p2_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p3_0[] = { +static const char _vq_lengthlist__44p2_p3_0[] = { 1, 5, 5, 6, 7, 7, 0, 8, 8, 6, 9, 9, 8,11,11, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 5, 7, 7, 7,10, 10, 0,12,12, 8,11,11, 9,12,12, 0,11,12, 0,12,12, @@ -2145,7 +2162,7 @@ static const long _vq_lengthlist__44p2_p3_0[] = { static const static_codebook _44p2_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p3_0, + (char *)_vq_lengthlist__44p2_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p2_p3_0, 0 @@ -2157,7 +2174,7 @@ static const long _vq_quantlist__44p2_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p2_p3_1[] = { +static const char _vq_lengthlist__44p2_p3_1[] = { 2, 3, 3, 0, 8, 8, 0, 8, 8, 0, 9, 9, 0, 9, 9, 0, 9, 9, 0, 9, 9, 0, 9, 9, 0, 8, 8, 0, 6, 6, 0, 7, 7, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, @@ -2178,7 +2195,7 @@ static const long _vq_lengthlist__44p2_p3_1[] = { static const static_codebook _44p2_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p2_p3_1, + (char *)_vq_lengthlist__44p2_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p2_p3_1, 0 @@ -2190,7 +2207,7 @@ static const long _vq_quantlist__44p2_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p4_0[] = { +static const char _vq_lengthlist__44p2_p4_0[] = { 1, 6, 6, 6, 7, 7, 7, 8, 8, 7, 8, 8,10,11,11, 9, 8, 8, 7, 8, 8,11,11,11, 9, 8, 8, 6, 7, 7, 9,11, 11, 9,11,11,10,11,11,12,13,13,11,12,12,10,11,11, @@ -2211,7 +2228,7 @@ static const long _vq_lengthlist__44p2_p4_0[] = { static const static_codebook _44p2_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p4_0, + (char *)_vq_lengthlist__44p2_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p2_p4_0, 0 @@ -2225,7 +2242,7 @@ static const long _vq_quantlist__44p2_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p2_p4_1[] = { +static const char _vq_lengthlist__44p2_p4_1[] = { 3, 4, 4, 8, 8,11, 9, 9,12,12,11,10,10,12,12,12, 10,10,11,11,12,12,12,12,12,12,11,11,13,13,12,12, 12,13,13,12,10,10,12,12,12,11,11,13,13,12,13,13, @@ -2426,7 +2443,7 @@ static const long _vq_lengthlist__44p2_p4_1[] = { static const static_codebook _44p2_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p2_p4_1, + (char *)_vq_lengthlist__44p2_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_p4_1, 0 @@ -2440,7 +2457,7 @@ static const long _vq_quantlist__44p2_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p2_p5_0[] = { +static const char _vq_lengthlist__44p2_p5_0[] = { 2, 6, 6,14,14, 6, 7, 7,14,14, 7, 7, 7,15,15, 0, 13,13,16,16, 0,13,13,15,15, 7, 8, 8,15,15, 9,10, 10,17,16, 9, 8, 8,15,15, 0,13,13,18,17, 0,13,13, @@ -2641,7 +2658,7 @@ static const long _vq_lengthlist__44p2_p5_0[] = { static const static_codebook _44p2_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p2_p5_0, + (char *)_vq_lengthlist__44p2_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p2_p5_0, 0 @@ -2657,13 +2674,13 @@ static const long _vq_quantlist__44p2_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p2_p5_1[] = { +static const char _vq_lengthlist__44p2_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p2_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p2_p5_1, + (char *)_vq_lengthlist__44p2_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p2_p5_1, 0 @@ -2675,7 +2692,7 @@ static const long _vq_quantlist__44p2_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p6_0[] = { +static const char _vq_lengthlist__44p2_p6_0[] = { 1, 7, 7, 7, 8, 8, 7, 8, 8, 7, 9, 9,10,11,11, 9, 8, 8, 7, 8, 9,11,11,11, 9, 8, 8, 6, 7, 7,10,10, 10,10,10,10,10,10,10,14,14,14,12,11,11,10,11,11, @@ -2696,7 +2713,7 @@ static const long _vq_lengthlist__44p2_p6_0[] = { static const static_codebook _44p2_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p6_0, + (char *)_vq_lengthlist__44p2_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p2_p6_0, 0 @@ -2708,7 +2725,7 @@ static const long _vq_quantlist__44p2_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p2_p6_1[] = { +static const char _vq_lengthlist__44p2_p6_1[] = { 2, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 8, 8, 6, 7, 7, 9, 8, 8, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -2729,7 +2746,7 @@ static const long _vq_lengthlist__44p2_p6_1[] = { static const static_codebook _44p2_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p2_p6_1, + (char *)_vq_lengthlist__44p2_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p2_p6_1, 0 @@ -2741,7 +2758,7 @@ static const long _vq_quantlist__44p2_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p2_p7_0[] = { +static const char _vq_lengthlist__44p2_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2762,7 +2779,7 @@ static const long _vq_lengthlist__44p2_p7_0[] = { static const static_codebook _44p2_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p2_p7_0, + (char *)_vq_lengthlist__44p2_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p2_p7_0, 0 @@ -2774,7 +2791,7 @@ static const long _vq_quantlist__44p2_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p2_p7_1[] = { +static const char _vq_lengthlist__44p2_p7_1[] = { 1, 9, 9, 6, 9, 9, 5, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -2795,7 +2812,7 @@ static const long _vq_lengthlist__44p2_p7_1[] = { static const static_codebook _44p2_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p2_p7_1, + (char *)_vq_lengthlist__44p2_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p2_p7_1, 0 @@ -2829,14 +2846,14 @@ static const long _vq_quantlist__44p2_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p2_p7_2[] = { +static const char _vq_lengthlist__44p2_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p2_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p2_p7_2, + (char *)_vq_lengthlist__44p2_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p2_p7_2, 0 @@ -2870,20 +2887,20 @@ static const long _vq_quantlist__44p2_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p2_p7_3[] = { +static const char _vq_lengthlist__44p2_p7_3[] = { 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p2_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p2_p7_3, + (char *)_vq_lengthlist__44p2_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p2_p7_3, 0 }; -static const long _huff_lengthlist__44p2_short[] = { +static const char _huff_lengthlist__44p2_short[] = { 4, 4,12, 9, 8,12,15,17, 4, 2,11, 6, 5, 9,13,15, 11, 7, 8, 7, 7,10,14,13, 8, 5, 7, 5, 5, 8,12,12, 8, 4, 7, 4, 3, 6,11,12,11, 8, 9, 7, 6, 8,11,12, @@ -2892,7 +2909,7 @@ static const long _huff_lengthlist__44p2_short[] = { static const static_codebook _huff_book__44p2_short = { 2, 64, - (long *)_huff_lengthlist__44p2_short, + (char *)_huff_lengthlist__44p2_short, 0, 0, 0, 0, 0, NULL, 0 @@ -2914,7 +2931,7 @@ static const long _vq_quantlist__44p3_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p3_l0_0[] = { +static const char _vq_lengthlist__44p3_l0_0[] = { 1, 4, 4, 8, 8, 8, 8, 9, 9,10,10,10,10, 4, 6, 5, 8, 7, 9, 9, 9, 9,10, 9,11, 9, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9,10, 9,10, 8, 9, 8, 9, 8,10, 9,11, 9, @@ -2930,7 +2947,7 @@ static const long _vq_lengthlist__44p3_l0_0[] = { static const static_codebook _44p3_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p3_l0_0, + (char *)_vq_lengthlist__44p3_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p3_l0_0, 0 @@ -2944,14 +2961,14 @@ static const long _vq_quantlist__44p3_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p3_l0_1[] = { +static const char _vq_lengthlist__44p3_l0_1[] = { 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, }; static const static_codebook _44p3_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p3_l0_1, + (char *)_vq_lengthlist__44p3_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_l0_1, 0 @@ -2963,31 +2980,31 @@ static const long _vq_quantlist__44p3_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p3_l1_0[] = { +static const char _vq_lengthlist__44p3_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p3_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p3_l1_0, + (char *)_vq_lengthlist__44p3_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p3_l1_0, 0 }; -static const long _huff_lengthlist__44p3_lfe[] = { +static const char _huff_lengthlist__44p3_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p3_lfe = { 2, 4, - (long *)_huff_lengthlist__44p3_lfe, + (char *)_huff_lengthlist__44p3_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p3_long[] = { +static const char _huff_lengthlist__44p3_long[] = { 3, 4,13, 9, 9,12,15,17, 4, 2,18, 5, 7,10,14,18, 11, 8, 6, 5, 6, 8,11,14, 8, 5, 5, 3, 5, 8,11,13, 9, 6, 7, 5, 5, 7, 9,10,11,10, 9, 8, 6, 6, 8,10, @@ -2996,7 +3013,7 @@ static const long _huff_lengthlist__44p3_long[] = { static const static_codebook _huff_book__44p3_long = { 2, 64, - (long *)_huff_lengthlist__44p3_long, + (char *)_huff_lengthlist__44p3_long, 0, 0, 0, 0, 0, NULL, 0 @@ -3008,7 +3025,7 @@ static const long _vq_quantlist__44p3_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p1_0[] = { +static const char _vq_lengthlist__44p3_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3029,7 +3046,7 @@ static const long _vq_lengthlist__44p3_p1_0[] = { static const static_codebook _44p3_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p1_0, + (char *)_vq_lengthlist__44p3_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p3_p1_0, 0 @@ -3043,7 +3060,7 @@ static const long _vq_quantlist__44p3_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p3_p2_0[] = { +static const char _vq_lengthlist__44p3_p2_0[] = { 3, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 11,11, 0, 0, 0, 0, 0, 0, 0, 0,10, 9, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,10,11, 0, 0, 0, 0, 0, @@ -3244,7 +3261,7 @@ static const long _vq_lengthlist__44p3_p2_0[] = { static const static_codebook _44p3_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p3_p2_0, + (char *)_vq_lengthlist__44p3_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_p2_0, 0 @@ -3256,7 +3273,7 @@ static const long _vq_quantlist__44p3_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p3_0[] = { +static const char _vq_lengthlist__44p3_p3_0[] = { 1, 5, 5, 5, 8, 8, 0, 8, 8, 6, 9, 9, 8,10,10, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 4, 7, 7, 6,10, 10, 0,12,12, 7,11,11, 9,12,12, 0,12,12, 0,13,13, @@ -3277,7 +3294,7 @@ static const long _vq_lengthlist__44p3_p3_0[] = { static const static_codebook _44p3_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p3_0, + (char *)_vq_lengthlist__44p3_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p3_p3_0, 0 @@ -3289,7 +3306,7 @@ static const long _vq_quantlist__44p3_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p3_p3_1[] = { +static const char _vq_lengthlist__44p3_p3_1[] = { 3, 4, 4, 0, 8, 8, 0, 8, 8, 0, 9, 9, 0,10,10, 0, 8, 8, 0, 9, 9, 0,10,10, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, @@ -3310,7 +3327,7 @@ static const long _vq_lengthlist__44p3_p3_1[] = { static const static_codebook _44p3_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p3_p3_1, + (char *)_vq_lengthlist__44p3_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p3_p3_1, 0 @@ -3322,7 +3339,7 @@ static const long _vq_quantlist__44p3_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p4_0[] = { +static const char _vq_lengthlist__44p3_p4_0[] = { 1, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8,10,11,11, 9, 8, 8, 8, 8, 8,11,11,11,10, 8, 8, 5, 7, 7, 9,11, 11,10,11,11,10,11,11,12,13,14,11,12,12,10,11,11, @@ -3343,7 +3360,7 @@ static const long _vq_lengthlist__44p3_p4_0[] = { static const static_codebook _44p3_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p4_0, + (char *)_vq_lengthlist__44p3_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p3_p4_0, 0 @@ -3357,7 +3374,7 @@ static const long _vq_quantlist__44p3_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p3_p4_1[] = { +static const char _vq_lengthlist__44p3_p4_1[] = { 3, 4, 5, 8, 8,12,10,10,12,12,12,10,10,12,12,13, 11,11,12,12,13,12,12,12,12,13,10,10,13,13,13,13, 13,13,13,13,10,10,13,13,13,11,11,13,13,14,13,13, @@ -3558,7 +3575,7 @@ static const long _vq_lengthlist__44p3_p4_1[] = { static const static_codebook _44p3_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p3_p4_1, + (char *)_vq_lengthlist__44p3_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_p4_1, 0 @@ -3572,7 +3589,7 @@ static const long _vq_quantlist__44p3_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p3_p5_0[] = { +static const char _vq_lengthlist__44p3_p5_0[] = { 2, 6, 6,14,14, 6, 7, 7,14,14, 7, 7, 7,15,15, 0, 12,12,15,15, 0,13,13,15,15, 7, 8, 8,15,15,10,10, 10,16,16, 9, 8, 8,15,15, 0,13,13,18,17, 0,13,13, @@ -3773,7 +3790,7 @@ static const long _vq_lengthlist__44p3_p5_0[] = { static const static_codebook _44p3_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p3_p5_0, + (char *)_vq_lengthlist__44p3_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p3_p5_0, 0 @@ -3789,13 +3806,13 @@ static const long _vq_quantlist__44p3_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p3_p5_1[] = { +static const char _vq_lengthlist__44p3_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p3_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p3_p5_1, + (char *)_vq_lengthlist__44p3_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p3_p5_1, 0 @@ -3807,7 +3824,7 @@ static const long _vq_quantlist__44p3_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p6_0[] = { +static const char _vq_lengthlist__44p3_p6_0[] = { 1, 6, 6, 7, 7, 7, 7, 8, 8, 7, 9, 9,11,11,11, 9, 8, 8, 8, 9, 9,12,11,11, 9, 8, 8, 6, 7, 7,10,11, 10,10,10,10,11,11,10,14,13,14,12,11,11,11,11,11, @@ -3828,7 +3845,7 @@ static const long _vq_lengthlist__44p3_p6_0[] = { static const static_codebook _44p3_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p6_0, + (char *)_vq_lengthlist__44p3_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p3_p6_0, 0 @@ -3840,7 +3857,7 @@ static const long _vq_quantlist__44p3_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p3_p6_1[] = { +static const char _vq_lengthlist__44p3_p6_1[] = { 2, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 7, 7, 8, 8, 8, 9, 9, 9, 9, 7, 8, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8,10, 9, 9,10, 8, 8,10, 8, 8, @@ -3861,7 +3878,7 @@ static const long _vq_lengthlist__44p3_p6_1[] = { static const static_codebook _44p3_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p3_p6_1, + (char *)_vq_lengthlist__44p3_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p3_p6_1, 0 @@ -3873,7 +3890,7 @@ static const long _vq_quantlist__44p3_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p3_p7_0[] = { +static const char _vq_lengthlist__44p3_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -3894,7 +3911,7 @@ static const long _vq_lengthlist__44p3_p7_0[] = { static const static_codebook _44p3_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p3_p7_0, + (char *)_vq_lengthlist__44p3_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p3_p7_0, 0 @@ -3906,7 +3923,7 @@ static const long _vq_quantlist__44p3_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p3_p7_1[] = { +static const char _vq_lengthlist__44p3_p7_1[] = { 1, 9, 9, 6, 9, 9, 5, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -3927,7 +3944,7 @@ static const long _vq_lengthlist__44p3_p7_1[] = { static const static_codebook _44p3_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p3_p7_1, + (char *)_vq_lengthlist__44p3_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p3_p7_1, 0 @@ -3961,14 +3978,14 @@ static const long _vq_quantlist__44p3_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p3_p7_2[] = { +static const char _vq_lengthlist__44p3_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p3_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p3_p7_2, + (char *)_vq_lengthlist__44p3_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p3_p7_2, 0 @@ -4002,20 +4019,20 @@ static const long _vq_quantlist__44p3_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p3_p7_3[] = { +static const char _vq_lengthlist__44p3_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p3_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p3_p7_3, + (char *)_vq_lengthlist__44p3_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p3_p7_3, 0 }; -static const long _huff_lengthlist__44p3_short[] = { +static const char _huff_lengthlist__44p3_short[] = { 4, 5,16, 9, 9,12,17,18, 4, 2,18, 6, 5, 9,13,15, 10, 7, 7, 6, 7, 9,13,13, 8, 5, 6, 5, 5, 7,11,12, 8, 4, 7, 4, 3, 6,10,12,11, 8, 9, 7, 6, 8,11,12, @@ -4024,7 +4041,7 @@ static const long _huff_lengthlist__44p3_short[] = { static const static_codebook _huff_book__44p3_short = { 2, 64, - (long *)_huff_lengthlist__44p3_short, + (char *)_huff_lengthlist__44p3_short, 0, 0, 0, 0, 0, NULL, 0 @@ -4046,7 +4063,7 @@ static const long _vq_quantlist__44p4_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p4_l0_0[] = { +static const char _vq_lengthlist__44p4_l0_0[] = { 1, 4, 4, 8, 8, 9, 8, 9, 9,10,10,10,10, 4, 6, 5, 8, 7, 9, 9, 9, 9,10, 9,10,10, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9,10, 9,10, 8, 9, 8, 9, 8,10, 9,11, 9, @@ -4062,7 +4079,7 @@ static const long _vq_lengthlist__44p4_l0_0[] = { static const static_codebook _44p4_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p4_l0_0, + (char *)_vq_lengthlist__44p4_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p4_l0_0, 0 @@ -4076,14 +4093,14 @@ static const long _vq_quantlist__44p4_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p4_l0_1[] = { +static const char _vq_lengthlist__44p4_l0_1[] = { 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, }; static const static_codebook _44p4_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p4_l0_1, + (char *)_vq_lengthlist__44p4_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_l0_1, 0 @@ -4095,31 +4112,31 @@ static const long _vq_quantlist__44p4_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p4_l1_0[] = { +static const char _vq_lengthlist__44p4_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p4_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p4_l1_0, + (char *)_vq_lengthlist__44p4_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p4_l1_0, 0 }; -static const long _huff_lengthlist__44p4_lfe[] = { +static const char _huff_lengthlist__44p4_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p4_lfe = { 2, 4, - (long *)_huff_lengthlist__44p4_lfe, + (char *)_huff_lengthlist__44p4_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p4_long[] = { +static const char _huff_lengthlist__44p4_long[] = { 3, 5,13, 9, 9,12,16,18, 4, 2,20, 6, 7,10,15,20, 10, 7, 5, 5, 6, 8,10,13, 8, 5, 5, 3, 5, 7,10,11, 9, 7, 6, 5, 5, 7, 9, 9,11,10, 8, 7, 6, 6, 8, 8, @@ -4128,7 +4145,7 @@ static const long _huff_lengthlist__44p4_long[] = { static const static_codebook _huff_book__44p4_long = { 2, 64, - (long *)_huff_lengthlist__44p4_long, + (char *)_huff_lengthlist__44p4_long, 0, 0, 0, 0, 0, NULL, 0 @@ -4140,7 +4157,7 @@ static const long _vq_quantlist__44p4_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p1_0[] = { +static const char _vq_lengthlist__44p4_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4161,7 +4178,7 @@ static const long _vq_lengthlist__44p4_p1_0[] = { static const static_codebook _44p4_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p1_0, + (char *)_vq_lengthlist__44p4_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p4_p1_0, 0 @@ -4175,7 +4192,7 @@ static const long _vq_quantlist__44p4_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p4_p2_0[] = { +static const char _vq_lengthlist__44p4_p2_0[] = { 3, 9, 9, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 12,12, 0, 0, 0, 0, 0, 0, 0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 0, 0, 0,11,11, 0, 0, 0, 0, 0, @@ -4376,7 +4393,7 @@ static const long _vq_lengthlist__44p4_p2_0[] = { static const static_codebook _44p4_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p4_p2_0, + (char *)_vq_lengthlist__44p4_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_p2_0, 0 @@ -4388,7 +4405,7 @@ static const long _vq_quantlist__44p4_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p3_0[] = { +static const char _vq_lengthlist__44p4_p3_0[] = { 1, 6, 6, 5, 7, 8, 0, 8, 8, 6, 9, 9, 7,10,10, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 4, 7, 7, 6,10, 10, 0,12,12, 7,11,11, 8,12,12, 0,12,12, 0,13,12, @@ -4409,7 +4426,7 @@ static const long _vq_lengthlist__44p4_p3_0[] = { static const static_codebook _44p4_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p3_0, + (char *)_vq_lengthlist__44p4_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p4_p3_0, 0 @@ -4421,7 +4438,7 @@ static const long _vq_quantlist__44p4_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p4_p3_1[] = { +static const char _vq_lengthlist__44p4_p3_1[] = { 3, 5, 5, 0, 8, 8, 0, 8, 8, 0, 9, 9, 0,10,10, 0, 8, 8, 0, 8, 8, 0,10,10, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 8, 0, 8, 8, 0, 8, 8, @@ -4442,7 +4459,7 @@ static const long _vq_lengthlist__44p4_p3_1[] = { static const static_codebook _44p4_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p4_p3_1, + (char *)_vq_lengthlist__44p4_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p4_p3_1, 0 @@ -4454,7 +4471,7 @@ static const long _vq_quantlist__44p4_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p4_0[] = { +static const char _vq_lengthlist__44p4_p4_0[] = { 1, 6, 6, 6, 7, 7, 7, 8, 8, 7, 8, 8,10,11,11, 9, 8, 8, 8, 8, 8,11,11,12, 9, 8, 8, 5, 7, 7, 9,11, 11,10,11,11,10,11,11,12,14,14,11,12,12,10,12,12, @@ -4475,7 +4492,7 @@ static const long _vq_lengthlist__44p4_p4_0[] = { static const static_codebook _44p4_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p4_0, + (char *)_vq_lengthlist__44p4_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p4_p4_0, 0 @@ -4489,7 +4506,7 @@ static const long _vq_quantlist__44p4_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p4_p4_1[] = { +static const char _vq_lengthlist__44p4_p4_1[] = { 4, 5, 5, 9, 9,12, 9, 9,12,12,12,10,10,13,13,13, 11,11,12,12,13,13,13,12,12,13,10,10,13,13,13,13, 13,13,13,13,10,10,13,12,13,11,11,13,13,13,14,14, @@ -4690,7 +4707,7 @@ static const long _vq_lengthlist__44p4_p4_1[] = { static const static_codebook _44p4_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p4_p4_1, + (char *)_vq_lengthlist__44p4_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_p4_1, 0 @@ -4704,7 +4721,7 @@ static const long _vq_quantlist__44p4_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p4_p5_0[] = { +static const char _vq_lengthlist__44p4_p5_0[] = { 1, 7, 6,15,15, 7, 8, 8,15,15, 8, 8, 8,15,15, 0, 13,13,16,16, 0,14,14,16,16, 7, 9, 9,16,16,10,11, 11,17,17,10, 8, 8,15,16, 0,14,14,18,18, 0,14,14, @@ -4905,7 +4922,7 @@ static const long _vq_lengthlist__44p4_p5_0[] = { static const static_codebook _44p4_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p4_p5_0, + (char *)_vq_lengthlist__44p4_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p4_p5_0, 0 @@ -4921,13 +4938,13 @@ static const long _vq_quantlist__44p4_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p4_p5_1[] = { +static const char _vq_lengthlist__44p4_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p4_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p4_p5_1, + (char *)_vq_lengthlist__44p4_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p4_p5_1, 0 @@ -4939,7 +4956,7 @@ static const long _vq_quantlist__44p4_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p6_0[] = { +static const char _vq_lengthlist__44p4_p6_0[] = { 1, 7, 7, 7, 8, 8, 7, 8, 8, 7, 9, 9,11,11,11, 9, 8, 8, 8, 9, 9,12,11,12, 9, 8, 8, 6, 7, 7,10,11, 11,10,10,10,11,11,11,14,14,14,12,11,12,11,11,11, @@ -4960,7 +4977,7 @@ static const long _vq_lengthlist__44p4_p6_0[] = { static const static_codebook _44p4_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p6_0, + (char *)_vq_lengthlist__44p4_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p4_p6_0, 0 @@ -4972,7 +4989,7 @@ static const long _vq_quantlist__44p4_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p4_p6_1[] = { +static const char _vq_lengthlist__44p4_p6_1[] = { 2, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 7, 7, 8, 8, 8, 9, 9, 9, 9, 8, 8, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 9, 9, 8, 8,10, 8, 8, @@ -4993,7 +5010,7 @@ static const long _vq_lengthlist__44p4_p6_1[] = { static const static_codebook _44p4_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p4_p6_1, + (char *)_vq_lengthlist__44p4_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p4_p6_1, 0 @@ -5005,7 +5022,7 @@ static const long _vq_quantlist__44p4_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p4_p7_0[] = { +static const char _vq_lengthlist__44p4_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -5026,7 +5043,7 @@ static const long _vq_lengthlist__44p4_p7_0[] = { static const static_codebook _44p4_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p4_p7_0, + (char *)_vq_lengthlist__44p4_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p4_p7_0, 0 @@ -5038,7 +5055,7 @@ static const long _vq_quantlist__44p4_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p4_p7_1[] = { +static const char _vq_lengthlist__44p4_p7_1[] = { 1, 9, 9, 7, 9, 9, 8, 8, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -5059,7 +5076,7 @@ static const long _vq_lengthlist__44p4_p7_1[] = { static const static_codebook _44p4_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p4_p7_1, + (char *)_vq_lengthlist__44p4_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p4_p7_1, 0 @@ -5093,14 +5110,14 @@ static const long _vq_quantlist__44p4_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p4_p7_2[] = { +static const char _vq_lengthlist__44p4_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p4_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p4_p7_2, + (char *)_vq_lengthlist__44p4_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p4_p7_2, 0 @@ -5134,20 +5151,20 @@ static const long _vq_quantlist__44p4_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p4_p7_3[] = { +static const char _vq_lengthlist__44p4_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p4_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p4_p7_3, + (char *)_vq_lengthlist__44p4_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p4_p7_3, 0 }; -static const long _huff_lengthlist__44p4_short[] = { +static const char _huff_lengthlist__44p4_short[] = { 3, 5,16, 9, 9,13,18,21, 4, 2,21, 6, 6,10,15,21, 16,19, 6, 5, 7,10,13,16, 8, 6, 5, 4, 4, 8,13,16, 8, 5, 6, 4, 4, 7,12,15,13,10, 9, 7, 7, 9,13,16, @@ -5156,7 +5173,7 @@ static const long _huff_lengthlist__44p4_short[] = { static const static_codebook _huff_book__44p4_short = { 2, 64, - (long *)_huff_lengthlist__44p4_short, + (char *)_huff_lengthlist__44p4_short, 0, 0, 0, 0, 0, NULL, 0 @@ -5178,7 +5195,7 @@ static const long _vq_quantlist__44p5_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p5_l0_0[] = { +static const char _vq_lengthlist__44p5_l0_0[] = { 1, 4, 4, 8, 8,10,10,10,10, 9, 8,11,11, 4, 6, 5, 8, 6,10,10,10,10,10, 9,10, 9, 4, 5, 6, 6, 9,10, 10,10,10, 9,10, 9,10, 8, 9, 8, 9, 8, 9, 9,10, 9, @@ -5194,7 +5211,7 @@ static const long _vq_lengthlist__44p5_l0_0[] = { static const static_codebook _44p5_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p5_l0_0, + (char *)_vq_lengthlist__44p5_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p5_l0_0, 0 @@ -5208,14 +5225,14 @@ static const long _vq_quantlist__44p5_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p5_l0_1[] = { +static const char _vq_lengthlist__44p5_l0_1[] = { 4, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p5_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p5_l0_1, + (char *)_vq_lengthlist__44p5_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_l0_1, 0 @@ -5227,31 +5244,31 @@ static const long _vq_quantlist__44p5_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p5_l1_0[] = { +static const char _vq_lengthlist__44p5_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44p5_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p5_l1_0, + (char *)_vq_lengthlist__44p5_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p5_l1_0, 0 }; -static const long _huff_lengthlist__44p5_lfe[] = { +static const char _huff_lengthlist__44p5_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44p5_lfe = { 2, 4, - (long *)_huff_lengthlist__44p5_lfe, + (char *)_huff_lengthlist__44p5_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p5_long[] = { +static const char _huff_lengthlist__44p5_long[] = { 3, 7,12,14,14,16,18,19, 6, 2, 4, 6, 8, 9,12,14, 12, 3, 3, 5, 7, 8,11,13,13, 6, 4, 5, 7, 8,10,11, 14, 8, 7, 7, 7, 7, 9,10,15, 9, 8, 7, 7, 6, 8, 9, @@ -5260,7 +5277,7 @@ static const long _huff_lengthlist__44p5_long[] = { static const static_codebook _huff_book__44p5_long = { 2, 64, - (long *)_huff_lengthlist__44p5_long, + (char *)_huff_lengthlist__44p5_long, 0, 0, 0, 0, 0, NULL, 0 @@ -5272,7 +5289,7 @@ static const long _vq_quantlist__44p5_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p1_0[] = { +static const char _vq_lengthlist__44p5_p1_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10, 9,10,12,10,11,11, 8,10,10, @@ -5293,7 +5310,7 @@ static const long _vq_lengthlist__44p5_p1_0[] = { static const static_codebook _44p5_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p1_0, + (char *)_vq_lengthlist__44p5_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p5_p1_0, 0 @@ -5307,7 +5324,7 @@ static const long _vq_quantlist__44p5_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p5_p2_0[] = { +static const char _vq_lengthlist__44p5_p2_0[] = { 4, 6, 6, 9, 9, 6, 7, 8,10,10, 6, 8, 7,10,10, 8, 10,10,12,13, 8,10,10,13,12, 6, 7, 8,10,10, 7, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,14,10,11,11, @@ -5508,7 +5525,7 @@ static const long _vq_lengthlist__44p5_p2_0[] = { static const static_codebook _44p5_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p5_p2_0, + (char *)_vq_lengthlist__44p5_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_p2_0, 0 @@ -5520,7 +5537,7 @@ static const long _vq_quantlist__44p5_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p3_0[] = { +static const char _vq_lengthlist__44p5_p3_0[] = { 1, 5, 6, 5, 7, 8, 5, 8, 7, 5, 7, 8, 7, 8,10, 8, 10,10, 5, 8, 7, 8,10,10, 7,10, 8, 6, 8, 9, 8,10, 11, 9,10,10, 9,10,11,10,11,12,11,12,12, 9,11,10, @@ -5541,7 +5558,7 @@ static const long _vq_lengthlist__44p5_p3_0[] = { static const static_codebook _44p5_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p3_0, + (char *)_vq_lengthlist__44p5_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p5_p3_0, 0 @@ -5553,7 +5570,7 @@ static const long _vq_quantlist__44p5_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p5_p3_1[] = { +static const char _vq_lengthlist__44p5_p3_1[] = { 5, 6, 6, 6, 7, 7, 6, 7, 7, 6, 7, 7, 7, 7, 8, 7, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 8, 8, 8, @@ -5574,7 +5591,7 @@ static const long _vq_lengthlist__44p5_p3_1[] = { static const static_codebook _44p5_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p5_p3_1, + (char *)_vq_lengthlist__44p5_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p5_p3_1, 0 @@ -5586,7 +5603,7 @@ static const long _vq_quantlist__44p5_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p4_0[] = { +static const char _vq_lengthlist__44p5_p4_0[] = { 1, 5, 5, 5, 7, 9, 5, 9, 7, 5, 7, 8, 7, 7,10, 9, 10,10, 5, 8, 7, 9,10,10, 7,10, 7, 6, 8, 9, 9,10, 12, 9,11,11, 9,10,11,11,11,13,12,13,13, 9,11,11, @@ -5607,7 +5624,7 @@ static const long _vq_lengthlist__44p5_p4_0[] = { static const static_codebook _44p5_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p4_0, + (char *)_vq_lengthlist__44p5_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p5_p4_0, 0 @@ -5621,7 +5638,7 @@ static const long _vq_quantlist__44p5_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p5_p4_1[] = { +static const char _vq_lengthlist__44p5_p4_1[] = { 5, 7, 7,10,10, 7, 8, 9,10,11, 7, 9, 8,11,10, 9, 10,10,11,11, 9,10,10,11,11, 7, 9, 9,10,10, 8, 9, 10,10,11, 9,10,10,11,11,10,10,11,11,11,10,11,11, @@ -5822,7 +5839,7 @@ static const long _vq_lengthlist__44p5_p4_1[] = { static const static_codebook _44p5_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p5_p4_1, + (char *)_vq_lengthlist__44p5_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_p4_1, 0 @@ -5836,7 +5853,7 @@ static const long _vq_quantlist__44p5_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p5_p5_0[] = { +static const char _vq_lengthlist__44p5_p5_0[] = { 1, 6, 6,10,10, 6, 7, 9,11,13, 5, 9, 7,13,11, 8, 11,12,13,15, 8,12,11,15,13, 6, 7, 8,11,11, 7, 8, 10,11,13, 9,10,10,13,13,11,11,13,12,16,12,13,13, @@ -6037,7 +6054,7 @@ static const long _vq_lengthlist__44p5_p5_0[] = { static const static_codebook _44p5_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p5_p5_0, + (char *)_vq_lengthlist__44p5_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p5_p5_0, 0 @@ -6053,13 +6070,13 @@ static const long _vq_quantlist__44p5_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p5_p5_1[] = { +static const char _vq_lengthlist__44p5_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p5_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p5_p5_1, + (char *)_vq_lengthlist__44p5_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p5_p5_1, 0 @@ -6071,7 +6088,7 @@ static const long _vq_quantlist__44p5_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p6_0[] = { +static const char _vq_lengthlist__44p5_p6_0[] = { 1, 5, 5, 5, 7, 9, 5, 9, 7, 5, 7, 8, 7, 7,10, 9, 9,10, 5, 8, 7, 9,10, 9, 7,10, 7, 6, 9, 9, 9,10, 12,10,12,11, 9,10,11,11,10,13,12,12,13,10,11,11, @@ -6092,7 +6109,7 @@ static const long _vq_lengthlist__44p5_p6_0[] = { static const static_codebook _44p5_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p6_0, + (char *)_vq_lengthlist__44p5_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p5_p6_0, 0 @@ -6104,7 +6121,7 @@ static const long _vq_quantlist__44p5_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p5_p6_1[] = { +static const char _vq_lengthlist__44p5_p6_1[] = { 2, 6, 6, 5, 7, 8, 5, 8, 7, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9, 9, 9, 9,10,10,10,10, 8, 9, 9, @@ -6125,7 +6142,7 @@ static const long _vq_lengthlist__44p5_p6_1[] = { static const static_codebook _44p5_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p5_p6_1, + (char *)_vq_lengthlist__44p5_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p5_p6_1, 0 @@ -6137,7 +6154,7 @@ static const long _vq_quantlist__44p5_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p5_p7_0[] = { +static const char _vq_lengthlist__44p5_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6158,7 +6175,7 @@ static const long _vq_lengthlist__44p5_p7_0[] = { static const static_codebook _44p5_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p5_p7_0, + (char *)_vq_lengthlist__44p5_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p5_p7_0, 0 @@ -6170,7 +6187,7 @@ static const long _vq_quantlist__44p5_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p5_p7_1[] = { +static const char _vq_lengthlist__44p5_p7_1[] = { 1, 7, 7, 6, 9, 9, 7, 9, 9, 6, 9, 9, 9, 9, 9, 9, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6191,7 +6208,7 @@ static const long _vq_lengthlist__44p5_p7_1[] = { static const static_codebook _44p5_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p5_p7_1, + (char *)_vq_lengthlist__44p5_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p5_p7_1, 0 @@ -6225,14 +6242,14 @@ static const long _vq_quantlist__44p5_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p5_p7_2[] = { +static const char _vq_lengthlist__44p5_p7_2[] = { 1, 2, 3, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, 11,12,12,13,13,14,14,14,14, }; static const static_codebook _44p5_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p5_p7_2, + (char *)_vq_lengthlist__44p5_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p5_p7_2, 0 @@ -6266,20 +6283,20 @@ static const long _vq_quantlist__44p5_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p5_p7_3[] = { +static const char _vq_lengthlist__44p5_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p5_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p5_p7_3, + (char *)_vq_lengthlist__44p5_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p5_p7_3, 0 }; -static const long _huff_lengthlist__44p5_short[] = { +static const char _huff_lengthlist__44p5_short[] = { 4, 7,12,14,15,18,20,20, 5, 3, 4, 6, 9,11,15,19, 9, 4, 3, 4, 7, 9,13,18,11, 6, 3, 3, 5, 8,13,19, 14, 9, 6, 5, 7,10,16,20,16,11, 9, 8,10,10,14,16, @@ -6288,7 +6305,7 @@ static const long _huff_lengthlist__44p5_short[] = { static const static_codebook _huff_book__44p5_short = { 2, 64, - (long *)_huff_lengthlist__44p5_short, + (char *)_huff_lengthlist__44p5_short, 0, 0, 0, 0, 0, NULL, 0 @@ -6310,7 +6327,7 @@ static const long _vq_quantlist__44p6_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p6_l0_0[] = { +static const char _vq_lengthlist__44p6_l0_0[] = { 1, 4, 4, 7, 7,10,10,12,12,12,12,13,12, 5, 5, 5, 8, 6,11, 9,12,12,13,12,12,12, 4, 5, 5, 6, 8, 9, 11,12,12,13,12,12,12, 7, 7, 8, 9, 9,11, 8,12, 9, @@ -6326,7 +6343,7 @@ static const long _vq_lengthlist__44p6_l0_0[] = { static const static_codebook _44p6_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p6_l0_0, + (char *)_vq_lengthlist__44p6_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p6_l0_0, 0 @@ -6340,14 +6357,14 @@ static const long _vq_quantlist__44p6_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p6_l0_1[] = { +static const char _vq_lengthlist__44p6_l0_1[] = { 4, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 4, }; static const static_codebook _44p6_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p6_l0_1, + (char *)_vq_lengthlist__44p6_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_l0_1, 0 @@ -6359,31 +6376,31 @@ static const long _vq_quantlist__44p6_l1_0[] = { 2, }; -static const long _vq_lengthlist__44p6_l1_0[] = { +static const char _vq_lengthlist__44p6_l1_0[] = { 1, 3, 2, 5, 5, 6, 6, 6, 6, }; static const static_codebook _44p6_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44p6_l1_0, + (char *)_vq_lengthlist__44p6_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p6_l1_0, 0 }; -static const long _huff_lengthlist__44p6_lfe[] = { +static const char _huff_lengthlist__44p6_lfe[] = { 2, 3, 1, 3, }; static const static_codebook _huff_book__44p6_lfe = { 2, 4, - (long *)_huff_lengthlist__44p6_lfe, + (char *)_huff_lengthlist__44p6_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p6_long[] = { +static const char _huff_lengthlist__44p6_long[] = { 2, 7,13,15,16,17,19,20, 6, 3, 4, 7, 9,10,12,15, 13, 4, 3, 4, 7, 8,11,13,14, 7, 4, 4, 6, 7,10,11, 16, 9, 7, 6, 7, 8, 9,10,16, 9, 8, 7, 7, 6, 8, 8, @@ -6392,7 +6409,7 @@ static const long _huff_lengthlist__44p6_long[] = { static const static_codebook _huff_book__44p6_long = { 2, 64, - (long *)_huff_lengthlist__44p6_long, + (char *)_huff_lengthlist__44p6_long, 0, 0, 0, 0, 0, NULL, 0 @@ -6404,7 +6421,7 @@ static const long _vq_quantlist__44p6_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p1_0[] = { +static const char _vq_lengthlist__44p6_p1_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9,10,12,10,11,11, 8, 9,10, @@ -6425,7 +6442,7 @@ static const long _vq_lengthlist__44p6_p1_0[] = { static const static_codebook _44p6_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p1_0, + (char *)_vq_lengthlist__44p6_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p6_p1_0, 0 @@ -6439,7 +6456,7 @@ static const long _vq_quantlist__44p6_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p6_p2_0[] = { +static const char _vq_lengthlist__44p6_p2_0[] = { 4, 6, 6, 9, 9, 6, 7, 8,10,10, 6, 8, 7,10,10, 8, 10,10,12,13, 8,10,10,13,12, 6, 8, 8,10,10, 7, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,13,10,11,11, @@ -6640,7 +6657,7 @@ static const long _vq_lengthlist__44p6_p2_0[] = { static const static_codebook _44p6_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p6_p2_0, + (char *)_vq_lengthlist__44p6_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_p2_0, 0 @@ -6652,7 +6669,7 @@ static const long _vq_quantlist__44p6_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p3_0[] = { +static const char _vq_lengthlist__44p6_p3_0[] = { 1, 5, 5, 5, 7, 8, 5, 8, 7, 5, 7, 8, 8, 8,10, 8, 10,10, 5, 8, 7, 8,10,10, 8,10, 8, 6, 8, 9, 8,10, 12, 9,11,11, 9,10,11,11,11,13,12,13,13, 9,11,11, @@ -6673,7 +6690,7 @@ static const long _vq_lengthlist__44p6_p3_0[] = { static const static_codebook _44p6_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p3_0, + (char *)_vq_lengthlist__44p6_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p6_p3_0, 0 @@ -6685,7 +6702,7 @@ static const long _vq_quantlist__44p6_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p6_p3_1[] = { +static const char _vq_lengthlist__44p6_p3_1[] = { 5, 7, 7, 6, 7, 7, 6, 7, 7, 6, 7, 7, 7, 8, 8, 7, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 8, 7, 7, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 8, 8, 8, @@ -6706,7 +6723,7 @@ static const long _vq_lengthlist__44p6_p3_1[] = { static const static_codebook _44p6_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p6_p3_1, + (char *)_vq_lengthlist__44p6_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p6_p3_1, 0 @@ -6718,7 +6735,7 @@ static const long _vq_quantlist__44p6_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p4_0[] = { +static const char _vq_lengthlist__44p6_p4_0[] = { 2, 5, 5, 5, 7, 8, 5, 8, 7, 5, 7, 7, 7, 7, 9, 7, 9, 9, 5, 7, 7, 8, 9, 9, 7, 9, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9, 9,11,10,11,11, 8, 9, 9, @@ -6739,7 +6756,7 @@ static const long _vq_lengthlist__44p6_p4_0[] = { static const static_codebook _44p6_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p4_0, + (char *)_vq_lengthlist__44p6_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p6_p4_0, 0 @@ -6753,7 +6770,7 @@ static const long _vq_quantlist__44p6_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p6_p4_1[] = { +static const char _vq_lengthlist__44p6_p4_1[] = { 6, 8, 8,10,10, 8, 9, 9,10,11, 8,10, 9,11,10, 9, 10,10,11,11, 9,10,10,11,11, 8, 9, 9,10,10, 9, 9, 10,11,11,10,10,10,11,11,10,11,11,11,11,10,11,11, @@ -6954,7 +6971,7 @@ static const long _vq_lengthlist__44p6_p4_1[] = { static const static_codebook _44p6_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p6_p4_1, + (char *)_vq_lengthlist__44p6_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_p4_1, 0 @@ -6968,7 +6985,7 @@ static const long _vq_quantlist__44p6_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p6_p5_0[] = { +static const char _vq_lengthlist__44p6_p5_0[] = { 2, 6, 6,10,10, 5, 7, 8,11,12, 5, 8, 7,12,11, 9, 11,11,13,15, 9,11,11,15,13, 6, 7, 8,11,11, 7, 7, 9,11,13, 8, 9, 9,13,12,11,11,12,12,15,11,12,12, @@ -7169,7 +7186,7 @@ static const long _vq_lengthlist__44p6_p5_0[] = { static const static_codebook _44p6_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p6_p5_0, + (char *)_vq_lengthlist__44p6_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p6_p5_0, 0 @@ -7185,13 +7202,13 @@ static const long _vq_quantlist__44p6_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p6_p5_1[] = { +static const char _vq_lengthlist__44p6_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p6_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p6_p5_1, + (char *)_vq_lengthlist__44p6_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p6_p5_1, 0 @@ -7203,7 +7220,7 @@ static const long _vq_quantlist__44p6_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p6_0[] = { +static const char _vq_lengthlist__44p6_p6_0[] = { 1, 5, 5, 5, 7, 9, 5, 9, 7, 5, 7, 8, 7, 7,10, 9, 10,10, 5, 8, 7, 9,10,10, 7,10, 7, 6, 9, 9, 9,10, 12, 9,11,11, 9,10,11,11,11,13,12,13,13, 9,11,11, @@ -7224,7 +7241,7 @@ static const long _vq_lengthlist__44p6_p6_0[] = { static const static_codebook _44p6_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p6_0, + (char *)_vq_lengthlist__44p6_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p6_p6_0, 0 @@ -7236,7 +7253,7 @@ static const long _vq_quantlist__44p6_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p6_p6_1[] = { +static const char _vq_lengthlist__44p6_p6_1[] = { 2, 6, 6, 6, 7, 8, 6, 8, 7, 6, 7, 7, 7, 7, 8, 7, 8, 8, 6, 7, 7, 7, 8, 8, 7, 8, 7, 6, 8, 8, 8, 9, 9, 8, 9, 9, 8, 9, 9, 9, 9,10, 9,10,10, 8, 9, 9, @@ -7257,7 +7274,7 @@ static const long _vq_lengthlist__44p6_p6_1[] = { static const static_codebook _44p6_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p6_p6_1, + (char *)_vq_lengthlist__44p6_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p6_p6_1, 0 @@ -7269,7 +7286,7 @@ static const long _vq_quantlist__44p6_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p6_p7_0[] = { +static const char _vq_lengthlist__44p6_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -7290,7 +7307,7 @@ static const long _vq_lengthlist__44p6_p7_0[] = { static const static_codebook _44p6_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p6_p7_0, + (char *)_vq_lengthlist__44p6_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p6_p7_0, 0 @@ -7302,7 +7319,7 @@ static const long _vq_quantlist__44p6_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p6_p7_1[] = { +static const char _vq_lengthlist__44p6_p7_1[] = { 1, 4, 5, 5,10,10, 5,10,10, 5,10,10,10,10,10,10, 10,10, 5,10,10,10,10,10,10,10,10, 7,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -7323,7 +7340,7 @@ static const long _vq_lengthlist__44p6_p7_1[] = { static const static_codebook _44p6_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p6_p7_1, + (char *)_vq_lengthlist__44p6_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p6_p7_1, 0 @@ -7357,14 +7374,14 @@ static const long _vq_quantlist__44p6_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p6_p7_2[] = { +static const char _vq_lengthlist__44p6_p7_2[] = { 1, 2, 3, 4, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p6_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p6_p7_2, + (char *)_vq_lengthlist__44p6_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p6_p7_2, 0 @@ -7398,20 +7415,20 @@ static const long _vq_quantlist__44p6_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p6_p7_3[] = { +static const char _vq_lengthlist__44p6_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p6_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p6_p7_3, + (char *)_vq_lengthlist__44p6_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p6_p7_3, 0 }; -static const long _huff_lengthlist__44p6_short[] = { +static const char _huff_lengthlist__44p6_short[] = { 2, 8,13,15,16,18,21,22, 5, 4, 6, 8,10,12,17,21, 9, 5, 5, 6, 8,11,15,19,11, 6, 5, 5, 6, 7,12,14, 14, 8, 7, 5, 4, 4, 9,11,16,11, 9, 7, 4, 3, 7,10, @@ -7420,7 +7437,7 @@ static const long _huff_lengthlist__44p6_short[] = { static const static_codebook _huff_book__44p6_short = { 2, 64, - (long *)_huff_lengthlist__44p6_short, + (char *)_huff_lengthlist__44p6_short, 0, 0, 0, 0, 0, NULL, 0 @@ -7442,7 +7459,7 @@ static const long _vq_quantlist__44p7_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p7_l0_0[] = { +static const char _vq_lengthlist__44p7_l0_0[] = { 2, 4, 4, 7, 7, 8, 8,10,10,11,11,12,12, 4, 5, 5, 7, 7, 9, 9,11, 9,12,11,12,12, 4, 5, 5, 7, 7, 9, 9, 9,10,10,11,12,12, 7, 7, 7, 7, 8, 9, 8,11, 5, @@ -7458,7 +7475,7 @@ static const long _vq_lengthlist__44p7_l0_0[] = { static const static_codebook _44p7_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p7_l0_0, + (char *)_vq_lengthlist__44p7_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p7_l0_0, 0 @@ -7472,14 +7489,14 @@ static const long _vq_quantlist__44p7_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p7_l0_1[] = { +static const char _vq_lengthlist__44p7_l0_1[] = { 4, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p7_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p7_l0_1, + (char *)_vq_lengthlist__44p7_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_l0_1, 0 @@ -7493,32 +7510,32 @@ static const long _vq_quantlist__44p7_l1_0[] = { 108, }; -static const long _vq_lengthlist__44p7_l1_0[] = { +static const char _vq_lengthlist__44p7_l1_0[] = { 1, 2, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; static const static_codebook _44p7_l1_0 = { 2, 25, - (long *)_vq_lengthlist__44p7_l1_0, + (char *)_vq_lengthlist__44p7_l1_0, 1, -514516992, 1620639744, 7, 0, (long *)_vq_quantlist__44p7_l1_0, 0 }; -static const long _huff_lengthlist__44p7_lfe[] = { +static const char _huff_lengthlist__44p7_lfe[] = { 2, 3, 1, 3, }; static const static_codebook _huff_book__44p7_lfe = { 2, 4, - (long *)_huff_lengthlist__44p7_lfe, + (char *)_huff_lengthlist__44p7_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p7_long[] = { +static const char _huff_lengthlist__44p7_long[] = { 2, 7,14,16,17,17,18,20, 6, 3, 5, 8,10,11,13,15, 13, 5, 3, 5, 8, 9,11,12,15, 7, 4, 3, 5, 7, 9,11, 16,10, 7, 5, 6, 7, 9,10,17,11, 8, 7, 7, 6, 8, 8, @@ -7527,7 +7544,7 @@ static const long _huff_lengthlist__44p7_long[] = { static const static_codebook _huff_book__44p7_long = { 2, 64, - (long *)_huff_lengthlist__44p7_long, + (char *)_huff_lengthlist__44p7_long, 0, 0, 0, 0, 0, NULL, 0 @@ -7539,7 +7556,7 @@ static const long _vq_quantlist__44p7_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p1_0[] = { +static const char _vq_lengthlist__44p7_p1_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 6, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10,10,10,12,10,11,11, 8,10,10, @@ -7560,7 +7577,7 @@ static const long _vq_lengthlist__44p7_p1_0[] = { static const static_codebook _44p7_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p1_0, + (char *)_vq_lengthlist__44p7_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p7_p1_0, 0 @@ -7574,7 +7591,7 @@ static const long _vq_quantlist__44p7_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p7_p2_0[] = { +static const char _vq_lengthlist__44p7_p2_0[] = { 4, 6, 6, 9, 9, 6, 8, 8,10,10, 6, 8, 8,10,10, 8, 10,10,12,13, 8,10,10,13,12, 6, 8, 8,10,10, 8, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,13,10,11,11, @@ -7775,7 +7792,7 @@ static const long _vq_lengthlist__44p7_p2_0[] = { static const static_codebook _44p7_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p7_p2_0, + (char *)_vq_lengthlist__44p7_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_p2_0, 0 @@ -7787,7 +7804,7 @@ static const long _vq_quantlist__44p7_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p3_0[] = { +static const char _vq_lengthlist__44p7_p3_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 7, 5, 7, 8, 7, 8,10, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7,10, 8, 5, 7, 8, 8, 9, 10, 8,10,10, 8, 9,10,10,10,12,10,12,12, 8,10,10, @@ -7808,7 +7825,7 @@ static const long _vq_lengthlist__44p7_p3_0[] = { static const static_codebook _44p7_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p3_0, + (char *)_vq_lengthlist__44p7_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p7_p3_0, 0 @@ -7820,7 +7837,7 @@ static const long _vq_quantlist__44p7_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p7_p3_1[] = { +static const char _vq_lengthlist__44p7_p3_1[] = { 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 7, 8, 8, 7, 8, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 8, 8, @@ -7841,7 +7858,7 @@ static const long _vq_lengthlist__44p7_p3_1[] = { static const static_codebook _44p7_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p7_p3_1, + (char *)_vq_lengthlist__44p7_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p7_p3_1, 0 @@ -7853,7 +7870,7 @@ static const long _vq_quantlist__44p7_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p4_0[] = { +static const char _vq_lengthlist__44p7_p4_0[] = { 1, 5, 5, 5, 7, 8, 5, 8, 7, 5, 7, 8, 7, 8,10, 8, 10,10, 5, 8, 7, 8,10,10, 7,10, 8, 6, 8, 9, 9,10, 12, 9,11,11, 9,10,11,11,11,13,11,13,13, 9,11,11, @@ -7874,7 +7891,7 @@ static const long _vq_lengthlist__44p7_p4_0[] = { static const static_codebook _44p7_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p4_0, + (char *)_vq_lengthlist__44p7_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p7_p4_0, 0 @@ -7888,7 +7905,7 @@ static const long _vq_quantlist__44p7_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p7_p4_1[] = { +static const char _vq_lengthlist__44p7_p4_1[] = { 7, 8, 8,10,10, 8, 9, 9,10,11, 8, 9, 9,10,10, 9, 10,10,11,11, 9,10,10,11,11, 8, 9, 9,10,10, 9, 9, 10,11,11, 9,10,10,11,11,10,10,11,11,11,10,11,11, @@ -8089,7 +8106,7 @@ static const long _vq_lengthlist__44p7_p4_1[] = { static const static_codebook _44p7_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p7_p4_1, + (char *)_vq_lengthlist__44p7_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_p4_1, 0 @@ -8103,7 +8120,7 @@ static const long _vq_quantlist__44p7_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p7_p5_0[] = { +static const char _vq_lengthlist__44p7_p5_0[] = { 2, 6, 6, 9, 9, 5, 7, 8,10,11, 5, 8, 7,11,10, 8, 10,11,12,13, 8,11,10,13,12, 6, 7, 8,10,11, 7, 8, 10,10,12, 8, 9, 9,12,11,10,10,12,11,14,10,11,12, @@ -8304,7 +8321,7 @@ static const long _vq_lengthlist__44p7_p5_0[] = { static const static_codebook _44p7_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p7_p5_0, + (char *)_vq_lengthlist__44p7_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p7_p5_0, 0 @@ -8320,13 +8337,13 @@ static const long _vq_quantlist__44p7_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p7_p5_1[] = { +static const char _vq_lengthlist__44p7_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p7_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p7_p5_1, + (char *)_vq_lengthlist__44p7_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p7_p5_1, 0 @@ -8338,7 +8355,7 @@ static const long _vq_quantlist__44p7_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p6_0[] = { +static const char _vq_lengthlist__44p7_p6_0[] = { 2, 5, 6, 5, 7, 8, 5, 8, 7, 5, 7, 7, 7, 7, 9, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7, 9, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9, 9,11,10,10,11, 8,10, 9, @@ -8359,7 +8376,7 @@ static const long _vq_lengthlist__44p7_p6_0[] = { static const static_codebook _44p7_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p6_0, + (char *)_vq_lengthlist__44p7_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p7_p6_0, 0 @@ -8371,7 +8388,7 @@ static const long _vq_quantlist__44p7_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p7_p6_1[] = { +static const char _vq_lengthlist__44p7_p6_1[] = { 4, 7, 7, 6, 7, 8, 6, 8, 7, 7, 7, 8, 7, 7, 8, 8, 8, 8, 7, 7, 7, 8, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 9, 9, 8, 8, 8, @@ -8392,7 +8409,7 @@ static const long _vq_lengthlist__44p7_p6_1[] = { static const static_codebook _44p7_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p7_p6_1, + (char *)_vq_lengthlist__44p7_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p7_p6_1, 0 @@ -8404,7 +8421,7 @@ static const long _vq_quantlist__44p7_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p7_p7_0[] = { +static const char _vq_lengthlist__44p7_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -8425,7 +8442,7 @@ static const long _vq_lengthlist__44p7_p7_0[] = { static const static_codebook _44p7_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p7_p7_0, + (char *)_vq_lengthlist__44p7_p7_0, 1, -513979392, 1633504256, 2, 0, (long *)_vq_quantlist__44p7_p7_0, 0 @@ -8437,7 +8454,7 @@ static const long _vq_quantlist__44p7_p7_1[] = { 2, }; -static const long _vq_lengthlist__44p7_p7_1[] = { +static const char _vq_lengthlist__44p7_p7_1[] = { 1, 5, 5, 4,10,10, 5,10,10, 5,10,10,10,10,10,10, 10,10, 5,10,10,10,10,10, 9,10,10, 6,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -8458,7 +8475,7 @@ static const long _vq_lengthlist__44p7_p7_1[] = { static const static_codebook _44p7_p7_1 = { 5, 243, - (long *)_vq_lengthlist__44p7_p7_1, + (char *)_vq_lengthlist__44p7_p7_1, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44p7_p7_1, 0 @@ -8492,14 +8509,14 @@ static const long _vq_quantlist__44p7_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p7_p7_2[] = { +static const char _vq_lengthlist__44p7_p7_2[] = { 1, 3, 2, 4, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p7_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p7_p7_2, + (char *)_vq_lengthlist__44p7_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p7_p7_2, 0 @@ -8533,20 +8550,20 @@ static const long _vq_quantlist__44p7_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p7_p7_3[] = { +static const char _vq_lengthlist__44p7_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p7_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p7_p7_3, + (char *)_vq_lengthlist__44p7_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p7_p7_3, 0 }; -static const long _huff_lengthlist__44p7_short[] = { +static const char _huff_lengthlist__44p7_short[] = { 3, 9,14,16,17,19,22,22, 5, 4, 6, 9,11,13,17,20, 9, 5, 5, 6, 9,11,15,19,11, 7, 5, 5, 7, 9,13,17, 14, 9, 7, 6, 6, 7,11,14,16,11, 9, 7, 6, 4, 4, 8, @@ -8555,7 +8572,7 @@ static const long _huff_lengthlist__44p7_short[] = { static const static_codebook _huff_book__44p7_short = { 2, 64, - (long *)_huff_lengthlist__44p7_short, + (char *)_huff_lengthlist__44p7_short, 0, 0, 0, 0, 0, NULL, 0 @@ -8577,7 +8594,7 @@ static const long _vq_quantlist__44p8_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p8_l0_0[] = { +static const char _vq_lengthlist__44p8_l0_0[] = { 2, 4, 4, 7, 7, 8, 8,10,10,11,11,12,12, 4, 5, 5, 7, 7, 9, 9,10, 9,12,10,12,12, 4, 5, 5, 7, 7, 9, 9, 9,10,10,12,12,12, 7, 7, 7, 7, 8, 9, 8,11, 5, @@ -8593,7 +8610,7 @@ static const long _vq_lengthlist__44p8_l0_0[] = { static const static_codebook _44p8_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p8_l0_0, + (char *)_vq_lengthlist__44p8_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p8_l0_0, 0 @@ -8607,14 +8624,14 @@ static const long _vq_quantlist__44p8_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p8_l0_1[] = { +static const char _vq_lengthlist__44p8_l0_1[] = { 4, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p8_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p8_l0_1, + (char *)_vq_lengthlist__44p8_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_l0_1, 0 @@ -8628,32 +8645,32 @@ static const long _vq_quantlist__44p8_l1_0[] = { 108, }; -static const long _vq_lengthlist__44p8_l1_0[] = { +static const char _vq_lengthlist__44p8_l1_0[] = { 1, 2, 3, 6, 7, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; static const static_codebook _44p8_l1_0 = { 2, 25, - (long *)_vq_lengthlist__44p8_l1_0, + (char *)_vq_lengthlist__44p8_l1_0, 1, -514516992, 1620639744, 7, 0, (long *)_vq_quantlist__44p8_l1_0, 0 }; -static const long _huff_lengthlist__44p8_lfe[] = { +static const char _huff_lengthlist__44p8_lfe[] = { 2, 3, 1, 3, }; static const static_codebook _huff_book__44p8_lfe = { 2, 4, - (long *)_huff_lengthlist__44p8_lfe, + (char *)_huff_lengthlist__44p8_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p8_long[] = { +static const char _huff_lengthlist__44p8_long[] = { 2, 7,14,16,17,18,20,21, 7, 4, 6, 8,11,12,14,16, 13, 5, 4, 4, 8, 9,11,13,15, 8, 4, 3, 5, 7, 9,10, 17,11, 8, 4, 4, 6, 9, 9,17,11, 9, 7, 6, 5, 7, 8, @@ -8662,7 +8679,7 @@ static const long _huff_lengthlist__44p8_long[] = { static const static_codebook _huff_book__44p8_long = { 2, 64, - (long *)_huff_lengthlist__44p8_long, + (char *)_huff_lengthlist__44p8_long, 0, 0, 0, 0, 0, NULL, 0 @@ -8674,7 +8691,7 @@ static const long _vq_quantlist__44p8_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p1_0[] = { +static const char _vq_lengthlist__44p8_p1_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 6, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10,10,10,12,10,11,12, 8,10,10, @@ -8695,7 +8712,7 @@ static const long _vq_lengthlist__44p8_p1_0[] = { static const static_codebook _44p8_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p1_0, + (char *)_vq_lengthlist__44p8_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p8_p1_0, 0 @@ -8709,7 +8726,7 @@ static const long _vq_quantlist__44p8_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p8_p2_0[] = { +static const char _vq_lengthlist__44p8_p2_0[] = { 4, 6, 6, 9, 9, 6, 8, 8,10,10, 6, 8, 8,10,10, 8, 9,10,12,12, 8,10, 9,12,12, 6, 8, 8,10,10, 8, 8, 9,10,11, 8, 9, 9,11,11, 9,10,11,12,13,10,11,11, @@ -8910,7 +8927,7 @@ static const long _vq_lengthlist__44p8_p2_0[] = { static const static_codebook _44p8_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p2_0, + (char *)_vq_lengthlist__44p8_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_p2_0, 0 @@ -8922,7 +8939,7 @@ static const long _vq_quantlist__44p8_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p3_0[] = { +static const char _vq_lengthlist__44p8_p3_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 7, 9, 10, 8, 9, 9, 8, 9,10, 9,10,12,10,11,11, 8,10, 9, @@ -8943,7 +8960,7 @@ static const long _vq_lengthlist__44p8_p3_0[] = { static const static_codebook _44p8_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p3_0, + (char *)_vq_lengthlist__44p8_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p8_p3_0, 0 @@ -8955,7 +8972,7 @@ static const long _vq_quantlist__44p8_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p8_p3_1[] = { +static const char _vq_lengthlist__44p8_p3_1[] = { 6, 7, 7, 7, 7, 8, 7, 8, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -8976,7 +8993,7 @@ static const long _vq_lengthlist__44p8_p3_1[] = { static const static_codebook _44p8_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p8_p3_1, + (char *)_vq_lengthlist__44p8_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p8_p3_1, 0 @@ -8988,7 +9005,7 @@ static const long _vq_quantlist__44p8_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p4_0[] = { +static const char _vq_lengthlist__44p8_p4_0[] = { 2, 5, 5, 4, 7, 8, 4, 8, 7, 5, 7, 8, 7, 7,10, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7,10, 7, 5, 7, 8, 8, 9, 11, 8,10,10, 8, 9,10,10,10,12,11,12,12, 8,10,10, @@ -9009,7 +9026,7 @@ static const long _vq_lengthlist__44p8_p4_0[] = { static const static_codebook _44p8_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p4_0, + (char *)_vq_lengthlist__44p8_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p8_p4_0, 0 @@ -9023,7 +9040,7 @@ static const long _vq_quantlist__44p8_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p8_p4_1[] = { +static const char _vq_lengthlist__44p8_p4_1[] = { 7, 9, 9,10,10, 9,10,10,10,11, 9,10,10,11,10, 9, 10,10,11,11, 9,10,10,11,11, 9,10,10,11,11,10,10, 10,11,11,10,10,10,11,11,10,11,11,11,11,10,11,11, @@ -9224,7 +9241,7 @@ static const long _vq_lengthlist__44p8_p4_1[] = { static const static_codebook _44p8_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p4_1, + (char *)_vq_lengthlist__44p8_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_p4_1, 0 @@ -9238,7 +9255,7 @@ static const long _vq_quantlist__44p8_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p8_p5_0[] = { +static const char _vq_lengthlist__44p8_p5_0[] = { 2, 6, 6, 9, 9, 5, 7, 8,10,11, 5, 8, 7,11,10, 8, 10,11,12,13, 8,11,10,13,12, 6, 7, 8,10,11, 7, 8, 10,10,12, 8, 9, 9,12,12,10,10,12,12,14,10,12,12, @@ -9439,7 +9456,7 @@ static const long _vq_lengthlist__44p8_p5_0[] = { static const static_codebook _44p8_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p5_0, + (char *)_vq_lengthlist__44p8_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p8_p5_0, 0 @@ -9455,13 +9472,13 @@ static const long _vq_quantlist__44p8_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p8_p5_1[] = { +static const char _vq_lengthlist__44p8_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p8_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p8_p5_1, + (char *)_vq_lengthlist__44p8_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p8_p5_1, 0 @@ -9473,7 +9490,7 @@ static const long _vq_quantlist__44p8_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p6_0[] = { +static const char _vq_lengthlist__44p8_p6_0[] = { 2, 6, 6, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 7, 9, 7, 9, 9, 6, 7, 7, 8, 9, 9, 7, 9, 7, 6, 8, 8, 8, 9, 10, 8, 9, 9, 8, 9,10, 9, 9,10,10,10,10, 8, 9, 9, @@ -9494,7 +9511,7 @@ static const long _vq_lengthlist__44p8_p6_0[] = { static const static_codebook _44p8_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p6_0, + (char *)_vq_lengthlist__44p8_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p8_p6_0, 0 @@ -9506,7 +9523,7 @@ static const long _vq_quantlist__44p8_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p8_p6_1[] = { +static const char _vq_lengthlist__44p8_p6_1[] = { 4, 7, 7, 7, 7, 8, 7, 8, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 7, 8, 7, 8, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 8, 8, @@ -9527,7 +9544,7 @@ static const long _vq_lengthlist__44p8_p6_1[] = { static const static_codebook _44p8_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p8_p6_1, + (char *)_vq_lengthlist__44p8_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p8_p6_1, 0 @@ -9539,7 +9556,7 @@ static const long _vq_quantlist__44p8_p7_0[] = { 2, }; -static const long _vq_lengthlist__44p8_p7_0[] = { +static const char _vq_lengthlist__44p8_p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -9560,7 +9577,7 @@ static const long _vq_lengthlist__44p8_p7_0[] = { static const static_codebook _44p8_p7_0 = { 5, 243, - (long *)_vq_lengthlist__44p8_p7_0, + (char *)_vq_lengthlist__44p8_p7_0, 1, -512202240, 1635281408, 2, 0, (long *)_vq_quantlist__44p8_p7_0, 0 @@ -9574,7 +9591,7 @@ static const long _vq_quantlist__44p8_p7_1[] = { 4, }; -static const long _vq_lengthlist__44p8_p7_1[] = { +static const char _vq_lengthlist__44p8_p7_1[] = { 1, 7, 7,12,12, 5,11,12,12,12, 5,12,11,12,12,12, 12,12,12,12,12,13,13,13,13, 7,11,11,13,13,13,12, 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, @@ -9775,7 +9792,7 @@ static const long _vq_lengthlist__44p8_p7_1[] = { static const static_codebook _44p8_p7_1 = { 5, 3125, - (long *)_vq_lengthlist__44p8_p7_1, + (char *)_vq_lengthlist__44p8_p7_1, 1, -514619392, 1630767104, 3, 0, (long *)_vq_quantlist__44p8_p7_1, 0 @@ -9809,14 +9826,14 @@ static const long _vq_quantlist__44p8_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p8_p7_2[] = { +static const char _vq_lengthlist__44p8_p7_2[] = { 1, 3, 2, 4, 5, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44p8_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p8_p7_2, + (char *)_vq_lengthlist__44p8_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p8_p7_2, 0 @@ -9850,20 +9867,20 @@ static const long _vq_quantlist__44p8_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p8_p7_3[] = { +static const char _vq_lengthlist__44p8_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p8_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p8_p7_3, + (char *)_vq_lengthlist__44p8_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p8_p7_3, 0 }; -static const long _huff_lengthlist__44p8_short[] = { +static const char _huff_lengthlist__44p8_short[] = { 3, 9,15,17,20,21,22,23, 5, 5, 7, 9,11,13,17,20, 9, 5, 5, 6, 8,10,15,18,11, 7, 5, 4, 6, 9,13,17, 14, 9, 7, 5, 6, 7,10,14,17,10, 8, 6, 6, 4, 5, 8, @@ -9872,7 +9889,7 @@ static const long _huff_lengthlist__44p8_short[] = { static const static_codebook _huff_book__44p8_short = { 2, 64, - (long *)_huff_lengthlist__44p8_short, + (char *)_huff_lengthlist__44p8_short, 0, 0, 0, 0, 0, NULL, 0 @@ -9894,7 +9911,7 @@ static const long _vq_quantlist__44p9_l0_0[] = { 12, }; -static const long _vq_lengthlist__44p9_l0_0[] = { +static const char _vq_lengthlist__44p9_l0_0[] = { 2, 5, 5, 7, 6, 8, 8, 9, 9,10,10,11,11, 4, 5, 5, 6, 7, 8, 8, 9, 9,10,10,11,10, 4, 5, 5, 7, 6, 8, 8, 9, 9,10,10,10,10, 6, 6, 7, 6, 7, 8, 8, 9, 9, @@ -9910,7 +9927,7 @@ static const long _vq_lengthlist__44p9_l0_0[] = { static const static_codebook _44p9_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44p9_l0_0, + (char *)_vq_lengthlist__44p9_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44p9_l0_0, 0 @@ -9924,14 +9941,14 @@ static const long _vq_quantlist__44p9_l0_1[] = { 4, }; -static const long _vq_lengthlist__44p9_l0_1[] = { +static const char _vq_lengthlist__44p9_l0_1[] = { 4, 4, 4, 5, 5, 4, 4, 5, 5, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p9_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44p9_l0_1, + (char *)_vq_lengthlist__44p9_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_l0_1, 0 @@ -9945,38 +9962,38 @@ static const long _vq_quantlist__44p9_l1_0[] = { 4, }; -static const long _vq_lengthlist__44p9_l1_0[] = { +static const char _vq_lengthlist__44p9_l1_0[] = { 1, 2, 3, 5, 9, 9, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,10,10,10,10, }; static const static_codebook _44p9_l1_0 = { 2, 25, - (long *)_vq_lengthlist__44p9_l1_0, + (char *)_vq_lengthlist__44p9_l1_0, 1, -514619392, 1630767104, 3, 0, (long *)_vq_quantlist__44p9_l1_0, 0 }; -static const long _huff_lengthlist__44p9_lfe[] = { +static const char _huff_lengthlist__44p9_lfe[] = { 1, 1, }; static const static_codebook _huff_book__44p9_lfe = { 1, 2, - (long *)_huff_lengthlist__44p9_lfe, + (char *)_huff_lengthlist__44p9_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44p9_long[] = { +static const char _huff_lengthlist__44p9_long[] = { 3, 3, 3, 3, 3, 3, 3, 3, }; static const static_codebook _huff_book__44p9_long = { 1, 8, - (long *)_huff_lengthlist__44p9_long, + (char *)_huff_lengthlist__44p9_long, 0, 0, 0, 0, 0, NULL, 0 @@ -9988,7 +10005,7 @@ static const long _vq_quantlist__44p9_p1_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p1_0[] = { +static const char _vq_lengthlist__44p9_p1_0[] = { 1, 5, 5, 4, 8, 8, 4, 8, 8, 5, 7, 8, 8, 9,10, 8, 10,10, 5, 8, 7, 8,10,10, 8,10, 9, 7, 9, 9, 9,11, 11, 9,11,11, 9,11,11,11,12,13,11,13,13, 9,11,11, @@ -10009,7 +10026,7 @@ static const long _vq_lengthlist__44p9_p1_0[] = { static const static_codebook _44p9_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p1_0, + (char *)_vq_lengthlist__44p9_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p9_p1_0, 0 @@ -10023,7 +10040,7 @@ static const long _vq_quantlist__44p9_p2_0[] = { 4, }; -static const long _vq_lengthlist__44p9_p2_0[] = { +static const char _vq_lengthlist__44p9_p2_0[] = { 4, 6, 6, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 6, 8, 8,11,11, 6, 8, 8,11,11, 6, 7, 7, 9, 9, 7, 8, 9,10,11, 7, 9, 9,11,10, 8, 9,10,12,12, 8,10,10, @@ -10224,7 +10241,7 @@ static const long _vq_lengthlist__44p9_p2_0[] = { static const static_codebook _44p9_p2_0 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p2_0, + (char *)_vq_lengthlist__44p9_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_p2_0, 0 @@ -10236,7 +10253,7 @@ static const long _vq_quantlist__44p9_p3_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p3_0[] = { +static const char _vq_lengthlist__44p9_p3_0[] = { 2, 5, 4, 4, 7, 7, 4, 7, 6, 5, 6, 7, 7, 8, 9, 7, 9, 9, 5, 7, 6, 7, 9, 9, 7, 9, 8, 6, 8, 8, 8,10, 10, 8,10,10, 8, 9,10,10,11,12,10,12,12, 8,10,10, @@ -10257,7 +10274,7 @@ static const long _vq_lengthlist__44p9_p3_0[] = { static const static_codebook _44p9_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p3_0, + (char *)_vq_lengthlist__44p9_p3_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44p9_p3_0, 0 @@ -10269,7 +10286,7 @@ static const long _vq_quantlist__44p9_p3_1[] = { 2, }; -static const long _vq_lengthlist__44p9_p3_1[] = { +static const char _vq_lengthlist__44p9_p3_1[] = { 4, 6, 6, 6, 7, 7, 6, 7, 7, 6, 7, 7, 7, 7, 8, 7, 7, 8, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 8, 9, 9, 8, 8, 8, @@ -10290,7 +10307,7 @@ static const long _vq_lengthlist__44p9_p3_1[] = { static const static_codebook _44p9_p3_1 = { 5, 243, - (long *)_vq_lengthlist__44p9_p3_1, + (char *)_vq_lengthlist__44p9_p3_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44p9_p3_1, 0 @@ -10302,7 +10319,7 @@ static const long _vq_quantlist__44p9_p4_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p4_0[] = { +static const char _vq_lengthlist__44p9_p4_0[] = { 2, 5, 5, 4, 7, 7, 4, 7, 6, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 6, 7, 8, 8, 9, 10, 8,10,10, 8, 9,10,10,11,12,10,11,12, 8,10,10, @@ -10323,7 +10340,7 @@ static const long _vq_lengthlist__44p9_p4_0[] = { static const static_codebook _44p9_p4_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p4_0, + (char *)_vq_lengthlist__44p9_p4_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44p9_p4_0, 0 @@ -10337,7 +10354,7 @@ static const long _vq_quantlist__44p9_p4_1[] = { 4, }; -static const long _vq_lengthlist__44p9_p4_1[] = { +static const char _vq_lengthlist__44p9_p4_1[] = { 6, 8, 8,10, 9, 8, 9, 9,10,10, 8, 9, 9,10,10, 8, 10,10,10,10, 8,10,10,10,10, 9, 9, 9,10,10, 9,10, 10,10,11, 9,10,10,11,11,10,10,10,11,11,10,10,10, @@ -10538,7 +10555,7 @@ static const long _vq_lengthlist__44p9_p4_1[] = { static const static_codebook _44p9_p4_1 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p4_1, + (char *)_vq_lengthlist__44p9_p4_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_p4_1, 0 @@ -10552,7 +10569,7 @@ static const long _vq_quantlist__44p9_p5_0[] = { 4, }; -static const long _vq_lengthlist__44p9_p5_0[] = { +static const char _vq_lengthlist__44p9_p5_0[] = { 4, 6, 6, 9, 9, 6, 7, 8,10,11, 6, 8, 7,10,10, 8, 10,10,12,12, 8,10,10,12,12, 6, 7, 8,10,10, 7, 8, 9,10,11, 8, 9, 9,11,11,10,10,11,12,13,10,11,11, @@ -10753,7 +10770,7 @@ static const long _vq_lengthlist__44p9_p5_0[] = { static const static_codebook _44p9_p5_0 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p5_0, + (char *)_vq_lengthlist__44p9_p5_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44p9_p5_0, 0 @@ -10769,13 +10786,13 @@ static const long _vq_quantlist__44p9_p5_1[] = { 6, }; -static const long _vq_lengthlist__44p9_p5_1[] = { +static const char _vq_lengthlist__44p9_p5_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44p9_p5_1 = { 1, 7, - (long *)_vq_lengthlist__44p9_p5_1, + (char *)_vq_lengthlist__44p9_p5_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44p9_p5_1, 0 @@ -10787,7 +10804,7 @@ static const long _vq_quantlist__44p9_p6_0[] = { 2, }; -static const long _vq_lengthlist__44p9_p6_0[] = { +static const char _vq_lengthlist__44p9_p6_0[] = { 2, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 8, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 8, 5, 7, 8, 8, 9, 10, 8, 9,10, 8, 9,10,10,10,12,10,11,11, 8,10,10, @@ -10808,7 +10825,7 @@ static const long _vq_lengthlist__44p9_p6_0[] = { static const static_codebook _44p9_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44p9_p6_0, + (char *)_vq_lengthlist__44p9_p6_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44p9_p6_0, 0 @@ -10820,7 +10837,7 @@ static const long _vq_quantlist__44p9_p6_1[] = { 2, }; -static const long _vq_lengthlist__44p9_p6_1[] = { +static const char _vq_lengthlist__44p9_p6_1[] = { 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 8, 7, 8, 8, 7, 8, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 8, 8, 8, @@ -10841,7 +10858,7 @@ static const long _vq_lengthlist__44p9_p6_1[] = { static const static_codebook _44p9_p6_1 = { 5, 243, - (long *)_vq_lengthlist__44p9_p6_1, + (char *)_vq_lengthlist__44p9_p6_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44p9_p6_1, 0 @@ -10855,7 +10872,7 @@ static const long _vq_quantlist__44p9_p7_0[] = { 4, }; -static const long _vq_lengthlist__44p9_p7_0[] = { +static const char _vq_lengthlist__44p9_p7_0[] = { 1,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -11056,7 +11073,7 @@ static const long _vq_lengthlist__44p9_p7_0[] = { static const static_codebook _44p9_p7_0 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p7_0, + (char *)_vq_lengthlist__44p9_p7_0, 1, -510105088, 1635281408, 3, 0, (long *)_vq_quantlist__44p9_p7_0, 0 @@ -11070,7 +11087,7 @@ static const long _vq_quantlist__44p9_p7_1[] = { 4, }; -static const long _vq_lengthlist__44p9_p7_1[] = { +static const char _vq_lengthlist__44p9_p7_1[] = { 1, 4, 4,16,16, 4, 9,11,15,16, 4,12, 8,16,16,12, 16,16,16,16,13,16,16,16,16, 5, 8,10,16,16, 9, 9, 14,15,16,12,14,14,16,16,16,16,16,16,16,16,16,16, @@ -11271,7 +11288,7 @@ static const long _vq_lengthlist__44p9_p7_1[] = { static const static_codebook _44p9_p7_1 = { 5, 3125, - (long *)_vq_lengthlist__44p9_p7_1, + (char *)_vq_lengthlist__44p9_p7_1, 1, -514619392, 1630767104, 3, 0, (long *)_vq_quantlist__44p9_p7_1, 0 @@ -11305,14 +11322,14 @@ static const long _vq_quantlist__44p9_p7_2[] = { 24, }; -static const long _vq_lengthlist__44p9_p7_2[] = { +static const char _vq_lengthlist__44p9_p7_2[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9,10,10,10,11,11,11, 12,12,12,13,13,13,13,13,13, }; static const static_codebook _44p9_p7_2 = { 1, 25, - (long *)_vq_lengthlist__44p9_p7_2, + (char *)_vq_lengthlist__44p9_p7_2, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44p9_p7_2, 0 @@ -11346,26 +11363,26 @@ static const long _vq_quantlist__44p9_p7_3[] = { 24, }; -static const long _vq_lengthlist__44p9_p7_3[] = { +static const char _vq_lengthlist__44p9_p7_3[] = { 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44p9_p7_3 = { 1, 25, - (long *)_vq_lengthlist__44p9_p7_3, + (char *)_vq_lengthlist__44p9_p7_3, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44p9_p7_3, 0 }; -static const long _huff_lengthlist__44p9_short[] = { +static const char _huff_lengthlist__44p9_short[] = { 3, 3, 3, 3, 3, 3, 3, 3, }; static const static_codebook _huff_book__44p9_short = { 1, 8, - (long *)_huff_lengthlist__44p9_short, + (char *)_huff_lengthlist__44p9_short, 0, 0, 0, 0, 0, NULL, 0 @@ -11387,7 +11404,7 @@ static const long _vq_quantlist__44pn1_l0_0[] = { 12, }; -static const long _vq_lengthlist__44pn1_l0_0[] = { +static const char _vq_lengthlist__44pn1_l0_0[] = { 1, 3, 3, 8, 8,10,10,10,10,10,10,10,10, 5, 7, 5, 9, 8,10,10,10,10,11,10,11,10, 5, 5, 7, 8, 9,10, 10,11,10,10,11,10,11,10,10,10,11,11,11,11,11,11, @@ -11403,7 +11420,7 @@ static const long _vq_lengthlist__44pn1_l0_0[] = { static const static_codebook _44pn1_l0_0 = { 2, 169, - (long *)_vq_lengthlist__44pn1_l0_0, + (char *)_vq_lengthlist__44pn1_l0_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44pn1_l0_0, 0 @@ -11417,14 +11434,14 @@ static const long _vq_quantlist__44pn1_l0_1[] = { 4, }; -static const long _vq_lengthlist__44pn1_l0_1[] = { +static const char _vq_lengthlist__44pn1_l0_1[] = { 1, 4, 4, 7, 7, 4, 5, 6, 7, 7, 4, 6, 5, 7, 7, 7, 6, 7, 6, 7, 7, 7, 6, 7, 6, }; static const static_codebook _44pn1_l0_1 = { 2, 25, - (long *)_vq_lengthlist__44pn1_l0_1, + (char *)_vq_lengthlist__44pn1_l0_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44pn1_l0_1, 0 @@ -11436,31 +11453,31 @@ static const long _vq_quantlist__44pn1_l1_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_l1_0[] = { +static const char _vq_lengthlist__44pn1_l1_0[] = { 1, 4, 4, 4, 4, 4, 4, 4, 4, }; static const static_codebook _44pn1_l1_0 = { 2, 9, - (long *)_vq_lengthlist__44pn1_l1_0, + (char *)_vq_lengthlist__44pn1_l1_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44pn1_l1_0, 0 }; -static const long _huff_lengthlist__44pn1_lfe[] = { +static const char _huff_lengthlist__44pn1_lfe[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book__44pn1_lfe = { 2, 4, - (long *)_huff_lengthlist__44pn1_lfe, + (char *)_huff_lengthlist__44pn1_lfe, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44pn1_long[] = { +static const char _huff_lengthlist__44pn1_long[] = { 2, 3, 6, 7, 9,13,17, 3, 2, 5, 7, 9,13,17, 6, 5, 5, 6, 9,12,16, 7, 7, 6, 6, 7,10,13,10,10, 9, 7, 6,10,13,13,13,12,10,10,11,15,17,17,17,14,14,15, @@ -11469,7 +11486,7 @@ static const long _huff_lengthlist__44pn1_long[] = { static const static_codebook _huff_book__44pn1_long = { 2, 49, - (long *)_huff_lengthlist__44pn1_long, + (char *)_huff_lengthlist__44pn1_long, 0, 0, 0, 0, 0, NULL, 0 @@ -11481,7 +11498,7 @@ static const long _vq_quantlist__44pn1_p1_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p1_0[] = { +static const char _vq_lengthlist__44pn1_p1_0[] = { 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11502,7 +11519,7 @@ static const long _vq_lengthlist__44pn1_p1_0[] = { static const static_codebook _44pn1_p1_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p1_0, + (char *)_vq_lengthlist__44pn1_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44pn1_p1_0, 0 @@ -11514,7 +11531,7 @@ static const long _vq_quantlist__44pn1_p2_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p2_0[] = { +static const char _vq_lengthlist__44pn1_p2_0[] = { 1, 5, 5, 0, 7, 7, 0, 8, 8, 0, 9, 9, 0,12,12, 0, 8, 8, 0, 9, 9, 0,13,13, 0, 8, 8, 0, 6, 6, 0,11, 11, 0,12,12, 0,12,12, 0,14,14, 0,11,12, 0,12,12, @@ -11535,7 +11552,7 @@ static const long _vq_lengthlist__44pn1_p2_0[] = { static const static_codebook _44pn1_p2_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p2_0, + (char *)_vq_lengthlist__44pn1_p2_0, 1, -533200896, 1614282752, 2, 0, (long *)_vq_quantlist__44pn1_p2_0, 0 @@ -11547,7 +11564,7 @@ static const long _vq_quantlist__44pn1_p2_1[] = { 2, }; -static const long _vq_lengthlist__44pn1_p2_1[] = { +static const char _vq_lengthlist__44pn1_p2_1[] = { 1, 3, 3, 0, 9, 9, 0, 9, 9, 0,10,10, 0, 9, 9, 0, 10,10, 0,10,10, 0,10,10, 0,10,10, 0, 7, 7, 0, 7, 7, 0, 6, 6, 0, 8, 8, 0, 7, 7, 0, 8, 8, 0, 8, 8, @@ -11568,7 +11585,7 @@ static const long _vq_lengthlist__44pn1_p2_1[] = { static const static_codebook _44pn1_p2_1 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p2_1, + (char *)_vq_lengthlist__44pn1_p2_1, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44pn1_p2_1, 0 @@ -11580,7 +11597,7 @@ static const long _vq_quantlist__44pn1_p3_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p3_0[] = { +static const char _vq_lengthlist__44pn1_p3_0[] = { 1, 6, 6, 6, 8, 8, 6, 8, 8, 7, 9, 9,10,11,11, 8, 8, 8, 7, 9, 9,11,12,12, 9, 9, 9, 6, 7, 7,10,11, 11,10,11,11,10,11,11,13,13,13,12,12,12,10,12,11, @@ -11601,7 +11618,7 @@ static const long _vq_lengthlist__44pn1_p3_0[] = { static const static_codebook _44pn1_p3_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p3_0, + (char *)_vq_lengthlist__44pn1_p3_0, 1, -531365888, 1616117760, 2, 0, (long *)_vq_quantlist__44pn1_p3_0, 0 @@ -11615,7 +11632,7 @@ static const long _vq_quantlist__44pn1_p3_1[] = { 4, }; -static const long _vq_lengthlist__44pn1_p3_1[] = { +static const char _vq_lengthlist__44pn1_p3_1[] = { 2, 3, 4, 9, 9,10,12,12,12,11,10,12,12,13,12,11, 13,12,11,11,11,12,12,12,11,11,13,13,13,13,11,12, 12,14,14,12,13,13,13,13,11,13,13,13,13,11,13,13, @@ -11816,7 +11833,7 @@ static const long _vq_lengthlist__44pn1_p3_1[] = { static const static_codebook _44pn1_p3_1 = { 5, 3125, - (long *)_vq_lengthlist__44pn1_p3_1, + (char *)_vq_lengthlist__44pn1_p3_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44pn1_p3_1, 0 @@ -11830,7 +11847,7 @@ static const long _vq_quantlist__44pn1_p4_0[] = { 4, }; -static const long _vq_lengthlist__44pn1_p4_0[] = { +static const char _vq_lengthlist__44pn1_p4_0[] = { 1, 7, 7,14,14, 6, 8, 8,15,16, 7, 8, 8,16,15, 0, 14,14,17,17, 0,14,14,16,16, 7, 9, 9,16,16,10,11, 11,17,18, 9, 8, 8,16,16, 0,14,14,19,19, 0,14,14, @@ -12031,7 +12048,7 @@ static const long _vq_lengthlist__44pn1_p4_0[] = { static const static_codebook _44pn1_p4_0 = { 5, 3125, - (long *)_vq_lengthlist__44pn1_p4_0, + (char *)_vq_lengthlist__44pn1_p4_0, 1, -528744448, 1616642048, 3, 0, (long *)_vq_quantlist__44pn1_p4_0, 0 @@ -12047,13 +12064,13 @@ static const long _vq_quantlist__44pn1_p4_1[] = { 6, }; -static const long _vq_lengthlist__44pn1_p4_1[] = { +static const char _vq_lengthlist__44pn1_p4_1[] = { 2, 3, 3, 3, 3, 3, 3, }; static const static_codebook _44pn1_p4_1 = { 1, 7, - (long *)_vq_lengthlist__44pn1_p4_1, + (char *)_vq_lengthlist__44pn1_p4_1, 1, -533200896, 1611661312, 3, 0, (long *)_vq_quantlist__44pn1_p4_1, 0 @@ -12065,7 +12082,7 @@ static const long _vq_quantlist__44pn1_p5_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p5_0[] = { +static const char _vq_lengthlist__44pn1_p5_0[] = { 1, 7, 7, 6, 8, 8, 7, 8, 8, 7, 9, 9,11,11,11, 9, 8, 8, 7, 9, 9,11,12,11, 9, 9, 9, 6, 7, 7,10,11, 11,10,10,10,10,11,11,15,14,14,12,12,12,11,11,11, @@ -12086,7 +12103,7 @@ static const long _vq_lengthlist__44pn1_p5_0[] = { static const static_codebook _44pn1_p5_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p5_0, + (char *)_vq_lengthlist__44pn1_p5_0, 1, -527106048, 1620377600, 2, 0, (long *)_vq_quantlist__44pn1_p5_0, 0 @@ -12098,7 +12115,7 @@ static const long _vq_quantlist__44pn1_p5_1[] = { 2, }; -static const long _vq_lengthlist__44pn1_p5_1[] = { +static const char _vq_lengthlist__44pn1_p5_1[] = { 2, 6, 7, 6, 8, 8, 7, 7, 8, 7, 8, 8, 9, 9, 9, 8, 7, 7, 8, 8, 8, 9, 9, 9, 9, 8, 8, 6, 6, 6, 9, 7, 7, 9, 7, 7, 9, 8, 8,10, 8, 8,10, 8, 8,10, 8, 8, @@ -12119,7 +12136,7 @@ static const long _vq_lengthlist__44pn1_p5_1[] = { static const static_codebook _44pn1_p5_1 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p5_1, + (char *)_vq_lengthlist__44pn1_p5_1, 1, -530841600, 1616642048, 2, 0, (long *)_vq_quantlist__44pn1_p5_1, 0 @@ -12131,7 +12148,7 @@ static const long _vq_quantlist__44pn1_p6_0[] = { 2, }; -static const long _vq_lengthlist__44pn1_p6_0[] = { +static const char _vq_lengthlist__44pn1_p6_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -12152,7 +12169,7 @@ static const long _vq_lengthlist__44pn1_p6_0[] = { static const static_codebook _44pn1_p6_0 = { 5, 243, - (long *)_vq_lengthlist__44pn1_p6_0, + (char *)_vq_lengthlist__44pn1_p6_0, 1, -516716544, 1630767104, 2, 0, (long *)_vq_quantlist__44pn1_p6_0, 0 @@ -12186,14 +12203,14 @@ static const long _vq_quantlist__44pn1_p6_1[] = { 24, }; -static const long _vq_lengthlist__44pn1_p6_1[] = { +static const char _vq_lengthlist__44pn1_p6_1[] = { 1, 3, 2, 5, 4, 7, 7, 8, 8, 9, 9,10,10,11,11,12, 12,13,13,14,14,15,15,15,15, }; static const static_codebook _44pn1_p6_1 = { 1, 25, - (long *)_vq_lengthlist__44pn1_p6_1, + (char *)_vq_lengthlist__44pn1_p6_1, 1, -518864896, 1620639744, 5, 0, (long *)_vq_quantlist__44pn1_p6_1, 0 @@ -12227,20 +12244,20 @@ static const long _vq_quantlist__44pn1_p6_2[] = { 24, }; -static const long _vq_lengthlist__44pn1_p6_2[] = { +static const char _vq_lengthlist__44pn1_p6_2[] = { 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44pn1_p6_2 = { 1, 25, - (long *)_vq_lengthlist__44pn1_p6_2, + (char *)_vq_lengthlist__44pn1_p6_2, 1, -529006592, 1611661312, 5, 0, (long *)_vq_quantlist__44pn1_p6_2, 0 }; -static const long _huff_lengthlist__44pn1_short[] = { +static const char _huff_lengthlist__44pn1_short[] = { 4, 3, 7, 9,12,16,16, 3, 2, 5, 7,11,14,15, 7, 4, 5, 6, 9,12,15, 8, 5, 5, 5, 8,10,14, 9, 7, 6, 6, 8,10,12,12,10,10, 7, 6, 8,10,15,12,10, 6, 4, 7, @@ -12249,7 +12266,7 @@ static const long _huff_lengthlist__44pn1_short[] = { static const static_codebook _huff_book__44pn1_short = { 2, 49, - (long *)_huff_lengthlist__44pn1_short, + (char *)_huff_lengthlist__44pn1_short, 0, 0, 0, 0, 0, NULL, 0 diff --git a/drivers/vorbis/books/coupled/res_books_stereo.h b/drivers/vorbis/books/coupled/res_books_stereo.h index 5f26215e9f..9a9049f6ed 100644 --- a/drivers/vorbis/books/coupled/res_books_stereo.h +++ b/drivers/vorbis/books/coupled/res_books_stereo.h @@ -11,7 +11,7 @@ ******************************************************************** function: static codebooks autogenerated by huff/huffbuld - last modified: $Id: res_books_stereo.h 17025 2010-03-25 04:56:56Z xiphmont $ + last modified: $Id: res_books_stereo.h 19057 2014-01-22 12:32:31Z xiphmont $ ********************************************************************/ @@ -23,7 +23,7 @@ static const long _vq_quantlist__16c0_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__16c0_s_p1_0[] = { +static const char _vq_lengthlist__16c0_s_p1_0[] = { 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -439,7 +439,7 @@ static const long _vq_lengthlist__16c0_s_p1_0[] = { static const static_codebook _16c0_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__16c0_s_p1_0, + (char *)_vq_lengthlist__16c0_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16c0_s_p1_0, 0 @@ -453,7 +453,7 @@ static const long _vq_quantlist__16c0_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__16c0_s_p3_0[] = { +static const char _vq_lengthlist__16c0_s_p3_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -498,7 +498,7 @@ static const long _vq_lengthlist__16c0_s_p3_0[] = { static const static_codebook _16c0_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__16c0_s_p3_0, + (char *)_vq_lengthlist__16c0_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c0_s_p3_0, 0 @@ -516,7 +516,7 @@ static const long _vq_quantlist__16c0_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__16c0_s_p4_0[] = { +static const char _vq_lengthlist__16c0_s_p4_0[] = { 1, 3, 2, 7, 8, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -527,7 +527,7 @@ static const long _vq_lengthlist__16c0_s_p4_0[] = { static const static_codebook _16c0_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__16c0_s_p4_0, + (char *)_vq_lengthlist__16c0_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c0_s_p4_0, 0 @@ -545,7 +545,7 @@ static const long _vq_quantlist__16c0_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__16c0_s_p5_0[] = { +static const char _vq_lengthlist__16c0_s_p5_0[] = { 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 8, 9, 9, 0, 0, 0, @@ -556,7 +556,7 @@ static const long _vq_lengthlist__16c0_s_p5_0[] = { static const static_codebook _16c0_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__16c0_s_p5_0, + (char *)_vq_lengthlist__16c0_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c0_s_p5_0, 0 @@ -582,7 +582,7 @@ static const long _vq_quantlist__16c0_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__16c0_s_p6_0[] = { +static const char _vq_lengthlist__16c0_s_p6_0[] = { 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11, 11,11, 0, 0, 0, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11, @@ -606,7 +606,7 @@ static const long _vq_lengthlist__16c0_s_p6_0[] = { static const static_codebook _16c0_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__16c0_s_p6_0, + (char *)_vq_lengthlist__16c0_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16c0_s_p6_0, 0 @@ -618,7 +618,7 @@ static const long _vq_quantlist__16c0_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__16c0_s_p7_0[] = { +static const char _vq_lengthlist__16c0_s_p7_0[] = { 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,11,10,10,11, 11,10, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11, 11,11,11,10, 6, 9, 9,11,12,12,11, 9, 9, 6, 9,10, @@ -629,7 +629,7 @@ static const long _vq_lengthlist__16c0_s_p7_0[] = { static const static_codebook _16c0_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__16c0_s_p7_0, + (char *)_vq_lengthlist__16c0_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16c0_s_p7_0, 0 @@ -649,7 +649,7 @@ static const long _vq_quantlist__16c0_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__16c0_s_p7_1[] = { +static const char _vq_lengthlist__16c0_s_p7_1[] = { 1, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10, 6, 7, 8, 8, 8, 8, 9, 8,10,10,10, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, 7, @@ -662,7 +662,7 @@ static const long _vq_lengthlist__16c0_s_p7_1[] = { static const static_codebook _16c0_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16c0_s_p7_1, + (char *)_vq_lengthlist__16c0_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c0_s_p7_1, 0 @@ -684,7 +684,7 @@ static const long _vq_quantlist__16c0_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__16c0_s_p8_0[] = { +static const char _vq_lengthlist__16c0_s_p8_0[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8,10,10, 6, 5, 6, 8, 8, 8, 8, 8, 8, 8, 9,10,10, 7, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8,10,10, 0, 8, 8, 8, 8, 9, 8, 9, 9, @@ -700,7 +700,7 @@ static const long _vq_lengthlist__16c0_s_p8_0[] = { static const static_codebook _16c0_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__16c0_s_p8_0, + (char *)_vq_lengthlist__16c0_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16c0_s_p8_0, 0 @@ -714,14 +714,14 @@ static const long _vq_quantlist__16c0_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__16c0_s_p8_1[] = { +static const char _vq_lengthlist__16c0_s_p8_1[] = { 1, 4, 3, 5, 5, 7, 7, 7, 6, 6, 7, 7, 7, 5, 5, 7, 7, 7, 6, 6, 7, 7, 7, 6, 6, }; static const static_codebook _16c0_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__16c0_s_p8_1, + (char *)_vq_lengthlist__16c0_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c0_s_p8_1, 0 @@ -733,7 +733,7 @@ static const long _vq_quantlist__16c0_s_p9_0[] = { 2, }; -static const long _vq_lengthlist__16c0_s_p9_0[] = { +static const char _vq_lengthlist__16c0_s_p9_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -744,7 +744,7 @@ static const long _vq_lengthlist__16c0_s_p9_0[] = { static const static_codebook _16c0_s_p9_0 = { 4, 81, - (long *)_vq_lengthlist__16c0_s_p9_0, + (char *)_vq_lengthlist__16c0_s_p9_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__16c0_s_p9_0, 0 @@ -768,7 +768,7 @@ static const long _vq_quantlist__16c0_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__16c0_s_p9_1[] = { +static const char _vq_lengthlist__16c0_s_p9_1[] = { 1, 5, 5, 5, 5, 9,11,11,10,10,10,10,10,10,10, 7, 6, 6, 6, 6,10,10,10,10,10,10,10,10,10,10, 7, 6, 6, 6, 6,10, 9,10,10,10,10,10,10,10,10,10, 7, 7, @@ -788,7 +788,7 @@ static const long _vq_lengthlist__16c0_s_p9_1[] = { static const static_codebook _16c0_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__16c0_s_p9_1, + (char *)_vq_lengthlist__16c0_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16c0_s_p9_1, 0 @@ -818,7 +818,7 @@ static const long _vq_quantlist__16c0_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__16c0_s_p9_2[] = { +static const char _vq_lengthlist__16c0_s_p9_2[] = { 1, 5, 5, 7, 8, 8, 7, 9, 9, 9,12,12,11,12,12,10, 10,11,12,12,12,11,12,12, 8, 9, 8, 7, 9,10,10,11, 11,10,11,12,10,12,10,12,12,12,11,12,11, 9, 8, 8, @@ -851,13 +851,13 @@ static const long _vq_lengthlist__16c0_s_p9_2[] = { static const static_codebook _16c0_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__16c0_s_p9_2, + (char *)_vq_lengthlist__16c0_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16c0_s_p9_2, 0 }; -static const long _huff_lengthlist__16c0_s_single[] = { +static const char _huff_lengthlist__16c0_s_single[] = { 3, 4,19, 7, 9, 7, 8,11, 9,12, 4, 1,19, 6, 7, 7, 8,10,11,13,18,18,18,18,18,18,18,18,18,18, 8, 6, 18, 8, 9, 9,11,12,14,18, 9, 6,18, 9, 7, 8, 9,11, @@ -869,13 +869,13 @@ static const long _huff_lengthlist__16c0_s_single[] = { static const static_codebook _huff_book__16c0_s_single = { 2, 100, - (long *)_huff_lengthlist__16c0_s_single, + (char *)_huff_lengthlist__16c0_s_single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16c1_s_long[] = { +static const char _huff_lengthlist__16c1_s_long[] = { 2, 5,20, 7,10, 7, 8,10,11,11, 4, 2,20, 5, 8, 6, 7, 9,10,10,20,20,20,20,19,19,19,19,19,19, 7, 5, 19, 6,10, 7, 9,11,13,17,11, 8,19,10, 7, 7, 8,10, @@ -887,7 +887,7 @@ static const long _huff_lengthlist__16c1_s_long[] = { static const static_codebook _huff_book__16c1_s_long = { 2, 100, - (long *)_huff_lengthlist__16c1_s_long, + (char *)_huff_lengthlist__16c1_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -899,7 +899,7 @@ static const long _vq_quantlist__16c1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__16c1_s_p1_0[] = { +static const char _vq_lengthlist__16c1_s_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1315,7 +1315,7 @@ static const long _vq_lengthlist__16c1_s_p1_0[] = { static const static_codebook _16c1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__16c1_s_p1_0, + (char *)_vq_lengthlist__16c1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16c1_s_p1_0, 0 @@ -1329,7 +1329,7 @@ static const long _vq_quantlist__16c1_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__16c1_s_p3_0[] = { +static const char _vq_lengthlist__16c1_s_p3_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1374,7 +1374,7 @@ static const long _vq_lengthlist__16c1_s_p3_0[] = { static const static_codebook _16c1_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__16c1_s_p3_0, + (char *)_vq_lengthlist__16c1_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c1_s_p3_0, 0 @@ -1392,7 +1392,7 @@ static const long _vq_quantlist__16c1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__16c1_s_p4_0[] = { +static const char _vq_lengthlist__16c1_s_p4_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -1403,7 +1403,7 @@ static const long _vq_lengthlist__16c1_s_p4_0[] = { static const static_codebook _16c1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__16c1_s_p4_0, + (char *)_vq_lengthlist__16c1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c1_s_p4_0, 0 @@ -1421,7 +1421,7 @@ static const long _vq_quantlist__16c1_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__16c1_s_p5_0[] = { +static const char _vq_lengthlist__16c1_s_p5_0[] = { 1, 3, 3, 5, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -1432,7 +1432,7 @@ static const long _vq_lengthlist__16c1_s_p5_0[] = { static const static_codebook _16c1_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__16c1_s_p5_0, + (char *)_vq_lengthlist__16c1_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c1_s_p5_0, 0 @@ -1458,7 +1458,7 @@ static const long _vq_quantlist__16c1_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__16c1_s_p6_0[] = { +static const char _vq_lengthlist__16c1_s_p6_0[] = { 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11,12, 12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -1482,7 +1482,7 @@ static const long _vq_lengthlist__16c1_s_p6_0[] = { static const static_codebook _16c1_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__16c1_s_p6_0, + (char *)_vq_lengthlist__16c1_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16c1_s_p6_0, 0 @@ -1494,7 +1494,7 @@ static const long _vq_quantlist__16c1_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__16c1_s_p7_0[] = { +static const char _vq_lengthlist__16c1_s_p7_0[] = { 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9,10,10, 10, 9, 4, 7, 7,10,10,10,11,10,10, 6,10,10,11,11, 11,11,10,10, 6,10, 9,11,11,11,11,10,10, 6,10,10, @@ -1505,7 +1505,7 @@ static const long _vq_lengthlist__16c1_s_p7_0[] = { static const static_codebook _16c1_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__16c1_s_p7_0, + (char *)_vq_lengthlist__16c1_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16c1_s_p7_0, 0 @@ -1525,7 +1525,7 @@ static const long _vq_quantlist__16c1_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__16c1_s_p7_1[] = { +static const char _vq_lengthlist__16c1_s_p7_1[] = { 2, 3, 3, 5, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -1538,7 +1538,7 @@ static const long _vq_lengthlist__16c1_s_p7_1[] = { static const static_codebook _16c1_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16c1_s_p7_1, + (char *)_vq_lengthlist__16c1_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c1_s_p7_1, 0 @@ -1560,7 +1560,7 @@ static const long _vq_quantlist__16c1_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__16c1_s_p8_0[] = { +static const char _vq_lengthlist__16c1_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5, 7, 8, 8, 9, 8, 8, 9, 9,10,11, 6, 5, 5, 8, 8, 9, 9, 8, 8, 9,10,10,11, 0, 8, 8, 8, 9, 9, 9, 9, 9, @@ -1576,7 +1576,7 @@ static const long _vq_lengthlist__16c1_s_p8_0[] = { static const static_codebook _16c1_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__16c1_s_p8_0, + (char *)_vq_lengthlist__16c1_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16c1_s_p8_0, 0 @@ -1590,14 +1590,14 @@ static const long _vq_quantlist__16c1_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__16c1_s_p8_1[] = { +static const char _vq_lengthlist__16c1_s_p8_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _16c1_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__16c1_s_p8_1, + (char *)_vq_lengthlist__16c1_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c1_s_p8_1, 0 @@ -1619,7 +1619,7 @@ static const long _vq_quantlist__16c1_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__16c1_s_p9_0[] = { +static const char _vq_lengthlist__16c1_s_p9_0[] = { 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -1635,7 +1635,7 @@ static const long _vq_lengthlist__16c1_s_p9_0[] = { static const static_codebook _16c1_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__16c1_s_p9_0, + (char *)_vq_lengthlist__16c1_s_p9_0, 1, -513964032, 1628680192, 4, 0, (long *)_vq_quantlist__16c1_s_p9_0, 0 @@ -1659,7 +1659,7 @@ static const long _vq_quantlist__16c1_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__16c1_s_p9_1[] = { +static const char _vq_lengthlist__16c1_s_p9_1[] = { 1, 4, 4, 4, 4, 8, 8,12,13,14,14,14,14,14,14, 6, 6, 6, 6, 6,10, 9,14,14,14,14,14,14,14,14, 7, 6, 5, 6, 6,10, 9,12,13,13,13,13,13,13,13,13, 7, 7, @@ -1679,7 +1679,7 @@ static const long _vq_lengthlist__16c1_s_p9_1[] = { static const static_codebook _16c1_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__16c1_s_p9_1, + (char *)_vq_lengthlist__16c1_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16c1_s_p9_1, 0 @@ -1709,7 +1709,7 @@ static const long _vq_quantlist__16c1_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__16c1_s_p9_2[] = { +static const char _vq_lengthlist__16c1_s_p9_2[] = { 1, 4, 4, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9,10, 10,10, 9,10,10,11,12,12, 8, 8, 8, 8, 9, 9, 9, 9, 10,10,10,10,10,11,11,10,12,11,11,13,11, 7, 7, 8, @@ -1742,13 +1742,13 @@ static const long _vq_lengthlist__16c1_s_p9_2[] = { static const static_codebook _16c1_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__16c1_s_p9_2, + (char *)_vq_lengthlist__16c1_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16c1_s_p9_2, 0 }; -static const long _huff_lengthlist__16c1_s_short[] = { +static const char _huff_lengthlist__16c1_s_short[] = { 5, 6,17, 8,12, 9,10,10,12,13, 5, 2,17, 4, 9, 5, 7, 8,11,13,16,16,16,16,16,16,16,16,16,16, 6, 4, 16, 5,10, 5, 7,10,14,16,13, 9,16,11, 8, 7, 8, 9, @@ -1760,13 +1760,13 @@ static const long _huff_lengthlist__16c1_s_short[] = { static const static_codebook _huff_book__16c1_s_short = { 2, 100, - (long *)_huff_lengthlist__16c1_s_short, + (char *)_huff_lengthlist__16c1_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16c2_s_long[] = { +static const char _huff_lengthlist__16c2_s_long[] = { 4, 7, 9, 9, 9, 8, 9,10,13,16, 5, 4, 5, 6, 7, 7, 8, 9,12,16, 6, 5, 5, 5, 7, 7, 9,10,12,15, 7, 6, 5, 4, 5, 6, 8, 9,10,13, 8, 7, 7, 5, 5, 5, 7, 9, @@ -1778,7 +1778,7 @@ static const long _huff_lengthlist__16c2_s_long[] = { static const static_codebook _huff_book__16c2_s_long = { 2, 100, - (long *)_huff_lengthlist__16c2_s_long, + (char *)_huff_lengthlist__16c2_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -1790,7 +1790,7 @@ static const long _vq_quantlist__16c2_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__16c2_s_p1_0[] = { +static const char _vq_lengthlist__16c2_s_p1_0[] = { 1, 3, 3, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1801,7 +1801,7 @@ static const long _vq_lengthlist__16c2_s_p1_0[] = { static const static_codebook _16c2_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__16c2_s_p1_0, + (char *)_vq_lengthlist__16c2_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16c2_s_p1_0, 0 @@ -1815,7 +1815,7 @@ static const long _vq_quantlist__16c2_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__16c2_s_p2_0[] = { +static const char _vq_lengthlist__16c2_s_p2_0[] = { 2, 4, 4, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 4, 4, 4, 8, 7, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, @@ -1860,7 +1860,7 @@ static const long _vq_lengthlist__16c2_s_p2_0[] = { static const static_codebook _16c2_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__16c2_s_p2_0, + (char *)_vq_lengthlist__16c2_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c2_s_p2_0, 0 @@ -1878,7 +1878,7 @@ static const long _vq_quantlist__16c2_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__16c2_s_p3_0[] = { +static const char _vq_lengthlist__16c2_s_p3_0[] = { 1, 3, 3, 5, 5, 7, 7, 8, 8, 0, 0, 0, 6, 6, 8, 8, 9, 9, 0, 0, 0, 6, 6, 8, 8, 9, 9, 0, 0, 0, 7, 7, 8, 9,10,10, 0, 0, 0, 7, 7, 9, 9,10,10, 0, 0, 0, @@ -1889,7 +1889,7 @@ static const long _vq_lengthlist__16c2_s_p3_0[] = { static const static_codebook _16c2_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__16c2_s_p3_0, + (char *)_vq_lengthlist__16c2_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16c2_s_p3_0, 0 @@ -1915,7 +1915,7 @@ static const long _vq_quantlist__16c2_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__16c2_s_p4_0[] = { +static const char _vq_lengthlist__16c2_s_p4_0[] = { 2, 3, 3, 5, 5, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 11,10, 0, 0, 0, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, @@ -1939,7 +1939,7 @@ static const long _vq_lengthlist__16c2_s_p4_0[] = { static const static_codebook _16c2_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__16c2_s_p4_0, + (char *)_vq_lengthlist__16c2_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16c2_s_p4_0, 0 @@ -1951,7 +1951,7 @@ static const long _vq_quantlist__16c2_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__16c2_s_p5_0[] = { +static const char _vq_lengthlist__16c2_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6,10,11,10,10, 10,11, 4, 6, 6,10,10,11,10,11,10, 5,10,10, 9,12, 11,10,12,12, 7,10,10,12,12,12,12,13,13, 7,11,10, @@ -1962,7 +1962,7 @@ static const long _vq_lengthlist__16c2_s_p5_0[] = { static const static_codebook _16c2_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__16c2_s_p5_0, + (char *)_vq_lengthlist__16c2_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16c2_s_p5_0, 0 @@ -1982,7 +1982,7 @@ static const long _vq_quantlist__16c2_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__16c2_s_p5_1[] = { +static const char _vq_lengthlist__16c2_s_p5_1[] = { 2, 3, 3, 6, 6, 6, 6, 7, 7, 7, 7,11,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9,11,11,11, 6, @@ -1995,7 +1995,7 @@ static const long _vq_lengthlist__16c2_s_p5_1[] = { static const static_codebook _16c2_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__16c2_s_p5_1, + (char *)_vq_lengthlist__16c2_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c2_s_p5_1, 0 @@ -2017,7 +2017,7 @@ static const long _vq_quantlist__16c2_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__16c2_s_p6_0[] = { +static const char _vq_lengthlist__16c2_s_p6_0[] = { 1, 4, 4, 6, 6, 8, 7, 8, 8, 9, 9,10,10, 5, 5, 5, 7, 7, 9, 9, 9, 9,11,11,12,12, 6, 5, 5, 7, 7, 9, 9,10, 9,11,11,12,12, 0, 7, 7, 7, 7, 9, 9,10,10, @@ -2033,7 +2033,7 @@ static const long _vq_lengthlist__16c2_s_p6_0[] = { static const static_codebook _16c2_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__16c2_s_p6_0, + (char *)_vq_lengthlist__16c2_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16c2_s_p6_0, 0 @@ -2047,14 +2047,14 @@ static const long _vq_quantlist__16c2_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__16c2_s_p6_1[] = { +static const char _vq_lengthlist__16c2_s_p6_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _16c2_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__16c2_s_p6_1, + (char *)_vq_lengthlist__16c2_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16c2_s_p6_1, 0 @@ -2076,7 +2076,7 @@ static const long _vq_quantlist__16c2_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__16c2_s_p7_0[] = { +static const char _vq_lengthlist__16c2_s_p7_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 8,10, 9,10,10, 5, 5, 5, 7, 7, 9, 9,10,10,11,10,12,11, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,20, 7, 7, 7, 7, 9, 9,10,10, @@ -2092,7 +2092,7 @@ static const long _vq_lengthlist__16c2_s_p7_0[] = { static const static_codebook _16c2_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__16c2_s_p7_0, + (char *)_vq_lengthlist__16c2_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__16c2_s_p7_0, 0 @@ -2112,7 +2112,7 @@ static const long _vq_quantlist__16c2_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__16c2_s_p7_1[] = { +static const char _vq_lengthlist__16c2_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 6, 7, 7, 7, 7, 7, 8, 8, 9, 9, 9, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, @@ -2125,7 +2125,7 @@ static const long _vq_lengthlist__16c2_s_p7_1[] = { static const static_codebook _16c2_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16c2_s_p7_1, + (char *)_vq_lengthlist__16c2_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16c2_s_p7_1, 0 @@ -2149,7 +2149,7 @@ static const long _vq_quantlist__16c2_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__16c2_s_p8_0[] = { +static const char _vq_lengthlist__16c2_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10, 6, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 8, 7, 9, 9, 8, 8, 9, 9,10,10,11,11,20, 8, 8, @@ -2169,7 +2169,7 @@ static const long _vq_lengthlist__16c2_s_p8_0[] = { static const static_codebook _16c2_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__16c2_s_p8_0, + (char *)_vq_lengthlist__16c2_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16c2_s_p8_0, 0 @@ -2199,7 +2199,7 @@ static const long _vq_quantlist__16c2_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__16c2_s_p8_1[] = { +static const char _vq_lengthlist__16c2_s_p8_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,11,11,11, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,11,10, 7, 7, 8, @@ -2232,7 +2232,7 @@ static const long _vq_lengthlist__16c2_s_p8_1[] = { static const static_codebook _16c2_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__16c2_s_p8_1, + (char *)_vq_lengthlist__16c2_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16c2_s_p8_1, 0 @@ -2258,7 +2258,7 @@ static const long _vq_quantlist__16c2_s_p9_0[] = { 16, }; -static const long _vq_lengthlist__16c2_s_p9_0[] = { +static const char _vq_lengthlist__16c2_s_p9_0[] = { 1, 4, 3,10, 8,10,10,10,10,10,10,10,10,10,10,10, 10, 6,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 10,10, 6,10, 9,10,10,10,10,10,10,10,10,10,10,10, @@ -2282,7 +2282,7 @@ static const long _vq_lengthlist__16c2_s_p9_0[] = { static const static_codebook _16c2_s_p9_0 = { 2, 289, - (long *)_vq_lengthlist__16c2_s_p9_0, + (char *)_vq_lengthlist__16c2_s_p9_0, 1, -509798400, 1631393792, 5, 0, (long *)_vq_quantlist__16c2_s_p9_0, 0 @@ -2310,7 +2310,7 @@ static const long _vq_quantlist__16c2_s_p9_1[] = { 18, }; -static const long _vq_lengthlist__16c2_s_p9_1[] = { +static const char _vq_lengthlist__16c2_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 7, 8, 8,10, 9,11,10,13, 11,14,13, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8,11, 9, 13,11,14,12,14,13, 5, 6, 6, 8, 8, 8, 8, 8, 8, 9, @@ -2338,7 +2338,7 @@ static const long _vq_lengthlist__16c2_s_p9_1[] = { static const static_codebook _16c2_s_p9_1 = { 2, 361, - (long *)_vq_lengthlist__16c2_s_p9_1, + (char *)_vq_lengthlist__16c2_s_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__16c2_s_p9_1, 0 @@ -2396,7 +2396,7 @@ static const long _vq_quantlist__16c2_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__16c2_s_p9_2[] = { +static const char _vq_lengthlist__16c2_s_p9_2[] = { 2, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -2405,13 +2405,13 @@ static const long _vq_lengthlist__16c2_s_p9_2[] = { static const static_codebook _16c2_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__16c2_s_p9_2, + (char *)_vq_lengthlist__16c2_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__16c2_s_p9_2, 0 }; -static const long _huff_lengthlist__16c2_s_short[] = { +static const char _huff_lengthlist__16c2_s_short[] = { 7,10,12,11,12,13,15,16,18,15,10, 8, 8, 8, 9,10, 12,13,14,17,10, 7, 7, 7, 7, 8,10,12,15,18,10, 7, 7, 5, 5, 6, 8,10,13,15,10, 7, 6, 5, 4, 4, 6, 9, @@ -2423,7 +2423,7 @@ static const long _huff_lengthlist__16c2_s_short[] = { static const static_codebook _huff_book__16c2_s_short = { 2, 100, - (long *)_huff_lengthlist__16c2_s_short, + (char *)_huff_lengthlist__16c2_s_short, 0, 0, 0, 0, 0, NULL, 0 @@ -2435,7 +2435,7 @@ static const long _vq_quantlist__8c0_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__8c0_s_p1_0[] = { +static const char _vq_lengthlist__8c0_s_p1_0[] = { 1, 5, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2851,7 +2851,7 @@ static const long _vq_lengthlist__8c0_s_p1_0[] = { static const static_codebook _8c0_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__8c0_s_p1_0, + (char *)_vq_lengthlist__8c0_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8c0_s_p1_0, 0 @@ -2865,7 +2865,7 @@ static const long _vq_quantlist__8c0_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__8c0_s_p3_0[] = { +static const char _vq_lengthlist__8c0_s_p3_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2910,7 +2910,7 @@ static const long _vq_lengthlist__8c0_s_p3_0[] = { static const static_codebook _8c0_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__8c0_s_p3_0, + (char *)_vq_lengthlist__8c0_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c0_s_p3_0, 0 @@ -2928,7 +2928,7 @@ static const long _vq_quantlist__8c0_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__8c0_s_p4_0[] = { +static const char _vq_lengthlist__8c0_s_p4_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -2939,7 +2939,7 @@ static const long _vq_lengthlist__8c0_s_p4_0[] = { static const static_codebook _8c0_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__8c0_s_p4_0, + (char *)_vq_lengthlist__8c0_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c0_s_p4_0, 0 @@ -2957,7 +2957,7 @@ static const long _vq_quantlist__8c0_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__8c0_s_p5_0[] = { +static const char _vq_lengthlist__8c0_s_p5_0[] = { 1, 3, 3, 5, 5, 7, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 8, 0, 0, 0, 7, 7, 7, 7, 8, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0, 8, 8, 8, 8, 9, 9, 0, 0, 0, @@ -2968,7 +2968,7 @@ static const long _vq_lengthlist__8c0_s_p5_0[] = { static const static_codebook _8c0_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__8c0_s_p5_0, + (char *)_vq_lengthlist__8c0_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c0_s_p5_0, 0 @@ -2994,7 +2994,7 @@ static const long _vq_quantlist__8c0_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__8c0_s_p6_0[] = { +static const char _vq_lengthlist__8c0_s_p6_0[] = { 1, 3, 3, 6, 6, 8, 8, 9, 9, 8, 8,10, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 11,12, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -3018,7 +3018,7 @@ static const long _vq_lengthlist__8c0_s_p6_0[] = { static const static_codebook _8c0_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__8c0_s_p6_0, + (char *)_vq_lengthlist__8c0_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__8c0_s_p6_0, 0 @@ -3030,7 +3030,7 @@ static const long _vq_quantlist__8c0_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__8c0_s_p7_0[] = { +static const char _vq_lengthlist__8c0_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,11, 9,10,12, 9,10, 4, 7, 7,10,10,10,11, 9, 9, 6,11,10,11,11, 12,11,11,11, 6,10,10,11,11,12,11,10,10, 6, 9,10, @@ -3041,7 +3041,7 @@ static const long _vq_lengthlist__8c0_s_p7_0[] = { static const static_codebook _8c0_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__8c0_s_p7_0, + (char *)_vq_lengthlist__8c0_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__8c0_s_p7_0, 0 @@ -3061,7 +3061,7 @@ static const long _vq_quantlist__8c0_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__8c0_s_p7_1[] = { +static const char _vq_lengthlist__8c0_s_p7_1[] = { 1, 3, 3, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, 7, 7, 8, 8, 9, 9, 9, 9,10,10, 9, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, 8, 8, 9, 9, 9, 9, 9, 9,10,10,10, 8, @@ -3074,7 +3074,7 @@ static const long _vq_lengthlist__8c0_s_p7_1[] = { static const static_codebook _8c0_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__8c0_s_p7_1, + (char *)_vq_lengthlist__8c0_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8c0_s_p7_1, 0 @@ -3096,7 +3096,7 @@ static const long _vq_quantlist__8c0_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__8c0_s_p8_0[] = { +static const char _vq_lengthlist__8c0_s_p8_0[] = { 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 6, 6, 7, 7, 8, 8, 7, 7, 8, 9,10,10, 7, 6, 6, 7, 7, 8, 7, 7, 7, 9, 9,10,12, 0, 8, 8, 8, 8, 8, 9, 8, 8, @@ -3112,7 +3112,7 @@ static const long _vq_lengthlist__8c0_s_p8_0[] = { static const static_codebook _8c0_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__8c0_s_p8_0, + (char *)_vq_lengthlist__8c0_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__8c0_s_p8_0, 0 @@ -3126,14 +3126,14 @@ static const long _vq_quantlist__8c0_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__8c0_s_p8_1[] = { +static const char _vq_lengthlist__8c0_s_p8_1[] = { 1, 3, 4, 5, 5, 7, 6, 6, 6, 5, 7, 7, 7, 6, 6, 7, 7, 7, 6, 6, 7, 7, 7, 6, 6, }; static const static_codebook _8c0_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__8c0_s_p8_1, + (char *)_vq_lengthlist__8c0_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c0_s_p8_1, 0 @@ -3145,7 +3145,7 @@ static const long _vq_quantlist__8c0_s_p9_0[] = { 2, }; -static const long _vq_lengthlist__8c0_s_p9_0[] = { +static const char _vq_lengthlist__8c0_s_p9_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -3156,7 +3156,7 @@ static const long _vq_lengthlist__8c0_s_p9_0[] = { static const static_codebook _8c0_s_p9_0 = { 4, 81, - (long *)_vq_lengthlist__8c0_s_p9_0, + (char *)_vq_lengthlist__8c0_s_p9_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__8c0_s_p9_0, 0 @@ -3180,7 +3180,7 @@ static const long _vq_quantlist__8c0_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__8c0_s_p9_1[] = { +static const char _vq_lengthlist__8c0_s_p9_1[] = { 1, 4, 4, 5, 5,10, 8,11,11,11,11,11,11,11,11, 6, 6, 6, 7, 6,11,10,11,11,11,11,11,11,11,11, 7, 5, 6, 6, 6, 8, 7,11,11,11,11,11,11,11,11,11, 7, 8, @@ -3200,7 +3200,7 @@ static const long _vq_lengthlist__8c0_s_p9_1[] = { static const static_codebook _8c0_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__8c0_s_p9_1, + (char *)_vq_lengthlist__8c0_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__8c0_s_p9_1, 0 @@ -3230,7 +3230,7 @@ static const long _vq_quantlist__8c0_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__8c0_s_p9_2[] = { +static const char _vq_lengthlist__8c0_s_p9_2[] = { 1, 5, 5, 7, 7, 8, 7, 8, 8,10,10, 9, 9,10,10,10, 11,11,10,12,11,12,12,12, 9, 8, 8, 8, 8, 8, 9,10, 10,10,10,11,11,11,10,11,11,12,12,11,12, 8, 8, 7, @@ -3263,13 +3263,13 @@ static const long _vq_lengthlist__8c0_s_p9_2[] = { static const static_codebook _8c0_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__8c0_s_p9_2, + (char *)_vq_lengthlist__8c0_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__8c0_s_p9_2, 0 }; -static const long _huff_lengthlist__8c0_s_single[] = { +static const char _huff_lengthlist__8c0_s_single[] = { 4, 5,18, 7,10, 6, 7, 8, 9,10, 5, 2,18, 5, 7, 5, 6, 7, 8,11,17,17,17,17,17,17,17,17,17,17, 7, 4, 17, 6, 9, 6, 8,10,12,15,11, 7,17, 9, 6, 6, 7, 9, @@ -3281,7 +3281,7 @@ static const long _huff_lengthlist__8c0_s_single[] = { static const static_codebook _huff_book__8c0_s_single = { 2, 100, - (long *)_huff_lengthlist__8c0_s_single, + (char *)_huff_lengthlist__8c0_s_single, 0, 0, 0, 0, 0, NULL, 0 @@ -3293,7 +3293,7 @@ static const long _vq_quantlist__8c1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__8c1_s_p1_0[] = { +static const char _vq_lengthlist__8c1_s_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3709,7 +3709,7 @@ static const long _vq_lengthlist__8c1_s_p1_0[] = { static const static_codebook _8c1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__8c1_s_p1_0, + (char *)_vq_lengthlist__8c1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8c1_s_p1_0, 0 @@ -3723,7 +3723,7 @@ static const long _vq_quantlist__8c1_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__8c1_s_p3_0[] = { +static const char _vq_lengthlist__8c1_s_p3_0[] = { 2, 4, 4, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3768,7 +3768,7 @@ static const long _vq_lengthlist__8c1_s_p3_0[] = { static const static_codebook _8c1_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__8c1_s_p3_0, + (char *)_vq_lengthlist__8c1_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c1_s_p3_0, 0 @@ -3786,7 +3786,7 @@ static const long _vq_quantlist__8c1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__8c1_s_p4_0[] = { +static const char _vq_lengthlist__8c1_s_p4_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -3797,7 +3797,7 @@ static const long _vq_lengthlist__8c1_s_p4_0[] = { static const static_codebook _8c1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__8c1_s_p4_0, + (char *)_vq_lengthlist__8c1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c1_s_p4_0, 0 @@ -3815,7 +3815,7 @@ static const long _vq_quantlist__8c1_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__8c1_s_p5_0[] = { +static const char _vq_lengthlist__8c1_s_p5_0[] = { 1, 3, 3, 4, 5, 6, 6, 8, 8, 0, 0, 0, 8, 8, 7, 7, 9, 9, 0, 0, 0, 8, 8, 7, 7, 9, 9, 0, 0, 0, 9,10, 8, 8, 9, 9, 0, 0, 0,10,10, 8, 8, 9, 9, 0, 0, 0, @@ -3826,7 +3826,7 @@ static const long _vq_lengthlist__8c1_s_p5_0[] = { static const static_codebook _8c1_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__8c1_s_p5_0, + (char *)_vq_lengthlist__8c1_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8c1_s_p5_0, 0 @@ -3852,7 +3852,7 @@ static const long _vq_quantlist__8c1_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__8c1_s_p6_0[] = { +static const char _vq_lengthlist__8c1_s_p6_0[] = { 1, 3, 3, 5, 5, 8, 8, 8, 8, 9, 9,10,10,11,11,11, 11, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 0, 0, 8, 8, 8, 8, 9, 9, 9, 9,10,10,11, @@ -3876,7 +3876,7 @@ static const long _vq_lengthlist__8c1_s_p6_0[] = { static const static_codebook _8c1_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__8c1_s_p6_0, + (char *)_vq_lengthlist__8c1_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__8c1_s_p6_0, 0 @@ -3888,7 +3888,7 @@ static const long _vq_quantlist__8c1_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__8c1_s_p7_0[] = { +static const char _vq_lengthlist__8c1_s_p7_0[] = { 1, 4, 4, 6, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10, 9, 9, 5, 7, 7,10, 9, 9,10, 9, 9, 6,10,10,10,10, 10,11,10,10, 6, 9, 9,10, 9,10,11,10,10, 6, 9, 9, @@ -3899,7 +3899,7 @@ static const long _vq_lengthlist__8c1_s_p7_0[] = { static const static_codebook _8c1_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__8c1_s_p7_0, + (char *)_vq_lengthlist__8c1_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__8c1_s_p7_0, 0 @@ -3919,7 +3919,7 @@ static const long _vq_quantlist__8c1_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__8c1_s_p7_1[] = { +static const char _vq_lengthlist__8c1_s_p7_1[] = { 2, 3, 3, 5, 5, 7, 7, 7, 7, 7, 7,10,10, 9, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -3932,7 +3932,7 @@ static const long _vq_lengthlist__8c1_s_p7_1[] = { static const static_codebook _8c1_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__8c1_s_p7_1, + (char *)_vq_lengthlist__8c1_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8c1_s_p7_1, 0 @@ -3954,7 +3954,7 @@ static const long _vq_quantlist__8c1_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__8c1_s_p8_0[] = { +static const char _vq_lengthlist__8c1_s_p8_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -3970,7 +3970,7 @@ static const long _vq_lengthlist__8c1_s_p8_0[] = { static const static_codebook _8c1_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__8c1_s_p8_0, + (char *)_vq_lengthlist__8c1_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__8c1_s_p8_0, 0 @@ -3984,14 +3984,14 @@ static const long _vq_quantlist__8c1_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__8c1_s_p8_1[] = { +static const char _vq_lengthlist__8c1_s_p8_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _8c1_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__8c1_s_p8_1, + (char *)_vq_lengthlist__8c1_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8c1_s_p8_1, 0 @@ -4013,7 +4013,7 @@ static const long _vq_quantlist__8c1_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__8c1_s_p9_0[] = { +static const char _vq_lengthlist__8c1_s_p9_0[] = { 1, 3, 3,10,10,10,10,10,10,10,10,10,10, 5, 6, 6, 10,10,10,10,10,10,10,10,10,10, 6, 7, 8,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -4029,7 +4029,7 @@ static const long _vq_lengthlist__8c1_s_p9_0[] = { static const static_codebook _8c1_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__8c1_s_p9_0, + (char *)_vq_lengthlist__8c1_s_p9_0, 1, -513964032, 1628680192, 4, 0, (long *)_vq_quantlist__8c1_s_p9_0, 0 @@ -4053,7 +4053,7 @@ static const long _vq_quantlist__8c1_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__8c1_s_p9_1[] = { +static const char _vq_lengthlist__8c1_s_p9_1[] = { 1, 4, 4, 5, 5, 7, 7, 9, 9,11,11,12,12,13,13, 6, 5, 5, 6, 6, 9, 9,10,10,12,12,12,13,15,14, 6, 5, 5, 7, 7, 9, 9,10,10,12,12,12,13,14,13,17, 7, 7, @@ -4073,7 +4073,7 @@ static const long _vq_lengthlist__8c1_s_p9_1[] = { static const static_codebook _8c1_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__8c1_s_p9_1, + (char *)_vq_lengthlist__8c1_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__8c1_s_p9_1, 0 @@ -4103,7 +4103,7 @@ static const long _vq_quantlist__8c1_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__8c1_s_p9_2[] = { +static const char _vq_lengthlist__8c1_s_p9_2[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9,11,11,12, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10,10,10,10,10,11,11,11, 7, 7, 7, @@ -4136,13 +4136,13 @@ static const long _vq_lengthlist__8c1_s_p9_2[] = { static const static_codebook _8c1_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__8c1_s_p9_2, + (char *)_vq_lengthlist__8c1_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__8c1_s_p9_2, 0 }; -static const long _huff_lengthlist__8c1_s_single[] = { +static const char _huff_lengthlist__8c1_s_single[] = { 4, 6,18, 8,11, 8, 8, 9, 9,10, 4, 4,18, 5, 9, 5, 6, 7, 8,10,18,18,18,18,17,17,17,17,17,17, 7, 5, 17, 6,11, 6, 7, 8, 9,12,12, 9,17,12, 8, 8, 9,10, @@ -4154,13 +4154,13 @@ static const long _huff_lengthlist__8c1_s_single[] = { static const static_codebook _huff_book__8c1_s_single = { 2, 100, - (long *)_huff_lengthlist__8c1_s_single, + (char *)_huff_lengthlist__8c1_s_single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c2_s_long[] = { +static const char _huff_lengthlist__44c2_s_long[] = { 6, 6,12,10,10,10, 9,10,12,12, 6, 1,10, 5, 6, 6, 7, 9,11,14,12, 9, 8,11, 7, 8, 9,11,13,15,10, 5, 12, 7, 8, 7, 9,12,14,15,10, 6, 7, 8, 5, 6, 7, 9, @@ -4172,7 +4172,7 @@ static const long _huff_lengthlist__44c2_s_long[] = { static const static_codebook _huff_book__44c2_s_long = { 2, 100, - (long *)_huff_lengthlist__44c2_s_long, + (char *)_huff_lengthlist__44c2_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -4184,7 +4184,7 @@ static const long _vq_quantlist__44c2_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c2_s_p1_0[] = { +static const char _vq_lengthlist__44c2_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4600,7 +4600,7 @@ static const long _vq_lengthlist__44c2_s_p1_0[] = { static const static_codebook _44c2_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c2_s_p1_0, + (char *)_vq_lengthlist__44c2_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c2_s_p1_0, 0 @@ -4614,7 +4614,7 @@ static const long _vq_quantlist__44c2_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c2_s_p2_0[] = { +static const char _vq_lengthlist__44c2_s_p2_0[] = { 1, 4, 4, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8, 8, 0, 0, 0, 8, 8, 0, 0, 0, 9, 9, 0, 0, 0, 0, 0, @@ -4659,7 +4659,7 @@ static const long _vq_lengthlist__44c2_s_p2_0[] = { static const static_codebook _44c2_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c2_s_p2_0, + (char *)_vq_lengthlist__44c2_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c2_s_p2_0, 0 @@ -4673,7 +4673,7 @@ static const long _vq_quantlist__44c2_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c2_s_p3_0[] = { +static const char _vq_lengthlist__44c2_s_p3_0[] = { 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -4718,7 +4718,7 @@ static const long _vq_lengthlist__44c2_s_p3_0[] = { static const static_codebook _44c2_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c2_s_p3_0, + (char *)_vq_lengthlist__44c2_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c2_s_p3_0, 0 @@ -4736,7 +4736,7 @@ static const long _vq_quantlist__44c2_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c2_s_p4_0[] = { +static const char _vq_lengthlist__44c2_s_p4_0[] = { 1, 3, 3, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 6, 6, 6, 6, 0, 0, 0, 0, 0, 7, 7, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, @@ -4747,7 +4747,7 @@ static const long _vq_lengthlist__44c2_s_p4_0[] = { static const static_codebook _44c2_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c2_s_p4_0, + (char *)_vq_lengthlist__44c2_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c2_s_p4_0, 0 @@ -4765,7 +4765,7 @@ static const long _vq_quantlist__44c2_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c2_s_p5_0[] = { +static const char _vq_lengthlist__44c2_s_p5_0[] = { 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 7, 7, 7, 7, 7, 7, 9, 9, 0, 7, 7, 7, 7, 7, 7, 9, 9, 0, 8, 8, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, @@ -4776,7 +4776,7 @@ static const long _vq_lengthlist__44c2_s_p5_0[] = { static const static_codebook _44c2_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c2_s_p5_0, + (char *)_vq_lengthlist__44c2_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c2_s_p5_0, 0 @@ -4802,7 +4802,7 @@ static const long _vq_quantlist__44c2_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c2_s_p6_0[] = { +static const char _vq_lengthlist__44c2_s_p6_0[] = { 1, 4, 3, 6, 6, 8, 8, 9, 9, 9, 9, 9, 9,10,10,11, 11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,11, 0, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -4826,7 +4826,7 @@ static const long _vq_lengthlist__44c2_s_p6_0[] = { static const static_codebook _44c2_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c2_s_p6_0, + (char *)_vq_lengthlist__44c2_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c2_s_p6_0, 0 @@ -4838,7 +4838,7 @@ static const long _vq_quantlist__44c2_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c2_s_p7_0[] = { +static const char _vq_lengthlist__44c2_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,10, 9, 9, 7,10,10,11,10, 11,11,10,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -4849,7 +4849,7 @@ static const long _vq_lengthlist__44c2_s_p7_0[] = { static const static_codebook _44c2_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c2_s_p7_0, + (char *)_vq_lengthlist__44c2_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c2_s_p7_0, 0 @@ -4869,7 +4869,7 @@ static const long _vq_quantlist__44c2_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c2_s_p7_1[] = { +static const char _vq_lengthlist__44c2_s_p7_1[] = { 2, 3, 4, 6, 6, 7, 7, 7, 7, 7, 7, 9, 7, 7, 6, 6, 7, 7, 8, 8, 8, 8, 9, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -4882,7 +4882,7 @@ static const long _vq_lengthlist__44c2_s_p7_1[] = { static const static_codebook _44c2_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c2_s_p7_1, + (char *)_vq_lengthlist__44c2_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c2_s_p7_1, 0 @@ -4904,7 +4904,7 @@ static const long _vq_quantlist__44c2_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c2_s_p8_0[] = { +static const char _vq_lengthlist__44c2_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -4920,7 +4920,7 @@ static const long _vq_lengthlist__44c2_s_p8_0[] = { static const static_codebook _44c2_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c2_s_p8_0, + (char *)_vq_lengthlist__44c2_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c2_s_p8_0, 0 @@ -4934,14 +4934,14 @@ static const long _vq_quantlist__44c2_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c2_s_p8_1[] = { +static const char _vq_lengthlist__44c2_s_p8_1[] = { 2, 4, 4, 5, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c2_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c2_s_p8_1, + (char *)_vq_lengthlist__44c2_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c2_s_p8_1, 0 @@ -4963,7 +4963,7 @@ static const long _vq_quantlist__44c2_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c2_s_p9_0[] = { +static const char _vq_lengthlist__44c2_s_p9_0[] = { 1, 5, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8, 11,11,11,11,11,11,11,11,11,11, 2, 8, 7,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -4979,7 +4979,7 @@ static const long _vq_lengthlist__44c2_s_p9_0[] = { static const static_codebook _44c2_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c2_s_p9_0, + (char *)_vq_lengthlist__44c2_s_p9_0, 1, -514541568, 1627103232, 4, 0, (long *)_vq_quantlist__44c2_s_p9_0, 0 @@ -5001,7 +5001,7 @@ static const long _vq_quantlist__44c2_s_p9_1[] = { 12, }; -static const long _vq_lengthlist__44c2_s_p9_1[] = { +static const char _vq_lengthlist__44c2_s_p9_1[] = { 1, 4, 4, 6, 6, 7, 6, 8, 8,10, 9,10,10, 6, 5, 5, 7, 7, 8, 7,10, 9,11,11,12,13, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,13,13,18, 8, 8, 8, 8, 9, 9,10,10, @@ -5017,7 +5017,7 @@ static const long _vq_lengthlist__44c2_s_p9_1[] = { static const static_codebook _44c2_s_p9_1 = { 2, 169, - (long *)_vq_lengthlist__44c2_s_p9_1, + (char *)_vq_lengthlist__44c2_s_p9_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c2_s_p9_1, 0 @@ -5043,7 +5043,7 @@ static const long _vq_quantlist__44c2_s_p9_2[] = { 16, }; -static const long _vq_lengthlist__44c2_s_p9_2[] = { +static const char _vq_lengthlist__44c2_s_p9_2[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, @@ -5067,13 +5067,13 @@ static const long _vq_lengthlist__44c2_s_p9_2[] = { static const static_codebook _44c2_s_p9_2 = { 2, 289, - (long *)_vq_lengthlist__44c2_s_p9_2, + (char *)_vq_lengthlist__44c2_s_p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c2_s_p9_2, 0 }; -static const long _huff_lengthlist__44c2_s_short[] = { +static const char _huff_lengthlist__44c2_s_short[] = { 11, 9,13,12,12,11,12,12,13,15, 8, 2,11, 4, 8, 5, 7,10,12,15,13, 7,10, 9, 8, 8,10,13,17,17,11, 4, 12, 5, 9, 5, 8,11,14,16,12, 6, 8, 7, 6, 6, 8,11, @@ -5085,13 +5085,13 @@ static const long _huff_lengthlist__44c2_s_short[] = { static const static_codebook _huff_book__44c2_s_short = { 2, 100, - (long *)_huff_lengthlist__44c2_s_short, + (char *)_huff_lengthlist__44c2_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c3_s_long[] = { +static const char _huff_lengthlist__44c3_s_long[] = { 5, 6,11,11,11,11,10,10,12,11, 5, 2,11, 5, 6, 6, 7, 9,11,13,13,10, 7,11, 6, 7, 8, 9,10,12,11, 5, 11, 6, 8, 7, 9,11,14,15,11, 6, 6, 8, 4, 5, 7, 8, @@ -5103,7 +5103,7 @@ static const long _huff_lengthlist__44c3_s_long[] = { static const static_codebook _huff_book__44c3_s_long = { 2, 100, - (long *)_huff_lengthlist__44c3_s_long, + (char *)_huff_lengthlist__44c3_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -5115,7 +5115,7 @@ static const long _vq_quantlist__44c3_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c3_s_p1_0[] = { +static const char _vq_lengthlist__44c3_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5531,7 +5531,7 @@ static const long _vq_lengthlist__44c3_s_p1_0[] = { static const static_codebook _44c3_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c3_s_p1_0, + (char *)_vq_lengthlist__44c3_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c3_s_p1_0, 0 @@ -5545,7 +5545,7 @@ static const long _vq_quantlist__44c3_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c3_s_p2_0[] = { +static const char _vq_lengthlist__44c3_s_p2_0[] = { 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 7, 8, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, @@ -5590,7 +5590,7 @@ static const long _vq_lengthlist__44c3_s_p2_0[] = { static const static_codebook _44c3_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c3_s_p2_0, + (char *)_vq_lengthlist__44c3_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c3_s_p2_0, 0 @@ -5604,7 +5604,7 @@ static const long _vq_quantlist__44c3_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c3_s_p3_0[] = { +static const char _vq_lengthlist__44c3_s_p3_0[] = { 2, 4, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5649,7 +5649,7 @@ static const long _vq_lengthlist__44c3_s_p3_0[] = { static const static_codebook _44c3_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c3_s_p3_0, + (char *)_vq_lengthlist__44c3_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c3_s_p3_0, 0 @@ -5667,7 +5667,7 @@ static const long _vq_quantlist__44c3_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c3_s_p4_0[] = { +static const char _vq_lengthlist__44c3_s_p4_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, @@ -5678,7 +5678,7 @@ static const long _vq_lengthlist__44c3_s_p4_0[] = { static const static_codebook _44c3_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c3_s_p4_0, + (char *)_vq_lengthlist__44c3_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c3_s_p4_0, 0 @@ -5696,7 +5696,7 @@ static const long _vq_quantlist__44c3_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c3_s_p5_0[] = { +static const char _vq_lengthlist__44c3_s_p5_0[] = { 1, 3, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 7, 8, 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -5707,7 +5707,7 @@ static const long _vq_lengthlist__44c3_s_p5_0[] = { static const static_codebook _44c3_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c3_s_p5_0, + (char *)_vq_lengthlist__44c3_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c3_s_p5_0, 0 @@ -5733,7 +5733,7 @@ static const long _vq_quantlist__44c3_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c3_s_p6_0[] = { +static const char _vq_lengthlist__44c3_s_p6_0[] = { 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 10, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -5757,7 +5757,7 @@ static const long _vq_lengthlist__44c3_s_p6_0[] = { static const static_codebook _44c3_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c3_s_p6_0, + (char *)_vq_lengthlist__44c3_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c3_s_p6_0, 0 @@ -5769,7 +5769,7 @@ static const long _vq_quantlist__44c3_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c3_s_p7_0[] = { +static const char _vq_lengthlist__44c3_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 10,12,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -5780,7 +5780,7 @@ static const long _vq_lengthlist__44c3_s_p7_0[] = { static const static_codebook _44c3_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c3_s_p7_0, + (char *)_vq_lengthlist__44c3_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c3_s_p7_0, 0 @@ -5800,7 +5800,7 @@ static const long _vq_quantlist__44c3_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c3_s_p7_1[] = { +static const char _vq_lengthlist__44c3_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -5813,7 +5813,7 @@ static const long _vq_lengthlist__44c3_s_p7_1[] = { static const static_codebook _44c3_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c3_s_p7_1, + (char *)_vq_lengthlist__44c3_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c3_s_p7_1, 0 @@ -5835,7 +5835,7 @@ static const long _vq_quantlist__44c3_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c3_s_p8_0[] = { +static const char _vq_lengthlist__44c3_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -5851,7 +5851,7 @@ static const long _vq_lengthlist__44c3_s_p8_0[] = { static const static_codebook _44c3_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c3_s_p8_0, + (char *)_vq_lengthlist__44c3_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c3_s_p8_0, 0 @@ -5865,14 +5865,14 @@ static const long _vq_quantlist__44c3_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c3_s_p8_1[] = { +static const char _vq_lengthlist__44c3_s_p8_1[] = { 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c3_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c3_s_p8_1, + (char *)_vq_lengthlist__44c3_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c3_s_p8_1, 0 @@ -5894,7 +5894,7 @@ static const long _vq_quantlist__44c3_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c3_s_p9_0[] = { +static const char _vq_lengthlist__44c3_s_p9_0[] = { 1, 4, 4,12,12,12,12,12,12,12,12,12,12, 4, 9, 8, 12,12,12,12,12,12,12,12,12,12, 2, 9, 7,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -5910,7 +5910,7 @@ static const long _vq_lengthlist__44c3_s_p9_0[] = { static const static_codebook _44c3_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c3_s_p9_0, + (char *)_vq_lengthlist__44c3_s_p9_0, 1, -514332672, 1627381760, 4, 0, (long *)_vq_quantlist__44c3_s_p9_0, 0 @@ -5934,7 +5934,7 @@ static const long _vq_quantlist__44c3_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__44c3_s_p9_1[] = { +static const char _vq_lengthlist__44c3_s_p9_1[] = { 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 9,10,10,10,10, 6, 5, 5, 7, 7, 8, 8,10, 8,11,10,12,12,13,13, 6, 5, 5, 7, 7, 8, 8,10, 9,11,11,12,12,13,12,18, 8, 8, @@ -5954,7 +5954,7 @@ static const long _vq_lengthlist__44c3_s_p9_1[] = { static const static_codebook _44c3_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__44c3_s_p9_1, + (char *)_vq_lengthlist__44c3_s_p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44c3_s_p9_1, 0 @@ -5980,7 +5980,7 @@ static const long _vq_quantlist__44c3_s_p9_2[] = { 16, }; -static const long _vq_lengthlist__44c3_s_p9_2[] = { +static const char _vq_lengthlist__44c3_s_p9_2[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, @@ -6004,13 +6004,13 @@ static const long _vq_lengthlist__44c3_s_p9_2[] = { static const static_codebook _44c3_s_p9_2 = { 2, 289, - (long *)_vq_lengthlist__44c3_s_p9_2, + (char *)_vq_lengthlist__44c3_s_p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c3_s_p9_2, 0 }; -static const long _huff_lengthlist__44c3_s_short[] = { +static const char _huff_lengthlist__44c3_s_short[] = { 10, 9,13,11,14,10,12,13,13,14, 7, 2,12, 5,10, 5, 7,10,12,14,12, 6, 9, 8, 7, 7, 9,11,13,16,10, 4, 12, 5,10, 6, 8,12,14,16,12, 6, 8, 7, 6, 5, 7,11, @@ -6022,13 +6022,13 @@ static const long _huff_lengthlist__44c3_s_short[] = { static const static_codebook _huff_book__44c3_s_short = { 2, 100, - (long *)_huff_lengthlist__44c3_s_short, + (char *)_huff_lengthlist__44c3_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c4_s_long[] = { +static const char _huff_lengthlist__44c4_s_long[] = { 4, 7,11,11,11,11,10,11,12,11, 5, 2,11, 5, 6, 6, 7, 9,11,12,11, 9, 6,10, 6, 7, 8, 9,10,11,11, 5, 11, 7, 8, 8, 9,11,13,14,11, 6, 5, 8, 4, 5, 7, 8, @@ -6040,7 +6040,7 @@ static const long _huff_lengthlist__44c4_s_long[] = { static const static_codebook _huff_book__44c4_s_long = { 2, 100, - (long *)_huff_lengthlist__44c4_s_long, + (char *)_huff_lengthlist__44c4_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -6052,7 +6052,7 @@ static const long _vq_quantlist__44c4_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c4_s_p1_0[] = { +static const char _vq_lengthlist__44c4_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6468,7 +6468,7 @@ static const long _vq_lengthlist__44c4_s_p1_0[] = { static const static_codebook _44c4_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c4_s_p1_0, + (char *)_vq_lengthlist__44c4_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c4_s_p1_0, 0 @@ -6482,7 +6482,7 @@ static const long _vq_quantlist__44c4_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c4_s_p2_0[] = { +static const char _vq_lengthlist__44c4_s_p2_0[] = { 2, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 5, 6, 6, 0, 0, 0, 7, 7, 0, 0, 0, 7, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, @@ -6527,7 +6527,7 @@ static const long _vq_lengthlist__44c4_s_p2_0[] = { static const static_codebook _44c4_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c4_s_p2_0, + (char *)_vq_lengthlist__44c4_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c4_s_p2_0, 0 @@ -6541,7 +6541,7 @@ static const long _vq_quantlist__44c4_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c4_s_p3_0[] = { +static const char _vq_lengthlist__44c4_s_p3_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -6586,7 +6586,7 @@ static const long _vq_lengthlist__44c4_s_p3_0[] = { static const static_codebook _44c4_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c4_s_p3_0, + (char *)_vq_lengthlist__44c4_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c4_s_p3_0, 0 @@ -6604,7 +6604,7 @@ static const long _vq_quantlist__44c4_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c4_s_p4_0[] = { +static const char _vq_lengthlist__44c4_s_p4_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, @@ -6615,7 +6615,7 @@ static const long _vq_lengthlist__44c4_s_p4_0[] = { static const static_codebook _44c4_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c4_s_p4_0, + (char *)_vq_lengthlist__44c4_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c4_s_p4_0, 0 @@ -6633,7 +6633,7 @@ static const long _vq_quantlist__44c4_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c4_s_p5_0[] = { +static const char _vq_lengthlist__44c4_s_p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 5, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10, 9, 0, 0, 0, @@ -6644,7 +6644,7 @@ static const long _vq_lengthlist__44c4_s_p5_0[] = { static const static_codebook _44c4_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c4_s_p5_0, + (char *)_vq_lengthlist__44c4_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c4_s_p5_0, 0 @@ -6670,7 +6670,7 @@ static const long _vq_quantlist__44c4_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c4_s_p6_0[] = { +static const char _vq_lengthlist__44c4_s_p6_0[] = { 2, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11, 11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, 11,11, 0, 4, 4, 7, 6, 8, 8, 9, 9, 9, 9,10,10,11, @@ -6694,7 +6694,7 @@ static const long _vq_lengthlist__44c4_s_p6_0[] = { static const static_codebook _44c4_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c4_s_p6_0, + (char *)_vq_lengthlist__44c4_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c4_s_p6_0, 0 @@ -6706,7 +6706,7 @@ static const long _vq_quantlist__44c4_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c4_s_p7_0[] = { +static const char _vq_lengthlist__44c4_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -6717,7 +6717,7 @@ static const long _vq_lengthlist__44c4_s_p7_0[] = { static const static_codebook _44c4_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c4_s_p7_0, + (char *)_vq_lengthlist__44c4_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c4_s_p7_0, 0 @@ -6737,7 +6737,7 @@ static const long _vq_quantlist__44c4_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c4_s_p7_1[] = { +static const char _vq_lengthlist__44c4_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -6750,7 +6750,7 @@ static const long _vq_lengthlist__44c4_s_p7_1[] = { static const static_codebook _44c4_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c4_s_p7_1, + (char *)_vq_lengthlist__44c4_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c4_s_p7_1, 0 @@ -6772,7 +6772,7 @@ static const long _vq_quantlist__44c4_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c4_s_p8_0[] = { +static const char _vq_lengthlist__44c4_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -6788,7 +6788,7 @@ static const long _vq_lengthlist__44c4_s_p8_0[] = { static const static_codebook _44c4_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c4_s_p8_0, + (char *)_vq_lengthlist__44c4_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c4_s_p8_0, 0 @@ -6802,14 +6802,14 @@ static const long _vq_quantlist__44c4_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c4_s_p8_1[] = { +static const char _vq_lengthlist__44c4_s_p8_1[] = { 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 5, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c4_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c4_s_p8_1, + (char *)_vq_lengthlist__44c4_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c4_s_p8_1, 0 @@ -6831,7 +6831,7 @@ static const long _vq_quantlist__44c4_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c4_s_p9_0[] = { +static const char _vq_lengthlist__44c4_s_p9_0[] = { 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 4, 7, 7, 12,12,12,12,12,12,12,12,12,12, 3, 8, 8,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -6847,7 +6847,7 @@ static const long _vq_lengthlist__44c4_s_p9_0[] = { static const static_codebook _44c4_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c4_s_p9_0, + (char *)_vq_lengthlist__44c4_s_p9_0, 1, -513964032, 1628680192, 4, 0, (long *)_vq_quantlist__44c4_s_p9_0, 0 @@ -6871,7 +6871,7 @@ static const long _vq_quantlist__44c4_s_p9_1[] = { 14, }; -static const long _vq_lengthlist__44c4_s_p9_1[] = { +static const char _vq_lengthlist__44c4_s_p9_1[] = { 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,10,10, 6, 5, 5, 7, 7, 9, 8,10, 9,11,10,12,12,13,13, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,12,13,19, 8, 8, @@ -6891,7 +6891,7 @@ static const long _vq_lengthlist__44c4_s_p9_1[] = { static const static_codebook _44c4_s_p9_1 = { 2, 225, - (long *)_vq_lengthlist__44c4_s_p9_1, + (char *)_vq_lengthlist__44c4_s_p9_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c4_s_p9_1, 0 @@ -6921,7 +6921,7 @@ static const long _vq_quantlist__44c4_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__44c4_s_p9_2[] = { +static const char _vq_lengthlist__44c4_s_p9_2[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9,11, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10,11, 6, 6, 7, 7, 8, @@ -6954,13 +6954,13 @@ static const long _vq_lengthlist__44c4_s_p9_2[] = { static const static_codebook _44c4_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__44c4_s_p9_2, + (char *)_vq_lengthlist__44c4_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c4_s_p9_2, 0 }; -static const long _huff_lengthlist__44c4_s_short[] = { +static const char _huff_lengthlist__44c4_s_short[] = { 4, 7,14,10,15,10,12,15,16,15, 4, 2,11, 5,10, 6, 8,11,14,14,14,10, 7,11, 6, 8,10,11,13,15, 9, 4, 11, 5, 9, 6, 9,12,14,15,14, 9, 6, 9, 4, 5, 7,10, @@ -6972,13 +6972,13 @@ static const long _huff_lengthlist__44c4_s_short[] = { static const static_codebook _huff_book__44c4_s_short = { 2, 100, - (long *)_huff_lengthlist__44c4_s_short, + (char *)_huff_lengthlist__44c4_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c5_s_long[] = { +static const char _huff_lengthlist__44c5_s_long[] = { 3, 8, 9,13,10,12,12,12,12,12, 6, 4, 6, 8, 6, 8, 10,10,11,12, 8, 5, 4,10, 4, 7, 8, 9,10,11,13, 8, 10, 8, 9, 9,11,12,13,14,10, 6, 4, 9, 3, 5, 6, 8, @@ -6990,7 +6990,7 @@ static const long _huff_lengthlist__44c5_s_long[] = { static const static_codebook _huff_book__44c5_s_long = { 2, 100, - (long *)_huff_lengthlist__44c5_s_long, + (char *)_huff_lengthlist__44c5_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -7002,7 +7002,7 @@ static const long _vq_quantlist__44c5_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c5_s_p1_0[] = { +static const char _vq_lengthlist__44c5_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 4, 7, 7, 0, 0, 0, 0, 0, 0, 4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7418,7 +7418,7 @@ static const long _vq_lengthlist__44c5_s_p1_0[] = { static const static_codebook _44c5_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c5_s_p1_0, + (char *)_vq_lengthlist__44c5_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c5_s_p1_0, 0 @@ -7432,7 +7432,7 @@ static const long _vq_quantlist__44c5_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c5_s_p2_0[] = { +static const char _vq_lengthlist__44c5_s_p2_0[] = { 2, 4, 4, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 0, 0, 0, 8, 7, 0, 0, 0, 0, 0, 0, 0, 4, 6, 6, 0, 0, 0, 8, 8, 0, 0, 0, 8, 7, 0, 0, 0,10,10, 0, 0, 0, 0, 0, @@ -7477,7 +7477,7 @@ static const long _vq_lengthlist__44c5_s_p2_0[] = { static const static_codebook _44c5_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c5_s_p2_0, + (char *)_vq_lengthlist__44c5_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c5_s_p2_0, 0 @@ -7491,7 +7491,7 @@ static const long _vq_quantlist__44c5_s_p3_0[] = { 4, }; -static const long _vq_lengthlist__44c5_s_p3_0[] = { +static const char _vq_lengthlist__44c5_s_p3_0[] = { 2, 4, 3, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -7536,7 +7536,7 @@ static const long _vq_lengthlist__44c5_s_p3_0[] = { static const static_codebook _44c5_s_p3_0 = { 4, 625, - (long *)_vq_lengthlist__44c5_s_p3_0, + (char *)_vq_lengthlist__44c5_s_p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c5_s_p3_0, 0 @@ -7554,7 +7554,7 @@ static const long _vq_quantlist__44c5_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c5_s_p4_0[] = { +static const char _vq_lengthlist__44c5_s_p4_0[] = { 2, 3, 3, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 4, 4, 6, 6, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, @@ -7565,7 +7565,7 @@ static const long _vq_lengthlist__44c5_s_p4_0[] = { static const static_codebook _44c5_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c5_s_p4_0, + (char *)_vq_lengthlist__44c5_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c5_s_p4_0, 0 @@ -7583,7 +7583,7 @@ static const long _vq_quantlist__44c5_s_p5_0[] = { 8, }; -static const long _vq_lengthlist__44c5_s_p5_0[] = { +static const char _vq_lengthlist__44c5_s_p5_0[] = { 2, 4, 3, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 6, 7, 7, 9, 9, 0, 0, 0, @@ -7594,7 +7594,7 @@ static const long _vq_lengthlist__44c5_s_p5_0[] = { static const static_codebook _44c5_s_p5_0 = { 2, 81, - (long *)_vq_lengthlist__44c5_s_p5_0, + (char *)_vq_lengthlist__44c5_s_p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c5_s_p5_0, 0 @@ -7620,7 +7620,7 @@ static const long _vq_quantlist__44c5_s_p6_0[] = { 16, }; -static const long _vq_lengthlist__44c5_s_p6_0[] = { +static const char _vq_lengthlist__44c5_s_p6_0[] = { 2, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10,11, 11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11, @@ -7644,7 +7644,7 @@ static const long _vq_lengthlist__44c5_s_p6_0[] = { static const static_codebook _44c5_s_p6_0 = { 2, 289, - (long *)_vq_lengthlist__44c5_s_p6_0, + (char *)_vq_lengthlist__44c5_s_p6_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c5_s_p6_0, 0 @@ -7656,7 +7656,7 @@ static const long _vq_quantlist__44c5_s_p7_0[] = { 2, }; -static const long _vq_lengthlist__44c5_s_p7_0[] = { +static const char _vq_lengthlist__44c5_s_p7_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 10,11,11,11, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -7667,7 +7667,7 @@ static const long _vq_lengthlist__44c5_s_p7_0[] = { static const static_codebook _44c5_s_p7_0 = { 4, 81, - (long *)_vq_lengthlist__44c5_s_p7_0, + (char *)_vq_lengthlist__44c5_s_p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c5_s_p7_0, 0 @@ -7687,7 +7687,7 @@ static const long _vq_quantlist__44c5_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c5_s_p7_1[] = { +static const char _vq_lengthlist__44c5_s_p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -7700,7 +7700,7 @@ static const long _vq_lengthlist__44c5_s_p7_1[] = { static const static_codebook _44c5_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c5_s_p7_1, + (char *)_vq_lengthlist__44c5_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c5_s_p7_1, 0 @@ -7722,7 +7722,7 @@ static const long _vq_quantlist__44c5_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c5_s_p8_0[] = { +static const char _vq_lengthlist__44c5_s_p8_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 9,10,10,10,10, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -7738,7 +7738,7 @@ static const long _vq_lengthlist__44c5_s_p8_0[] = { static const static_codebook _44c5_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c5_s_p8_0, + (char *)_vq_lengthlist__44c5_s_p8_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c5_s_p8_0, 0 @@ -7752,14 +7752,14 @@ static const long _vq_quantlist__44c5_s_p8_1[] = { 4, }; -static const long _vq_lengthlist__44c5_s_p8_1[] = { +static const char _vq_lengthlist__44c5_s_p8_1[] = { 2, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 4, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c5_s_p8_1 = { 2, 25, - (long *)_vq_lengthlist__44c5_s_p8_1, + (char *)_vq_lengthlist__44c5_s_p8_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c5_s_p8_1, 0 @@ -7783,7 +7783,7 @@ static const long _vq_quantlist__44c5_s_p9_0[] = { 14, }; -static const long _vq_lengthlist__44c5_s_p9_0[] = { +static const char _vq_lengthlist__44c5_s_p9_0[] = { 1, 3, 3,13,13,13,13,13,13,13,13,13,13,13,13, 4, 7, 7,13,13,13,13,13,13,13,13,13,13,13,13, 3, 8, 6,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, @@ -7803,7 +7803,7 @@ static const long _vq_lengthlist__44c5_s_p9_0[] = { static const static_codebook _44c5_s_p9_0 = { 2, 225, - (long *)_vq_lengthlist__44c5_s_p9_0, + (char *)_vq_lengthlist__44c5_s_p9_0, 1, -512522752, 1628852224, 4, 0, (long *)_vq_quantlist__44c5_s_p9_0, 0 @@ -7829,7 +7829,7 @@ static const long _vq_quantlist__44c5_s_p9_1[] = { 16, }; -static const long _vq_lengthlist__44c5_s_p9_1[] = { +static const char _vq_lengthlist__44c5_s_p9_1[] = { 1, 4, 4, 5, 5, 7, 7, 9, 8,10, 9,10,10,11,10,11, 11, 6, 5, 5, 7, 7, 8, 9,10,10,11,10,12,11,12,11, 13,12, 6, 5, 5, 7, 7, 9, 9,10,10,11,11,12,12,13, @@ -7853,7 +7853,7 @@ static const long _vq_lengthlist__44c5_s_p9_1[] = { static const static_codebook _44c5_s_p9_1 = { 2, 289, - (long *)_vq_lengthlist__44c5_s_p9_1, + (char *)_vq_lengthlist__44c5_s_p9_1, 1, -520814592, 1620377600, 5, 0, (long *)_vq_quantlist__44c5_s_p9_1, 0 @@ -7883,7 +7883,7 @@ static const long _vq_quantlist__44c5_s_p9_2[] = { 20, }; -static const long _vq_lengthlist__44c5_s_p9_2[] = { +static const char _vq_lengthlist__44c5_s_p9_2[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9,11, 5, 6, 7, 7, 8, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,11, 5, 5, 7, 7, 7, @@ -7916,13 +7916,13 @@ static const long _vq_lengthlist__44c5_s_p9_2[] = { static const static_codebook _44c5_s_p9_2 = { 2, 441, - (long *)_vq_lengthlist__44c5_s_p9_2, + (char *)_vq_lengthlist__44c5_s_p9_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c5_s_p9_2, 0 }; -static const long _huff_lengthlist__44c5_s_short[] = { +static const char _huff_lengthlist__44c5_s_short[] = { 5, 8,10,14,11,11,12,16,15,17, 5, 5, 7, 9, 7, 8, 10,13,17,17, 7, 5, 5,10, 5, 7, 8,11,13,15,10, 8, 10, 8, 8, 8,11,15,18,18, 8, 5, 5, 8, 3, 4, 6,10, @@ -7934,13 +7934,13 @@ static const long _huff_lengthlist__44c5_s_short[] = { static const static_codebook _huff_book__44c5_s_short = { 2, 100, - (long *)_huff_lengthlist__44c5_s_short, + (char *)_huff_lengthlist__44c5_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c6_s_long[] = { +static const char _huff_lengthlist__44c6_s_long[] = { 3, 8,11,13,14,14,13,13,16,14, 6, 3, 4, 7, 9, 9, 10,11,14,13,10, 4, 3, 5, 7, 7, 9,10,13,15,12, 7, 4, 4, 6, 6, 8,10,13,15,12, 8, 6, 6, 6, 6, 8,10, @@ -7952,7 +7952,7 @@ static const long _huff_lengthlist__44c6_s_long[] = { static const static_codebook _huff_book__44c6_s_long = { 2, 100, - (long *)_huff_lengthlist__44c6_s_long, + (char *)_huff_lengthlist__44c6_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -7964,7 +7964,7 @@ static const long _vq_quantlist__44c6_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c6_s_p1_0[] = { +static const char _vq_lengthlist__44c6_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0, 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, @@ -7974,7 +7974,7 @@ static const long _vq_lengthlist__44c6_s_p1_0[] = { }; static const static_codebook _44c6_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c6_s_p1_0, + (char *)_vq_lengthlist__44c6_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c6_s_p1_0, 0 @@ -7988,7 +7988,7 @@ static const long _vq_quantlist__44c6_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c6_s_p2_0[] = { +static const char _vq_lengthlist__44c6_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, @@ -8033,7 +8033,7 @@ static const long _vq_lengthlist__44c6_s_p2_0[] = { static const static_codebook _44c6_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c6_s_p2_0, + (char *)_vq_lengthlist__44c6_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c6_s_p2_0, 0 @@ -8051,7 +8051,7 @@ static const long _vq_quantlist__44c6_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c6_s_p3_0[] = { +static const char _vq_lengthlist__44c6_s_p3_0[] = { 2, 3, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9,10, 0, 4, 4, 6, 6, 7, 7,10, 9, 0, 5, 5, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 6, 8, 8,10,10, 0, 0, 0, @@ -8062,7 +8062,7 @@ static const long _vq_lengthlist__44c6_s_p3_0[] = { static const static_codebook _44c6_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c6_s_p3_0, + (char *)_vq_lengthlist__44c6_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c6_s_p3_0, 0 @@ -8088,7 +8088,7 @@ static const long _vq_quantlist__44c6_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c6_s_p4_0[] = { +static const char _vq_lengthlist__44c6_s_p4_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9,10,10, 10, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, @@ -8112,7 +8112,7 @@ static const long _vq_lengthlist__44c6_s_p4_0[] = { static const static_codebook _44c6_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c6_s_p4_0, + (char *)_vq_lengthlist__44c6_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c6_s_p4_0, 0 @@ -8124,7 +8124,7 @@ static const long _vq_quantlist__44c6_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c6_s_p5_0[] = { +static const char _vq_lengthlist__44c6_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 6, 9, 9,10,10, 10, 9, 4, 6, 6, 9,10, 9,10, 9,10, 6, 9, 9,10,12, 11,10,11,11, 7,10, 9,11,12,12,12,12,12, 7,10,10, @@ -8135,7 +8135,7 @@ static const long _vq_lengthlist__44c6_s_p5_0[] = { static const static_codebook _44c6_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c6_s_p5_0, + (char *)_vq_lengthlist__44c6_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c6_s_p5_0, 0 @@ -8155,7 +8155,7 @@ static const long _vq_quantlist__44c6_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c6_s_p5_1[] = { +static const char _vq_lengthlist__44c6_s_p5_1[] = { 3, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,11, 6, 6, 6, 6, 8, 8, 8, 8, 9, 9,11,11,11, 6, @@ -8168,7 +8168,7 @@ static const long _vq_lengthlist__44c6_s_p5_1[] = { static const static_codebook _44c6_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c6_s_p5_1, + (char *)_vq_lengthlist__44c6_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c6_s_p5_1, 0 @@ -8190,7 +8190,7 @@ static const long _vq_quantlist__44c6_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p6_0[] = { +static const char _vq_lengthlist__44c6_s_p6_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8,10, 9,10,10, 6, 5, 5, 7, 7, 9, 9, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 9, 9,10, 9,11,10,11,11, 0, 6, 6, 7, 7, 9, 9,10,10, @@ -8206,7 +8206,7 @@ static const long _vq_lengthlist__44c6_s_p6_0[] = { static const static_codebook _44c6_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p6_0, + (char *)_vq_lengthlist__44c6_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c6_s_p6_0, 0 @@ -8220,14 +8220,14 @@ static const long _vq_quantlist__44c6_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c6_s_p6_1[] = { +static const char _vq_lengthlist__44c6_s_p6_1[] = { 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c6_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c6_s_p6_1, + (char *)_vq_lengthlist__44c6_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c6_s_p6_1, 0 @@ -8249,7 +8249,7 @@ static const long _vq_quantlist__44c6_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p7_0[] = { +static const char _vq_lengthlist__44c6_s_p7_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8,10,10,11,10, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,12,11, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,12,11,21, 7, 7, 7, 7, 9, 9,10,10, @@ -8265,7 +8265,7 @@ static const long _vq_lengthlist__44c6_s_p7_0[] = { static const static_codebook _44c6_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p7_0, + (char *)_vq_lengthlist__44c6_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c6_s_p7_0, 0 @@ -8285,7 +8285,7 @@ static const long _vq_quantlist__44c6_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c6_s_p7_1[] = { +static const char _vq_lengthlist__44c6_s_p7_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 5, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 9, 6, 6, 7, 7, 7, 7, 8, 7, 7, 8, 9, 9, 9, 7, @@ -8298,7 +8298,7 @@ static const long _vq_lengthlist__44c6_s_p7_1[] = { static const static_codebook _44c6_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c6_s_p7_1, + (char *)_vq_lengthlist__44c6_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c6_s_p7_1, 0 @@ -8322,7 +8322,7 @@ static const long _vq_quantlist__44c6_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c6_s_p8_0[] = { +static const char _vq_lengthlist__44c6_s_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 7, 7, 8, 7, 9, 8,10, 9, 6, 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,11,10,11,10, 6, 5, 5, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11,11,18, 8, 8, @@ -8342,7 +8342,7 @@ static const long _vq_lengthlist__44c6_s_p8_0[] = { static const static_codebook _44c6_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c6_s_p8_0, + (char *)_vq_lengthlist__44c6_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c6_s_p8_0, 0 @@ -8372,7 +8372,7 @@ static const long _vq_quantlist__44c6_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c6_s_p8_1[] = { +static const char _vq_lengthlist__44c6_s_p8_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -8405,7 +8405,7 @@ static const long _vq_lengthlist__44c6_s_p8_1[] = { static const static_codebook _44c6_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c6_s_p8_1, + (char *)_vq_lengthlist__44c6_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c6_s_p8_1, 0 @@ -8427,7 +8427,7 @@ static const long _vq_quantlist__44c6_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p9_0[] = { +static const char _vq_lengthlist__44c6_s_p9_0[] = { 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 7, 7, 11,11,11,11,11,11,11,11,11,11, 5, 8, 9,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -8443,7 +8443,7 @@ static const long _vq_lengthlist__44c6_s_p9_0[] = { static const static_codebook _44c6_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p9_0, + (char *)_vq_lengthlist__44c6_s_p9_0, 1, -511845376, 1630791680, 4, 0, (long *)_vq_quantlist__44c6_s_p9_0, 0 @@ -8465,7 +8465,7 @@ static const long _vq_quantlist__44c6_s_p9_1[] = { 12, }; -static const long _vq_lengthlist__44c6_s_p9_1[] = { +static const char _vq_lengthlist__44c6_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6, 8, 8, 8, 8, 8, 7, 9, 8,10,10, 5, 6, 6, 8, 8, 9, 9, 8, 8,10,10,10,10,16, 9, 9, 9, 9, 9, 9, 9, 8, @@ -8481,7 +8481,7 @@ static const long _vq_lengthlist__44c6_s_p9_1[] = { static const static_codebook _44c6_s_p9_1 = { 2, 169, - (long *)_vq_lengthlist__44c6_s_p9_1, + (char *)_vq_lengthlist__44c6_s_p9_1, 1, -518889472, 1622704128, 4, 0, (long *)_vq_quantlist__44c6_s_p9_1, 0 @@ -8539,7 +8539,7 @@ static const long _vq_quantlist__44c6_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c6_s_p9_2[] = { +static const char _vq_lengthlist__44c6_s_p9_2[] = { 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -8548,13 +8548,13 @@ static const long _vq_lengthlist__44c6_s_p9_2[] = { static const static_codebook _44c6_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c6_s_p9_2, + (char *)_vq_lengthlist__44c6_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c6_s_p9_2, 0 }; -static const long _huff_lengthlist__44c6_s_short[] = { +static const char _huff_lengthlist__44c6_s_short[] = { 3, 9,11,11,13,14,19,17,17,19, 5, 4, 5, 8,10,10, 13,16,18,19, 7, 4, 4, 5, 8, 9,12,14,17,19, 8, 6, 5, 5, 7, 7,10,13,16,18,10, 8, 7, 6, 5, 5, 8,11, @@ -8566,13 +8566,13 @@ static const long _huff_lengthlist__44c6_s_short[] = { static const static_codebook _huff_book__44c6_s_short = { 2, 100, - (long *)_huff_lengthlist__44c6_s_short, + (char *)_huff_lengthlist__44c6_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c7_s_long[] = { +static const char _huff_lengthlist__44c7_s_long[] = { 3, 8,11,13,15,14,14,13,15,14, 6, 4, 5, 7, 9,10, 11,11,14,13,10, 4, 3, 5, 7, 8, 9,10,13,13,12, 7, 4, 4, 5, 6, 8, 9,12,14,13, 9, 6, 5, 5, 6, 8, 9, @@ -8584,7 +8584,7 @@ static const long _huff_lengthlist__44c7_s_long[] = { static const static_codebook _huff_book__44c7_s_long = { 2, 100, - (long *)_huff_lengthlist__44c7_s_long, + (char *)_huff_lengthlist__44c7_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -8596,7 +8596,7 @@ static const long _vq_quantlist__44c7_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c7_s_p1_0[] = { +static const char _vq_lengthlist__44c7_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 8, 7, 0, 9, 9, 0, 9, 8, 5, 7, 8, 0, 9, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 9, 9, 0, 8, 8, 0, 8, 8, 5, 8, 9, @@ -8607,7 +8607,7 @@ static const long _vq_lengthlist__44c7_s_p1_0[] = { static const static_codebook _44c7_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c7_s_p1_0, + (char *)_vq_lengthlist__44c7_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c7_s_p1_0, 0 @@ -8621,7 +8621,7 @@ static const long _vq_quantlist__44c7_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c7_s_p2_0[] = { +static const char _vq_lengthlist__44c7_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, 8,10,10, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, @@ -8666,7 +8666,7 @@ static const long _vq_lengthlist__44c7_s_p2_0[] = { static const static_codebook _44c7_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c7_s_p2_0, + (char *)_vq_lengthlist__44c7_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c7_s_p2_0, 0 @@ -8684,7 +8684,7 @@ static const long _vq_quantlist__44c7_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c7_s_p3_0[] = { +static const char _vq_lengthlist__44c7_s_p3_0[] = { 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6, 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0, @@ -8695,7 +8695,7 @@ static const long _vq_lengthlist__44c7_s_p3_0[] = { static const static_codebook _44c7_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c7_s_p3_0, + (char *)_vq_lengthlist__44c7_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c7_s_p3_0, 0 @@ -8721,7 +8721,7 @@ static const long _vq_quantlist__44c7_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c7_s_p4_0[] = { +static const char _vq_lengthlist__44c7_s_p4_0[] = { 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 12,12, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, @@ -8745,7 +8745,7 @@ static const long _vq_lengthlist__44c7_s_p4_0[] = { static const static_codebook _44c7_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c7_s_p4_0, + (char *)_vq_lengthlist__44c7_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c7_s_p4_0, 0 @@ -8757,7 +8757,7 @@ static const long _vq_quantlist__44c7_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c7_s_p5_0[] = { +static const char _vq_lengthlist__44c7_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 6, 7,10,10,10,10, 10, 9, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11, 12,10,11,12, 7,10,10,11,12,12,12,12,12, 7,10,10, @@ -8768,7 +8768,7 @@ static const long _vq_lengthlist__44c7_s_p5_0[] = { static const static_codebook _44c7_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c7_s_p5_0, + (char *)_vq_lengthlist__44c7_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c7_s_p5_0, 0 @@ -8788,7 +8788,7 @@ static const long _vq_quantlist__44c7_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c7_s_p5_1[] = { +static const char _vq_lengthlist__44c7_s_p5_1[] = { 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,11, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,12, 5, 5, 6, 6, 7, 7, 9, 9, 9, 9,12,12,12, 6, @@ -8801,7 +8801,7 @@ static const long _vq_lengthlist__44c7_s_p5_1[] = { static const static_codebook _44c7_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c7_s_p5_1, + (char *)_vq_lengthlist__44c7_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c7_s_p5_1, 0 @@ -8823,7 +8823,7 @@ static const long _vq_quantlist__44c7_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p6_0[] = { +static const char _vq_lengthlist__44c7_s_p6_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 7, 9, 8,10,10, 6, 5, 5, 7, 7, 8, 8, 9, 9, 9,10,11,11, 7, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 8, 9, 9, @@ -8839,7 +8839,7 @@ static const long _vq_lengthlist__44c7_s_p6_0[] = { static const static_codebook _44c7_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p6_0, + (char *)_vq_lengthlist__44c7_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c7_s_p6_0, 0 @@ -8853,14 +8853,14 @@ static const long _vq_quantlist__44c7_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c7_s_p6_1[] = { +static const char _vq_lengthlist__44c7_s_p6_1[] = { 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c7_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c7_s_p6_1, + (char *)_vq_lengthlist__44c7_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c7_s_p6_1, 0 @@ -8882,7 +8882,7 @@ static const long _vq_quantlist__44c7_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p7_0[] = { +static const char _vq_lengthlist__44c7_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 8, 9, 9,10,10,12,11, 6, 5, 5, 7, 7, 8, 8, 9,10,11,11,12,12, 7, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,20, 7, 7, 7, 7, 8, 9,10,10, @@ -8898,7 +8898,7 @@ static const long _vq_lengthlist__44c7_s_p7_0[] = { static const static_codebook _44c7_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p7_0, + (char *)_vq_lengthlist__44c7_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c7_s_p7_0, 0 @@ -8918,7 +8918,7 @@ static const long _vq_quantlist__44c7_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c7_s_p7_1[] = { +static const char _vq_lengthlist__44c7_s_p7_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, @@ -8931,7 +8931,7 @@ static const long _vq_lengthlist__44c7_s_p7_1[] = { static const static_codebook _44c7_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c7_s_p7_1, + (char *)_vq_lengthlist__44c7_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c7_s_p7_1, 0 @@ -8955,7 +8955,7 @@ static const long _vq_quantlist__44c7_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c7_s_p8_0[] = { +static const char _vq_lengthlist__44c7_s_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 9, 9, 8, 8,10, 9,11,10,12,11, 6, 5, 5, 8, 7, 9, 9, 8, 8,10,10,11,11,12,11,19, 8, 8, @@ -8975,7 +8975,7 @@ static const long _vq_lengthlist__44c7_s_p8_0[] = { static const static_codebook _44c7_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c7_s_p8_0, + (char *)_vq_lengthlist__44c7_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c7_s_p8_0, 0 @@ -9005,7 +9005,7 @@ static const long _vq_quantlist__44c7_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c7_s_p8_1[] = { +static const char _vq_lengthlist__44c7_s_p8_1[] = { 3, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -9038,7 +9038,7 @@ static const long _vq_lengthlist__44c7_s_p8_1[] = { static const static_codebook _44c7_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c7_s_p8_1, + (char *)_vq_lengthlist__44c7_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c7_s_p8_1, 0 @@ -9060,7 +9060,7 @@ static const long _vq_quantlist__44c7_s_p9_0[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p9_0[] = { +static const char _vq_lengthlist__44c7_s_p9_0[] = { 1, 3, 3,11,11,11,11,11,11,11,11,11,11, 4, 6, 6, 11,11,11,11,11,11,11,11,11,11, 4, 7, 7,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -9076,7 +9076,7 @@ static const long _vq_lengthlist__44c7_s_p9_0[] = { static const static_codebook _44c7_s_p9_0 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p9_0, + (char *)_vq_lengthlist__44c7_s_p9_0, 1, -511845376, 1630791680, 4, 0, (long *)_vq_quantlist__44c7_s_p9_0, 0 @@ -9098,7 +9098,7 @@ static const long _vq_quantlist__44c7_s_p9_1[] = { 12, }; -static const long _vq_lengthlist__44c7_s_p9_1[] = { +static const char _vq_lengthlist__44c7_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 8, 8, 8, 8, 6, 6, 6, 8, 8, 9, 8, 8, 7, 9, 8,11,10, 5, 6, 6, 8, 8, 9, 8, 8, 8,10, 9,11,11,16, 8, 8, 9, 8, 9, 9, 9, 8, @@ -9114,7 +9114,7 @@ static const long _vq_lengthlist__44c7_s_p9_1[] = { static const static_codebook _44c7_s_p9_1 = { 2, 169, - (long *)_vq_lengthlist__44c7_s_p9_1, + (char *)_vq_lengthlist__44c7_s_p9_1, 1, -518889472, 1622704128, 4, 0, (long *)_vq_quantlist__44c7_s_p9_1, 0 @@ -9172,7 +9172,7 @@ static const long _vq_quantlist__44c7_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c7_s_p9_2[] = { +static const char _vq_lengthlist__44c7_s_p9_2[] = { 2, 4, 3, 4, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -9181,13 +9181,13 @@ static const long _vq_lengthlist__44c7_s_p9_2[] = { static const static_codebook _44c7_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c7_s_p9_2, + (char *)_vq_lengthlist__44c7_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c7_s_p9_2, 0 }; -static const long _huff_lengthlist__44c7_s_short[] = { +static const char _huff_lengthlist__44c7_s_short[] = { 4,11,12,14,15,15,17,17,18,18, 5, 6, 6, 8, 9,10, 13,17,18,19, 7, 5, 4, 6, 8, 9,11,15,19,19, 8, 6, 5, 5, 6, 7,11,14,16,17, 9, 7, 7, 6, 7, 7,10,13, @@ -9199,13 +9199,13 @@ static const long _huff_lengthlist__44c7_s_short[] = { static const static_codebook _huff_book__44c7_s_short = { 2, 100, - (long *)_huff_lengthlist__44c7_s_short, + (char *)_huff_lengthlist__44c7_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c8_s_long[] = { +static const char _huff_lengthlist__44c8_s_long[] = { 3, 8,12,13,14,14,14,13,14,14, 6, 4, 5, 8,10,10, 11,11,14,13, 9, 5, 4, 5, 7, 8, 9,10,13,13,12, 7, 5, 4, 5, 6, 8, 9,12,13,13, 9, 6, 5, 5, 5, 7, 9, @@ -9217,7 +9217,7 @@ static const long _huff_lengthlist__44c8_s_long[] = { static const static_codebook _huff_book__44c8_s_long = { 2, 100, - (long *)_huff_lengthlist__44c8_s_long, + (char *)_huff_lengthlist__44c8_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -9229,7 +9229,7 @@ static const long _vq_quantlist__44c8_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c8_s_p1_0[] = { +static const char _vq_lengthlist__44c8_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 5, 7, 7, 0, 9, 8, 0, 9, 8, 6, 7, 7, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 9, 8, 0, 8, 8, 0, 8, 8, 5, 8, 9, @@ -9240,7 +9240,7 @@ static const long _vq_lengthlist__44c8_s_p1_0[] = { static const static_codebook _44c8_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c8_s_p1_0, + (char *)_vq_lengthlist__44c8_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c8_s_p1_0, 0 @@ -9254,7 +9254,7 @@ static const long _vq_quantlist__44c8_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c8_s_p2_0[] = { +static const char _vq_lengthlist__44c8_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 5, 7, 7, 9, 9, 0, 8, 7,10, 9, 0, 8, 7,10, 9, 0,10,10,11,11, 0, 0, 0, @@ -9299,7 +9299,7 @@ static const long _vq_lengthlist__44c8_s_p2_0[] = { static const static_codebook _44c8_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c8_s_p2_0, + (char *)_vq_lengthlist__44c8_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c8_s_p2_0, 0 @@ -9317,7 +9317,7 @@ static const long _vq_quantlist__44c8_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c8_s_p3_0[] = { +static const char _vq_lengthlist__44c8_s_p3_0[] = { 2, 4, 4, 5, 5, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 4, 4, 6, 6, 7, 7, 9, 9, 0, 5, 5, 6, 6, 8, 8,10,10, 0, 0, 0, 6, 6, 8, 8,10,10, 0, 0, 0, @@ -9328,7 +9328,7 @@ static const long _vq_lengthlist__44c8_s_p3_0[] = { static const static_codebook _44c8_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c8_s_p3_0, + (char *)_vq_lengthlist__44c8_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c8_s_p3_0, 0 @@ -9354,7 +9354,7 @@ static const long _vq_quantlist__44c8_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c8_s_p4_0[] = { +static const char _vq_lengthlist__44c8_s_p4_0[] = { 3, 4, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 8,10,10,11,11, 11,11, 0, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, @@ -9378,7 +9378,7 @@ static const long _vq_lengthlist__44c8_s_p4_0[] = { static const static_codebook _44c8_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c8_s_p4_0, + (char *)_vq_lengthlist__44c8_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c8_s_p4_0, 0 @@ -9390,7 +9390,7 @@ static const long _vq_quantlist__44c8_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c8_s_p5_0[] = { +static const char _vq_lengthlist__44c8_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6,10,10,10,10, 10,10, 4, 6, 6,10,10,10,10, 9,10, 5,10,10, 9,11, 11,10,11,11, 7,10,10,11,12,12,12,12,12, 7,10,10, @@ -9401,7 +9401,7 @@ static const long _vq_lengthlist__44c8_s_p5_0[] = { static const static_codebook _44c8_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c8_s_p5_0, + (char *)_vq_lengthlist__44c8_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c8_s_p5_0, 0 @@ -9421,7 +9421,7 @@ static const long _vq_quantlist__44c8_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c8_s_p5_1[] = { +static const char _vq_lengthlist__44c8_s_p5_1[] = { 3, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 4, 5, 6, 6, 7, 7, 8, 8, 8, 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 9,12, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,12,12,12, 6, @@ -9434,7 +9434,7 @@ static const long _vq_lengthlist__44c8_s_p5_1[] = { static const static_codebook _44c8_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c8_s_p5_1, + (char *)_vq_lengthlist__44c8_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c8_s_p5_1, 0 @@ -9456,7 +9456,7 @@ static const long _vq_quantlist__44c8_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c8_s_p6_0[] = { +static const char _vq_lengthlist__44c8_s_p6_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 5, 5, 7, 7, 8, 8, 9, 9,10,10,11,11, 0, 7, 7, 7, 7, 9, 9,10,10, @@ -9472,7 +9472,7 @@ static const long _vq_lengthlist__44c8_s_p6_0[] = { static const static_codebook _44c8_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c8_s_p6_0, + (char *)_vq_lengthlist__44c8_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c8_s_p6_0, 0 @@ -9486,14 +9486,14 @@ static const long _vq_quantlist__44c8_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c8_s_p6_1[] = { +static const char _vq_lengthlist__44c8_s_p6_1[] = { 3, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c8_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c8_s_p6_1, + (char *)_vq_lengthlist__44c8_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c8_s_p6_1, 0 @@ -9515,7 +9515,7 @@ static const long _vq_quantlist__44c8_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c8_s_p7_0[] = { +static const char _vq_lengthlist__44c8_s_p7_0[] = { 1, 4, 4, 6, 6, 8, 7, 9, 9,10,10,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12, 7, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,21, 7, 7, 7, 7, 8, 9,10,10, @@ -9531,7 +9531,7 @@ static const long _vq_lengthlist__44c8_s_p7_0[] = { static const static_codebook _44c8_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c8_s_p7_0, + (char *)_vq_lengthlist__44c8_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c8_s_p7_0, 0 @@ -9551,7 +9551,7 @@ static const long _vq_quantlist__44c8_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c8_s_p7_1[] = { +static const char _vq_lengthlist__44c8_s_p7_1[] = { 4, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 7, @@ -9564,7 +9564,7 @@ static const long _vq_lengthlist__44c8_s_p7_1[] = { static const static_codebook _44c8_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c8_s_p7_1, + (char *)_vq_lengthlist__44c8_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c8_s_p7_1, 0 @@ -9588,7 +9588,7 @@ static const long _vq_quantlist__44c8_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c8_s_p8_0[] = { +static const char _vq_lengthlist__44c8_s_p8_0[] = { 1, 4, 4, 7, 6, 8, 8, 8, 7, 9, 8,10,10,11,10, 6, 5, 5, 7, 7, 9, 9, 8, 8,10,10,11,11,12,11, 6, 5, 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,20, 8, 8, @@ -9608,7 +9608,7 @@ static const long _vq_lengthlist__44c8_s_p8_0[] = { static const static_codebook _44c8_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c8_s_p8_0, + (char *)_vq_lengthlist__44c8_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c8_s_p8_0, 0 @@ -9638,7 +9638,7 @@ static const long _vq_quantlist__44c8_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c8_s_p8_1[] = { +static const char _vq_lengthlist__44c8_s_p8_1[] = { 4, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -9671,7 +9671,7 @@ static const long _vq_lengthlist__44c8_s_p8_1[] = { static const static_codebook _44c8_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c8_s_p8_1, + (char *)_vq_lengthlist__44c8_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c8_s_p8_1, 0 @@ -9697,7 +9697,7 @@ static const long _vq_quantlist__44c8_s_p9_0[] = { 16, }; -static const long _vq_lengthlist__44c8_s_p9_0[] = { +static const char _vq_lengthlist__44c8_s_p9_0[] = { 1, 4, 3,11,11,11,11,11,11,11,11,11,11,11,11,11, 11, 4, 7, 7,11,11,11,11,11,11,11,11,11,11,11,11, 11,11, 4, 8,11,11,11,11,11,11,11,11,11,11,11,11, @@ -9721,7 +9721,7 @@ static const long _vq_lengthlist__44c8_s_p9_0[] = { static const static_codebook _44c8_s_p9_0 = { 2, 289, - (long *)_vq_lengthlist__44c8_s_p9_0, + (char *)_vq_lengthlist__44c8_s_p9_0, 1, -509798400, 1631393792, 5, 0, (long *)_vq_quantlist__44c8_s_p9_0, 0 @@ -9749,7 +9749,7 @@ static const long _vq_quantlist__44c8_s_p9_1[] = { 18, }; -static const long _vq_lengthlist__44c8_s_p9_1[] = { +static const char _vq_lengthlist__44c8_s_p9_1[] = { 1, 4, 4, 7, 6, 7, 7, 7, 7, 8, 8, 9, 9,10,10,10, 10,11,11, 6, 6, 6, 8, 8, 9, 8, 8, 7,10, 8,11,10, 12,11,12,12,13,13, 5, 5, 6, 8, 8, 9, 9, 8, 8,10, @@ -9777,7 +9777,7 @@ static const long _vq_lengthlist__44c8_s_p9_1[] = { static const static_codebook _44c8_s_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44c8_s_p9_1, + (char *)_vq_lengthlist__44c8_s_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44c8_s_p9_1, 0 @@ -9835,7 +9835,7 @@ static const long _vq_quantlist__44c8_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c8_s_p9_2[] = { +static const char _vq_lengthlist__44c8_s_p9_2[] = { 2, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -9844,13 +9844,13 @@ static const long _vq_lengthlist__44c8_s_p9_2[] = { static const static_codebook _44c8_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c8_s_p9_2, + (char *)_vq_lengthlist__44c8_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c8_s_p9_2, 0 }; -static const long _huff_lengthlist__44c8_s_short[] = { +static const char _huff_lengthlist__44c8_s_short[] = { 4,11,13,14,15,15,18,17,19,17, 5, 6, 8, 9,10,10, 12,15,19,19, 6, 6, 6, 6, 8, 8,11,14,18,19, 8, 6, 5, 4, 6, 7,10,13,16,17, 9, 7, 6, 5, 6, 7, 9,12, @@ -9862,13 +9862,13 @@ static const long _huff_lengthlist__44c8_s_short[] = { static const static_codebook _huff_book__44c8_s_short = { 2, 100, - (long *)_huff_lengthlist__44c8_s_short, + (char *)_huff_lengthlist__44c8_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c9_s_long[] = { +static const char _huff_lengthlist__44c9_s_long[] = { 3, 8,12,14,15,15,15,13,15,15, 6, 5, 8,10,12,12, 13,12,14,13,10, 6, 5, 6, 8, 9,11,11,13,13,13, 8, 5, 4, 5, 6, 8,10,11,13,14,10, 7, 5, 4, 5, 7, 9, @@ -9880,7 +9880,7 @@ static const long _huff_lengthlist__44c9_s_long[] = { static const static_codebook _huff_book__44c9_s_long = { 2, 100, - (long *)_huff_lengthlist__44c9_s_long, + (char *)_huff_lengthlist__44c9_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -9892,7 +9892,7 @@ static const long _vq_quantlist__44c9_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c9_s_p1_0[] = { +static const char _vq_lengthlist__44c9_s_p1_0[] = { 1, 5, 5, 0, 5, 5, 0, 5, 5, 6, 8, 8, 0, 9, 8, 0, 9, 8, 6, 8, 8, 0, 8, 9, 0, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 8, 8, 0, 7, 7, 0, 8, 8, 5, 8, 8, @@ -9903,7 +9903,7 @@ static const long _vq_lengthlist__44c9_s_p1_0[] = { static const static_codebook _44c9_s_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44c9_s_p1_0, + (char *)_vq_lengthlist__44c9_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c9_s_p1_0, 0 @@ -9917,7 +9917,7 @@ static const long _vq_quantlist__44c9_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c9_s_p2_0[] = { +static const char _vq_lengthlist__44c9_s_p2_0[] = { 3, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 5, 5, 8, 8, 0, 7, 7, 9, 9, 0, 0, 0, 9, 9, 6, 7, 7, 9, 8, 0, 8, 8, 9, 9, 0, 8, 7, 9, 9, 0, 9,10,10,10, 0, 0, 0, @@ -9962,7 +9962,7 @@ static const long _vq_lengthlist__44c9_s_p2_0[] = { static const static_codebook _44c9_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c9_s_p2_0, + (char *)_vq_lengthlist__44c9_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c9_s_p2_0, 0 @@ -9980,7 +9980,7 @@ static const long _vq_quantlist__44c9_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c9_s_p3_0[] = { +static const char _vq_lengthlist__44c9_s_p3_0[] = { 3, 4, 4, 5, 5, 6, 6, 8, 8, 0, 4, 4, 5, 5, 6, 7, 8, 8, 0, 4, 4, 5, 5, 7, 7, 8, 8, 0, 5, 5, 6, 6, 7, 7, 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, @@ -9991,7 +9991,7 @@ static const long _vq_lengthlist__44c9_s_p3_0[] = { static const static_codebook _44c9_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c9_s_p3_0, + (char *)_vq_lengthlist__44c9_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c9_s_p3_0, 0 @@ -10017,7 +10017,7 @@ static const long _vq_quantlist__44c9_s_p4_0[] = { 16, }; -static const long _vq_lengthlist__44c9_s_p4_0[] = { +static const char _vq_lengthlist__44c9_s_p4_0[] = { 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,10, 10, 0, 5, 4, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 11,11, 0, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, @@ -10041,7 +10041,7 @@ static const long _vq_lengthlist__44c9_s_p4_0[] = { static const static_codebook _44c9_s_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44c9_s_p4_0, + (char *)_vq_lengthlist__44c9_s_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c9_s_p4_0, 0 @@ -10053,7 +10053,7 @@ static const long _vq_quantlist__44c9_s_p5_0[] = { 2, }; -static const long _vq_lengthlist__44c9_s_p5_0[] = { +static const char _vq_lengthlist__44c9_s_p5_0[] = { 1, 4, 4, 5, 7, 7, 6, 7, 7, 4, 7, 6, 9,10,10,10, 10, 9, 4, 6, 7, 9,10,10,10, 9,10, 5, 9, 9, 9,11, 11,10,11,11, 7,10, 9,11,12,11,12,12,12, 7, 9,10, @@ -10064,7 +10064,7 @@ static const long _vq_lengthlist__44c9_s_p5_0[] = { static const static_codebook _44c9_s_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44c9_s_p5_0, + (char *)_vq_lengthlist__44c9_s_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c9_s_p5_0, 0 @@ -10084,7 +10084,7 @@ static const long _vq_quantlist__44c9_s_p5_1[] = { 10, }; -static const long _vq_lengthlist__44c9_s_p5_1[] = { +static const char _vq_lengthlist__44c9_s_p5_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7,11, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8,11, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8,11, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,11,11,11, 6, @@ -10097,7 +10097,7 @@ static const long _vq_lengthlist__44c9_s_p5_1[] = { static const static_codebook _44c9_s_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44c9_s_p5_1, + (char *)_vq_lengthlist__44c9_s_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c9_s_p5_1, 0 @@ -10119,7 +10119,7 @@ static const long _vq_quantlist__44c9_s_p6_0[] = { 12, }; -static const long _vq_lengthlist__44c9_s_p6_0[] = { +static const char _vq_lengthlist__44c9_s_p6_0[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 5, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10, 6, 4, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10, 0, 6, 6, 7, 7, 8, 8, 9, 9, @@ -10135,7 +10135,7 @@ static const long _vq_lengthlist__44c9_s_p6_0[] = { static const static_codebook _44c9_s_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44c9_s_p6_0, + (char *)_vq_lengthlist__44c9_s_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c9_s_p6_0, 0 @@ -10149,14 +10149,14 @@ static const long _vq_quantlist__44c9_s_p6_1[] = { 4, }; -static const long _vq_lengthlist__44c9_s_p6_1[] = { +static const char _vq_lengthlist__44c9_s_p6_1[] = { 4, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44c9_s_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44c9_s_p6_1, + (char *)_vq_lengthlist__44c9_s_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c9_s_p6_1, 0 @@ -10178,7 +10178,7 @@ static const long _vq_quantlist__44c9_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c9_s_p7_0[] = { +static const char _vq_lengthlist__44c9_s_p7_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8,10,10,11,11, 6, 4, 4, 6, 6, 8, 8, 9, 9,10,10,12,12, 6, 4, 5, 6, 6, 8, 8, 9, 9,10,10,12,12,20, 6, 6, 6, 6, 8, 8, 9,10, @@ -10194,7 +10194,7 @@ static const long _vq_lengthlist__44c9_s_p7_0[] = { static const static_codebook _44c9_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c9_s_p7_0, + (char *)_vq_lengthlist__44c9_s_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44c9_s_p7_0, 0 @@ -10214,7 +10214,7 @@ static const long _vq_quantlist__44c9_s_p7_1[] = { 10, }; -static const long _vq_lengthlist__44c9_s_p7_1[] = { +static const char _vq_lengthlist__44c9_s_p7_1[] = { 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 6, @@ -10227,7 +10227,7 @@ static const long _vq_lengthlist__44c9_s_p7_1[] = { static const static_codebook _44c9_s_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44c9_s_p7_1, + (char *)_vq_lengthlist__44c9_s_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c9_s_p7_1, 0 @@ -10251,7 +10251,7 @@ static const long _vq_quantlist__44c9_s_p8_0[] = { 14, }; -static const long _vq_lengthlist__44c9_s_p8_0[] = { +static const char _vq_lengthlist__44c9_s_p8_0[] = { 1, 4, 4, 7, 6, 8, 8, 8, 8, 9, 9,10,10,11,10, 6, 5, 5, 7, 7, 9, 9, 8, 9,10,10,11,11,12,12, 6, 5, 5, 7, 7, 9, 9, 9, 9,10,10,11,11,12,12,21, 7, 8, @@ -10271,7 +10271,7 @@ static const long _vq_lengthlist__44c9_s_p8_0[] = { static const static_codebook _44c9_s_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44c9_s_p8_0, + (char *)_vq_lengthlist__44c9_s_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44c9_s_p8_0, 0 @@ -10301,7 +10301,7 @@ static const long _vq_quantlist__44c9_s_p8_1[] = { 20, }; -static const long _vq_lengthlist__44c9_s_p8_1[] = { +static const char _vq_lengthlist__44c9_s_p8_1[] = { 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, @@ -10334,7 +10334,7 @@ static const long _vq_lengthlist__44c9_s_p8_1[] = { static const static_codebook _44c9_s_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44c9_s_p8_1, + (char *)_vq_lengthlist__44c9_s_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44c9_s_p8_1, 0 @@ -10362,7 +10362,7 @@ static const long _vq_quantlist__44c9_s_p9_0[] = { 18, }; -static const long _vq_lengthlist__44c9_s_p9_0[] = { +static const char _vq_lengthlist__44c9_s_p9_0[] = { 1, 4, 3,12,12,12,12,12,12,12,12,12,12,12,12,12, 12,12,12, 4, 5, 6,12,12,12,12,12,12,12,12,12,12, 12,12,12,12,12,12, 4, 6, 6,12,12,12,12,12,12,12, @@ -10390,7 +10390,7 @@ static const long _vq_lengthlist__44c9_s_p9_0[] = { static const static_codebook _44c9_s_p9_0 = { 2, 361, - (long *)_vq_lengthlist__44c9_s_p9_0, + (char *)_vq_lengthlist__44c9_s_p9_0, 1, -508535424, 1631393792, 5, 0, (long *)_vq_quantlist__44c9_s_p9_0, 0 @@ -10418,7 +10418,7 @@ static const long _vq_quantlist__44c9_s_p9_1[] = { 18, }; -static const long _vq_lengthlist__44c9_s_p9_1[] = { +static const char _vq_lengthlist__44c9_s_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 8, 7, 9, 8, 9, 9,10,10,11, 11,11,11, 6, 5, 5, 8, 8, 9, 9, 9, 8,10, 9,11,10, 12,12,13,12,13,13, 5, 5, 5, 8, 8, 9, 9, 9, 9,10, @@ -10446,7 +10446,7 @@ static const long _vq_lengthlist__44c9_s_p9_1[] = { static const static_codebook _44c9_s_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44c9_s_p9_1, + (char *)_vq_lengthlist__44c9_s_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44c9_s_p9_1, 0 @@ -10504,7 +10504,7 @@ static const long _vq_quantlist__44c9_s_p9_2[] = { 48, }; -static const long _vq_lengthlist__44c9_s_p9_2[] = { +static const char _vq_lengthlist__44c9_s_p9_2[] = { 2, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -10513,13 +10513,13 @@ static const long _vq_lengthlist__44c9_s_p9_2[] = { static const static_codebook _44c9_s_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44c9_s_p9_2, + (char *)_vq_lengthlist__44c9_s_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44c9_s_p9_2, 0 }; -static const long _huff_lengthlist__44c9_s_short[] = { +static const char _huff_lengthlist__44c9_s_short[] = { 5,13,18,16,17,17,19,18,19,19, 5, 7,10,11,12,12, 13,16,17,18, 6, 6, 7, 7, 9, 9,10,14,17,19, 8, 7, 6, 5, 6, 7, 9,12,19,17, 8, 7, 7, 6, 5, 6, 8,11, @@ -10531,13 +10531,13 @@ static const long _huff_lengthlist__44c9_s_short[] = { static const static_codebook _huff_book__44c9_s_short = { 2, 100, - (long *)_huff_lengthlist__44c9_s_short, + (char *)_huff_lengthlist__44c9_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c0_s_long[] = { +static const char _huff_lengthlist__44c0_s_long[] = { 5, 4, 8, 9, 8, 9,10,12,15, 4, 1, 5, 5, 6, 8,11, 12,12, 8, 5, 8, 9, 9,11,13,12,12, 9, 5, 8, 5, 7, 9,12,13,13, 8, 6, 8, 7, 7, 9,11,11,11, 9, 7, 9, @@ -10548,7 +10548,7 @@ static const long _huff_lengthlist__44c0_s_long[] = { static const static_codebook _huff_book__44c0_s_long = { 2, 81, - (long *)_huff_lengthlist__44c0_s_long, + (char *)_huff_lengthlist__44c0_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -10560,7 +10560,7 @@ static const long _vq_quantlist__44c0_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c0_s_p1_0[] = { +static const char _vq_lengthlist__44c0_s_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -10976,7 +10976,7 @@ static const long _vq_lengthlist__44c0_s_p1_0[] = { static const static_codebook _44c0_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c0_s_p1_0, + (char *)_vq_lengthlist__44c0_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c0_s_p1_0, 0 @@ -10990,7 +10990,7 @@ static const long _vq_quantlist__44c0_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c0_s_p2_0[] = { +static const char _vq_lengthlist__44c0_s_p2_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11035,7 +11035,7 @@ static const long _vq_lengthlist__44c0_s_p2_0[] = { static const static_codebook _44c0_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c0_s_p2_0, + (char *)_vq_lengthlist__44c0_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_s_p2_0, 0 @@ -11053,7 +11053,7 @@ static const long _vq_quantlist__44c0_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c0_s_p3_0[] = { +static const char _vq_lengthlist__44c0_s_p3_0[] = { 1, 3, 2, 8, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -11064,7 +11064,7 @@ static const long _vq_lengthlist__44c0_s_p3_0[] = { static const static_codebook _44c0_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_s_p3_0, + (char *)_vq_lengthlist__44c0_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_s_p3_0, 0 @@ -11082,7 +11082,7 @@ static const long _vq_quantlist__44c0_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c0_s_p4_0[] = { +static const char _vq_lengthlist__44c0_s_p4_0[] = { 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 8, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, @@ -11093,7 +11093,7 @@ static const long _vq_lengthlist__44c0_s_p4_0[] = { static const static_codebook _44c0_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_s_p4_0, + (char *)_vq_lengthlist__44c0_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_s_p4_0, 0 @@ -11119,7 +11119,7 @@ static const long _vq_quantlist__44c0_s_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c0_s_p5_0[] = { +static const char _vq_lengthlist__44c0_s_p5_0[] = { 1, 4, 3, 6, 6, 8, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9, 9,10,10,10, 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -11143,7 +11143,7 @@ static const long _vq_lengthlist__44c0_s_p5_0[] = { static const static_codebook _44c0_s_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c0_s_p5_0, + (char *)_vq_lengthlist__44c0_s_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_s_p5_0, 0 @@ -11155,7 +11155,7 @@ static const long _vq_quantlist__44c0_s_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c0_s_p6_0[] = { +static const char _vq_lengthlist__44c0_s_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,10, 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,11,11, 11,12,10,11, 6, 9, 9,11,10,11,11,10,10, 6, 9, 9, @@ -11166,7 +11166,7 @@ static const long _vq_lengthlist__44c0_s_p6_0[] = { static const static_codebook _44c0_s_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c0_s_p6_0, + (char *)_vq_lengthlist__44c0_s_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c0_s_p6_0, 0 @@ -11186,7 +11186,7 @@ static const long _vq_quantlist__44c0_s_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c0_s_p6_1[] = { +static const char _vq_lengthlist__44c0_s_p6_1[] = { 2, 3, 3, 6, 6, 7, 7, 7, 7, 7, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -11199,7 +11199,7 @@ static const long _vq_lengthlist__44c0_s_p6_1[] = { static const static_codebook _44c0_s_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c0_s_p6_1, + (char *)_vq_lengthlist__44c0_s_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_s_p6_1, 0 @@ -11221,7 +11221,7 @@ static const long _vq_quantlist__44c0_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c0_s_p7_0[] = { +static const char _vq_lengthlist__44c0_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -11237,7 +11237,7 @@ static const long _vq_lengthlist__44c0_s_p7_0[] = { static const static_codebook _44c0_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c0_s_p7_0, + (char *)_vq_lengthlist__44c0_s_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c0_s_p7_0, 0 @@ -11251,14 +11251,14 @@ static const long _vq_quantlist__44c0_s_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c0_s_p7_1[] = { +static const char _vq_lengthlist__44c0_s_p7_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c0_s_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c0_s_p7_1, + (char *)_vq_lengthlist__44c0_s_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_s_p7_1, 0 @@ -11272,7 +11272,7 @@ static const long _vq_quantlist__44c0_s_p8_0[] = { 4, }; -static const long _vq_lengthlist__44c0_s_p8_0[] = { +static const char _vq_lengthlist__44c0_s_p8_0[] = { 1, 5, 5,10,10, 6, 9, 8,10,10, 6,10, 9,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -11317,7 +11317,7 @@ static const long _vq_lengthlist__44c0_s_p8_0[] = { static const static_codebook _44c0_s_p8_0 = { 4, 625, - (long *)_vq_lengthlist__44c0_s_p8_0, + (char *)_vq_lengthlist__44c0_s_p8_0, 1, -518283264, 1627103232, 3, 0, (long *)_vq_quantlist__44c0_s_p8_0, 0 @@ -11339,7 +11339,7 @@ static const long _vq_quantlist__44c0_s_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c0_s_p8_1[] = { +static const char _vq_lengthlist__44c0_s_p8_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 9,11,12,13,12, 6, 5, 5, 7, 7, 8, 8,10, 9,12,12,12,12, 6, 5, 5, 7, 7, 8, 8,10, 9,12,11,11,13,16, 7, 7, 8, 8, 9, 9,10,10, @@ -11355,7 +11355,7 @@ static const long _vq_lengthlist__44c0_s_p8_1[] = { static const static_codebook _44c0_s_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c0_s_p8_1, + (char *)_vq_lengthlist__44c0_s_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c0_s_p8_1, 0 @@ -11381,7 +11381,7 @@ static const long _vq_quantlist__44c0_s_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c0_s_p8_2[] = { +static const char _vq_lengthlist__44c0_s_p8_2[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, @@ -11405,13 +11405,13 @@ static const long _vq_lengthlist__44c0_s_p8_2[] = { static const static_codebook _44c0_s_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c0_s_p8_2, + (char *)_vq_lengthlist__44c0_s_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_s_p8_2, 0 }; -static const long _huff_lengthlist__44c0_s_short[] = { +static const char _huff_lengthlist__44c0_s_short[] = { 9, 8,12,11,12,13,14,14,16, 6, 1, 5, 6, 6, 9,12, 14,17, 9, 4, 5, 9, 7, 9,13,15,16, 8, 5, 8, 6, 8, 10,13,17,17, 9, 6, 7, 7, 8, 9,13,15,17,11, 8, 9, @@ -11422,13 +11422,13 @@ static const long _huff_lengthlist__44c0_s_short[] = { static const static_codebook _huff_book__44c0_s_short = { 2, 81, - (long *)_huff_lengthlist__44c0_s_short, + (char *)_huff_lengthlist__44c0_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c0_sm_long[] = { +static const char _huff_lengthlist__44c0_sm_long[] = { 5, 4, 9,10, 9,10,11,12,13, 4, 1, 5, 7, 7, 9,11, 12,14, 8, 5, 7, 9, 8,10,13,13,13,10, 7, 9, 4, 6, 7,10,12,14, 9, 6, 7, 6, 6, 7,10,12,12, 9, 8, 9, @@ -11439,7 +11439,7 @@ static const long _huff_lengthlist__44c0_sm_long[] = { static const static_codebook _huff_book__44c0_sm_long = { 2, 81, - (long *)_huff_lengthlist__44c0_sm_long, + (char *)_huff_lengthlist__44c0_sm_long, 0, 0, 0, 0, 0, NULL, 0 @@ -11451,7 +11451,7 @@ static const long _vq_quantlist__44c0_sm_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c0_sm_p1_0[] = { +static const char _vq_lengthlist__44c0_sm_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11867,7 +11867,7 @@ static const long _vq_lengthlist__44c0_sm_p1_0[] = { static const static_codebook _44c0_sm_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c0_sm_p1_0, + (char *)_vq_lengthlist__44c0_sm_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c0_sm_p1_0, 0 @@ -11881,7 +11881,7 @@ static const long _vq_quantlist__44c0_sm_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c0_sm_p2_0[] = { +static const char _vq_lengthlist__44c0_sm_p2_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -11926,7 +11926,7 @@ static const long _vq_lengthlist__44c0_sm_p2_0[] = { static const static_codebook _44c0_sm_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c0_sm_p2_0, + (char *)_vq_lengthlist__44c0_sm_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_sm_p2_0, 0 @@ -11944,7 +11944,7 @@ static const long _vq_quantlist__44c0_sm_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c0_sm_p3_0[] = { +static const char _vq_lengthlist__44c0_sm_p3_0[] = { 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 4, 7, 7, 0, 0, 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, @@ -11955,7 +11955,7 @@ static const long _vq_lengthlist__44c0_sm_p3_0[] = { static const static_codebook _44c0_sm_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_sm_p3_0, + (char *)_vq_lengthlist__44c0_sm_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_sm_p3_0, 0 @@ -11973,7 +11973,7 @@ static const long _vq_quantlist__44c0_sm_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c0_sm_p4_0[] = { +static const char _vq_lengthlist__44c0_sm_p4_0[] = { 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7, 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -11984,7 +11984,7 @@ static const long _vq_lengthlist__44c0_sm_p4_0[] = { static const static_codebook _44c0_sm_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_sm_p4_0, + (char *)_vq_lengthlist__44c0_sm_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_sm_p4_0, 0 @@ -12010,7 +12010,7 @@ static const long _vq_quantlist__44c0_sm_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c0_sm_p5_0[] = { +static const char _vq_lengthlist__44c0_sm_p5_0[] = { 1, 4, 4, 6, 6, 8, 8, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,11, 11,11, 0, 5, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -12034,7 +12034,7 @@ static const long _vq_lengthlist__44c0_sm_p5_0[] = { static const static_codebook _44c0_sm_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c0_sm_p5_0, + (char *)_vq_lengthlist__44c0_sm_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_sm_p5_0, 0 @@ -12046,7 +12046,7 @@ static const long _vq_quantlist__44c0_sm_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c0_sm_p6_0[] = { +static const char _vq_lengthlist__44c0_sm_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, 11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9, @@ -12057,7 +12057,7 @@ static const long _vq_lengthlist__44c0_sm_p6_0[] = { static const static_codebook _44c0_sm_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c0_sm_p6_0, + (char *)_vq_lengthlist__44c0_sm_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c0_sm_p6_0, 0 @@ -12077,7 +12077,7 @@ static const long _vq_quantlist__44c0_sm_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c0_sm_p6_1[] = { +static const char _vq_lengthlist__44c0_sm_p6_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 7, 8, 9, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -12090,7 +12090,7 @@ static const long _vq_lengthlist__44c0_sm_p6_1[] = { static const static_codebook _44c0_sm_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c0_sm_p6_1, + (char *)_vq_lengthlist__44c0_sm_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c0_sm_p6_1, 0 @@ -12112,7 +12112,7 @@ static const long _vq_quantlist__44c0_sm_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c0_sm_p7_0[] = { +static const char _vq_lengthlist__44c0_sm_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -12128,7 +12128,7 @@ static const long _vq_lengthlist__44c0_sm_p7_0[] = { static const static_codebook _44c0_sm_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c0_sm_p7_0, + (char *)_vq_lengthlist__44c0_sm_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c0_sm_p7_0, 0 @@ -12142,14 +12142,14 @@ static const long _vq_quantlist__44c0_sm_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c0_sm_p7_1[] = { +static const char _vq_lengthlist__44c0_sm_p7_1[] = { 2, 4, 4, 4, 4, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c0_sm_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c0_sm_p7_1, + (char *)_vq_lengthlist__44c0_sm_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c0_sm_p7_1, 0 @@ -12167,7 +12167,7 @@ static const long _vq_quantlist__44c0_sm_p8_0[] = { 8, }; -static const long _vq_lengthlist__44c0_sm_p8_0[] = { +static const char _vq_lengthlist__44c0_sm_p8_0[] = { 1, 3, 3,11,11,11,11,11,11, 3, 7, 6,11,11,11,11, 11,11, 4, 8, 7,11,11,11,11,11,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -12178,7 +12178,7 @@ static const long _vq_lengthlist__44c0_sm_p8_0[] = { static const static_codebook _44c0_sm_p8_0 = { 2, 81, - (long *)_vq_lengthlist__44c0_sm_p8_0, + (char *)_vq_lengthlist__44c0_sm_p8_0, 1, -516186112, 1627103232, 4, 0, (long *)_vq_quantlist__44c0_sm_p8_0, 0 @@ -12200,7 +12200,7 @@ static const long _vq_quantlist__44c0_sm_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c0_sm_p8_1[] = { +static const char _vq_lengthlist__44c0_sm_p8_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,12,11,12,12,17, 7, 7, 8, 8, 9, 9,10,10, @@ -12216,7 +12216,7 @@ static const long _vq_lengthlist__44c0_sm_p8_1[] = { static const static_codebook _44c0_sm_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c0_sm_p8_1, + (char *)_vq_lengthlist__44c0_sm_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c0_sm_p8_1, 0 @@ -12242,7 +12242,7 @@ static const long _vq_quantlist__44c0_sm_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c0_sm_p8_2[] = { +static const char _vq_lengthlist__44c0_sm_p8_2[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, @@ -12266,13 +12266,13 @@ static const long _vq_lengthlist__44c0_sm_p8_2[] = { static const static_codebook _44c0_sm_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c0_sm_p8_2, + (char *)_vq_lengthlist__44c0_sm_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c0_sm_p8_2, 0 }; -static const long _huff_lengthlist__44c0_sm_short[] = { +static const char _huff_lengthlist__44c0_sm_short[] = { 6, 6,12,13,13,14,16,17,17, 4, 2, 5, 8, 7, 9,12, 15,15, 9, 4, 5, 9, 7, 9,12,16,18,11, 6, 7, 4, 6, 8,11,14,18,10, 5, 6, 5, 5, 7,10,14,17,10, 5, 7, @@ -12283,13 +12283,13 @@ static const long _huff_lengthlist__44c0_sm_short[] = { static const static_codebook _huff_book__44c0_sm_short = { 2, 81, - (long *)_huff_lengthlist__44c0_sm_short, + (char *)_huff_lengthlist__44c0_sm_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c1_s_long[] = { +static const char _huff_lengthlist__44c1_s_long[] = { 5, 5, 9,10, 9, 9,10,11,12, 5, 1, 5, 6, 6, 7,10, 12,14, 9, 5, 6, 8, 8,10,12,14,14,10, 5, 8, 5, 6, 8,11,13,14, 9, 5, 7, 6, 6, 8,10,12,11, 9, 7, 9, @@ -12300,7 +12300,7 @@ static const long _huff_lengthlist__44c1_s_long[] = { static const static_codebook _huff_book__44c1_s_long = { 2, 81, - (long *)_huff_lengthlist__44c1_s_long, + (char *)_huff_lengthlist__44c1_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -12312,7 +12312,7 @@ static const long _vq_quantlist__44c1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c1_s_p1_0[] = { +static const char _vq_lengthlist__44c1_s_p1_0[] = { 2, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 6, 0, 0, 0, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -12728,7 +12728,7 @@ static const long _vq_lengthlist__44c1_s_p1_0[] = { static const static_codebook _44c1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c1_s_p1_0, + (char *)_vq_lengthlist__44c1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c1_s_p1_0, 0 @@ -12742,7 +12742,7 @@ static const long _vq_quantlist__44c1_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c1_s_p2_0[] = { +static const char _vq_lengthlist__44c1_s_p2_0[] = { 2, 3, 4, 6, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -12787,7 +12787,7 @@ static const long _vq_lengthlist__44c1_s_p2_0[] = { static const static_codebook _44c1_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c1_s_p2_0, + (char *)_vq_lengthlist__44c1_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_s_p2_0, 0 @@ -12805,7 +12805,7 @@ static const long _vq_quantlist__44c1_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c1_s_p3_0[] = { +static const char _vq_lengthlist__44c1_s_p3_0[] = { 1, 3, 2, 7, 7, 0, 0, 0, 0, 0,13,13, 6, 6, 0, 0, 0, 0, 0,12, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -12816,7 +12816,7 @@ static const long _vq_lengthlist__44c1_s_p3_0[] = { static const static_codebook _44c1_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_s_p3_0, + (char *)_vq_lengthlist__44c1_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_s_p3_0, 0 @@ -12834,7 +12834,7 @@ static const long _vq_quantlist__44c1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c1_s_p4_0[] = { +static const char _vq_lengthlist__44c1_s_p4_0[] = { 1, 3, 3, 6, 5, 6, 6, 8, 8, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 7, 7, 9, 9, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, @@ -12845,7 +12845,7 @@ static const long _vq_lengthlist__44c1_s_p4_0[] = { static const static_codebook _44c1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_s_p4_0, + (char *)_vq_lengthlist__44c1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_s_p4_0, 0 @@ -12871,7 +12871,7 @@ static const long _vq_quantlist__44c1_s_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c1_s_p5_0[] = { +static const char _vq_lengthlist__44c1_s_p5_0[] = { 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -12895,7 +12895,7 @@ static const long _vq_lengthlist__44c1_s_p5_0[] = { static const static_codebook _44c1_s_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c1_s_p5_0, + (char *)_vq_lengthlist__44c1_s_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_s_p5_0, 0 @@ -12907,7 +12907,7 @@ static const long _vq_quantlist__44c1_s_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c1_s_p6_0[] = { +static const char _vq_lengthlist__44c1_s_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 6,10,10,11,11, 11,11,10,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -12918,7 +12918,7 @@ static const long _vq_lengthlist__44c1_s_p6_0[] = { static const static_codebook _44c1_s_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c1_s_p6_0, + (char *)_vq_lengthlist__44c1_s_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c1_s_p6_0, 0 @@ -12938,7 +12938,7 @@ static const long _vq_quantlist__44c1_s_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c1_s_p6_1[] = { +static const char _vq_lengthlist__44c1_s_p6_1[] = { 2, 3, 3, 6, 6, 7, 7, 7, 7, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 8, 8,10,10,10, 7, @@ -12951,7 +12951,7 @@ static const long _vq_lengthlist__44c1_s_p6_1[] = { static const static_codebook _44c1_s_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c1_s_p6_1, + (char *)_vq_lengthlist__44c1_s_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_s_p6_1, 0 @@ -12973,7 +12973,7 @@ static const long _vq_quantlist__44c1_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c1_s_p7_0[] = { +static const char _vq_lengthlist__44c1_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 9, 7, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -12989,7 +12989,7 @@ static const long _vq_lengthlist__44c1_s_p7_0[] = { static const static_codebook _44c1_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_s_p7_0, + (char *)_vq_lengthlist__44c1_s_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c1_s_p7_0, 0 @@ -13003,14 +13003,14 @@ static const long _vq_quantlist__44c1_s_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c1_s_p7_1[] = { +static const char _vq_lengthlist__44c1_s_p7_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c1_s_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c1_s_p7_1, + (char *)_vq_lengthlist__44c1_s_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_s_p7_1, 0 @@ -13032,7 +13032,7 @@ static const long _vq_quantlist__44c1_s_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c1_s_p8_0[] = { +static const char _vq_lengthlist__44c1_s_p8_0[] = { 1, 4, 3,10,10,10,10,10,10,10,10,10,10, 4, 8, 6, 10,10,10,10,10,10,10,10,10,10, 4, 8, 7,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -13048,7 +13048,7 @@ static const long _vq_lengthlist__44c1_s_p8_0[] = { static const static_codebook _44c1_s_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_s_p8_0, + (char *)_vq_lengthlist__44c1_s_p8_0, 1, -514541568, 1627103232, 4, 0, (long *)_vq_quantlist__44c1_s_p8_0, 0 @@ -13070,7 +13070,7 @@ static const long _vq_quantlist__44c1_s_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c1_s_p8_1[] = { +static const char _vq_lengthlist__44c1_s_p8_1[] = { 1, 4, 4, 6, 5, 7, 7, 9, 9,10,10,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,12,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,15, 7, 7, 8, 8, 9, 9,11,11, @@ -13086,7 +13086,7 @@ static const long _vq_lengthlist__44c1_s_p8_1[] = { static const static_codebook _44c1_s_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c1_s_p8_1, + (char *)_vq_lengthlist__44c1_s_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c1_s_p8_1, 0 @@ -13112,7 +13112,7 @@ static const long _vq_quantlist__44c1_s_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c1_s_p8_2[] = { +static const char _vq_lengthlist__44c1_s_p8_2[] = { 2, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10,10,10, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 7, 7, 8, 7, 8, 8, 9, 9, 9, 9, 9, @@ -13136,13 +13136,13 @@ static const long _vq_lengthlist__44c1_s_p8_2[] = { static const static_codebook _44c1_s_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c1_s_p8_2, + (char *)_vq_lengthlist__44c1_s_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_s_p8_2, 0 }; -static const long _huff_lengthlist__44c1_s_short[] = { +static const char _huff_lengthlist__44c1_s_short[] = { 6, 8,13,12,13,14,15,16,16, 4, 2, 4, 7, 6, 8,11, 13,15,10, 4, 4, 8, 6, 8,11,14,17,11, 5, 6, 5, 6, 8,12,14,17,11, 5, 5, 6, 5, 7,10,13,16,12, 6, 7, @@ -13153,13 +13153,13 @@ static const long _huff_lengthlist__44c1_s_short[] = { static const static_codebook _huff_book__44c1_s_short = { 2, 81, - (long *)_huff_lengthlist__44c1_s_short, + (char *)_huff_lengthlist__44c1_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44c1_sm_long[] = { +static const char _huff_lengthlist__44c1_sm_long[] = { 5, 4, 8,10, 9, 9,10,11,12, 4, 2, 5, 6, 6, 8,10, 11,13, 8, 4, 6, 8, 7, 9,12,12,14,10, 6, 8, 4, 5, 6, 9,11,12, 9, 5, 6, 5, 5, 6, 9,11,11, 9, 7, 9, @@ -13170,7 +13170,7 @@ static const long _huff_lengthlist__44c1_sm_long[] = { static const static_codebook _huff_book__44c1_sm_long = { 2, 81, - (long *)_huff_lengthlist__44c1_sm_long, + (char *)_huff_lengthlist__44c1_sm_long, 0, 0, 0, 0, 0, NULL, 0 @@ -13182,7 +13182,7 @@ static const long _vq_quantlist__44c1_sm_p1_0[] = { 2, }; -static const long _vq_lengthlist__44c1_sm_p1_0[] = { +static const char _vq_lengthlist__44c1_sm_p1_0[] = { 1, 5, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -13598,7 +13598,7 @@ static const long _vq_lengthlist__44c1_sm_p1_0[] = { static const static_codebook _44c1_sm_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44c1_sm_p1_0, + (char *)_vq_lengthlist__44c1_sm_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44c1_sm_p1_0, 0 @@ -13612,7 +13612,7 @@ static const long _vq_quantlist__44c1_sm_p2_0[] = { 4, }; -static const long _vq_lengthlist__44c1_sm_p2_0[] = { +static const char _vq_lengthlist__44c1_sm_p2_0[] = { 2, 3, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -13657,7 +13657,7 @@ static const long _vq_lengthlist__44c1_sm_p2_0[] = { static const static_codebook _44c1_sm_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44c1_sm_p2_0, + (char *)_vq_lengthlist__44c1_sm_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_sm_p2_0, 0 @@ -13675,7 +13675,7 @@ static const long _vq_quantlist__44c1_sm_p3_0[] = { 8, }; -static const long _vq_lengthlist__44c1_sm_p3_0[] = { +static const char _vq_lengthlist__44c1_sm_p3_0[] = { 1, 3, 3, 7, 7, 0, 0, 0, 0, 0, 5, 5, 6, 6, 0, 0, 0, 0, 0, 5, 5, 7, 7, 0, 0, 0, 0, 0, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -13686,7 +13686,7 @@ static const long _vq_lengthlist__44c1_sm_p3_0[] = { static const static_codebook _44c1_sm_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_sm_p3_0, + (char *)_vq_lengthlist__44c1_sm_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_sm_p3_0, 0 @@ -13704,7 +13704,7 @@ static const long _vq_quantlist__44c1_sm_p4_0[] = { 8, }; -static const long _vq_lengthlist__44c1_sm_p4_0[] = { +static const char _vq_lengthlist__44c1_sm_p4_0[] = { 1, 3, 3, 6, 6, 7, 7, 9, 9, 0, 6, 6, 7, 7, 8, 8, 9, 9, 0, 6, 6, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -13715,7 +13715,7 @@ static const long _vq_lengthlist__44c1_sm_p4_0[] = { static const static_codebook _44c1_sm_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44c1_sm_p4_0, + (char *)_vq_lengthlist__44c1_sm_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_sm_p4_0, 0 @@ -13741,7 +13741,7 @@ static const long _vq_quantlist__44c1_sm_p5_0[] = { 16, }; -static const long _vq_lengthlist__44c1_sm_p5_0[] = { +static const char _vq_lengthlist__44c1_sm_p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 5, 5, 6, 6, 8, 8, 9, 9, 9, 9,10,10,10, @@ -13765,7 +13765,7 @@ static const long _vq_lengthlist__44c1_sm_p5_0[] = { static const static_codebook _44c1_sm_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44c1_sm_p5_0, + (char *)_vq_lengthlist__44c1_sm_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_sm_p5_0, 0 @@ -13777,7 +13777,7 @@ static const long _vq_quantlist__44c1_sm_p6_0[] = { 2, }; -static const long _vq_lengthlist__44c1_sm_p6_0[] = { +static const char _vq_lengthlist__44c1_sm_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 7,10, 9, 9,11, 9, 9, 4, 7, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, 11,11,10,10, 6, 9, 9,11,11,10,11,10,10, 6, 9, 9, @@ -13788,7 +13788,7 @@ static const long _vq_lengthlist__44c1_sm_p6_0[] = { static const static_codebook _44c1_sm_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44c1_sm_p6_0, + (char *)_vq_lengthlist__44c1_sm_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44c1_sm_p6_0, 0 @@ -13808,7 +13808,7 @@ static const long _vq_quantlist__44c1_sm_p6_1[] = { 10, }; -static const long _vq_lengthlist__44c1_sm_p6_1[] = { +static const char _vq_lengthlist__44c1_sm_p6_1[] = { 2, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -13821,7 +13821,7 @@ static const long _vq_lengthlist__44c1_sm_p6_1[] = { static const static_codebook _44c1_sm_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44c1_sm_p6_1, + (char *)_vq_lengthlist__44c1_sm_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44c1_sm_p6_1, 0 @@ -13843,7 +13843,7 @@ static const long _vq_quantlist__44c1_sm_p7_0[] = { 12, }; -static const long _vq_lengthlist__44c1_sm_p7_0[] = { +static const char _vq_lengthlist__44c1_sm_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 7, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,11,10, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -13859,7 +13859,7 @@ static const long _vq_lengthlist__44c1_sm_p7_0[] = { static const static_codebook _44c1_sm_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_sm_p7_0, + (char *)_vq_lengthlist__44c1_sm_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44c1_sm_p7_0, 0 @@ -13873,14 +13873,14 @@ static const long _vq_quantlist__44c1_sm_p7_1[] = { 4, }; -static const long _vq_lengthlist__44c1_sm_p7_1[] = { +static const char _vq_lengthlist__44c1_sm_p7_1[] = { 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44c1_sm_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44c1_sm_p7_1, + (char *)_vq_lengthlist__44c1_sm_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44c1_sm_p7_1, 0 @@ -13902,7 +13902,7 @@ static const long _vq_quantlist__44c1_sm_p8_0[] = { 12, }; -static const long _vq_lengthlist__44c1_sm_p8_0[] = { +static const char _vq_lengthlist__44c1_sm_p8_0[] = { 1, 3, 3,13,13,13,13,13,13,13,13,13,13, 3, 6, 6, 13,13,13,13,13,13,13,13,13,13, 4, 8, 7,13,13,13, 13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13, @@ -13918,7 +13918,7 @@ static const long _vq_lengthlist__44c1_sm_p8_0[] = { static const static_codebook _44c1_sm_p8_0 = { 2, 169, - (long *)_vq_lengthlist__44c1_sm_p8_0, + (char *)_vq_lengthlist__44c1_sm_p8_0, 1, -514541568, 1627103232, 4, 0, (long *)_vq_quantlist__44c1_sm_p8_0, 0 @@ -13940,7 +13940,7 @@ static const long _vq_quantlist__44c1_sm_p8_1[] = { 12, }; -static const long _vq_lengthlist__44c1_sm_p8_1[] = { +static const char _vq_lengthlist__44c1_sm_p8_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 9,10,11,12,12, 6, 5, 5, 7, 7, 8, 7,10,10,11,11,12,12, 6, 5, 5, 7, 7, 8, 8,10,10,11,11,12,12,16, 7, 7, 8, 8, 9, 9,11,11, @@ -13956,7 +13956,7 @@ static const long _vq_lengthlist__44c1_sm_p8_1[] = { static const static_codebook _44c1_sm_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44c1_sm_p8_1, + (char *)_vq_lengthlist__44c1_sm_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44c1_sm_p8_1, 0 @@ -13982,7 +13982,7 @@ static const long _vq_quantlist__44c1_sm_p8_2[] = { 16, }; -static const long _vq_lengthlist__44c1_sm_p8_2[] = { +static const char _vq_lengthlist__44c1_sm_p8_2[] = { 2, 5, 5, 6, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8,10, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, @@ -14006,13 +14006,13 @@ static const long _vq_lengthlist__44c1_sm_p8_2[] = { static const static_codebook _44c1_sm_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44c1_sm_p8_2, + (char *)_vq_lengthlist__44c1_sm_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44c1_sm_p8_2, 0 }; -static const long _huff_lengthlist__44c1_sm_short[] = { +static const char _huff_lengthlist__44c1_sm_short[] = { 4, 7,13,14,14,15,16,18,18, 4, 2, 5, 8, 7, 9,12, 15,15,10, 4, 5,10, 6, 8,11,15,17,12, 5, 7, 5, 6, 8,11,14,17,11, 5, 6, 6, 5, 6, 9,13,17,12, 6, 7, @@ -14023,13 +14023,13 @@ static const long _huff_lengthlist__44c1_sm_short[] = { static const static_codebook _huff_book__44c1_sm_short = { 2, 81, - (long *)_huff_lengthlist__44c1_sm_short, + (char *)_huff_lengthlist__44c1_sm_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44cn1_s_long[] = { +static const char _huff_lengthlist__44cn1_s_long[] = { 4, 4, 7, 8, 7, 8,10,12,17, 3, 1, 6, 6, 7, 8,10, 12,15, 7, 6, 9, 9, 9,11,12,14,17, 8, 6, 9, 6, 7, 9,11,13,17, 7, 6, 9, 7, 7, 8, 9,12,15, 8, 8,10, @@ -14040,7 +14040,7 @@ static const long _huff_lengthlist__44cn1_s_long[] = { static const static_codebook _huff_book__44cn1_s_long = { 2, 81, - (long *)_huff_lengthlist__44cn1_s_long, + (char *)_huff_lengthlist__44cn1_s_long, 0, 0, 0, 0, 0, NULL, 0 @@ -14052,7 +14052,7 @@ static const long _vq_quantlist__44cn1_s_p1_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_s_p1_0[] = { +static const char _vq_lengthlist__44cn1_s_p1_0[] = { 1, 4, 4, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -14468,7 +14468,7 @@ static const long _vq_lengthlist__44cn1_s_p1_0[] = { static const static_codebook _44cn1_s_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44cn1_s_p1_0, + (char *)_vq_lengthlist__44cn1_s_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44cn1_s_p1_0, 0 @@ -14482,7 +14482,7 @@ static const long _vq_quantlist__44cn1_s_p2_0[] = { 4, }; -static const long _vq_lengthlist__44cn1_s_p2_0[] = { +static const char _vq_lengthlist__44cn1_s_p2_0[] = { 1, 4, 4, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -14527,7 +14527,7 @@ static const long _vq_lengthlist__44cn1_s_p2_0[] = { static const static_codebook _44cn1_s_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44cn1_s_p2_0, + (char *)_vq_lengthlist__44cn1_s_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_s_p2_0, 0 @@ -14545,7 +14545,7 @@ static const long _vq_quantlist__44cn1_s_p3_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_s_p3_0[] = { +static const char _vq_lengthlist__44cn1_s_p3_0[] = { 1, 2, 3, 7, 7, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0, @@ -14556,7 +14556,7 @@ static const long _vq_lengthlist__44cn1_s_p3_0[] = { static const static_codebook _44cn1_s_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_s_p3_0, + (char *)_vq_lengthlist__44cn1_s_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_s_p3_0, 0 @@ -14574,7 +14574,7 @@ static const long _vq_quantlist__44cn1_s_p4_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_s_p4_0[] = { +static const char _vq_lengthlist__44cn1_s_p4_0[] = { 1, 3, 3, 6, 6, 6, 6, 8, 8, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 6, 6, 7, 7, 9, 9, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, 7, 7, 8, 8,10,10, 0, 0, 0, @@ -14585,7 +14585,7 @@ static const long _vq_lengthlist__44cn1_s_p4_0[] = { static const static_codebook _44cn1_s_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_s_p4_0, + (char *)_vq_lengthlist__44cn1_s_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_s_p4_0, 0 @@ -14611,7 +14611,7 @@ static const long _vq_quantlist__44cn1_s_p5_0[] = { 16, }; -static const long _vq_lengthlist__44cn1_s_p5_0[] = { +static const char _vq_lengthlist__44cn1_s_p5_0[] = { 1, 4, 3, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,10, 10, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10,10, 11,11, 0, 0, 0, 7, 7, 8, 8, 9, 9, 9, 9,10,10,10, @@ -14635,7 +14635,7 @@ static const long _vq_lengthlist__44cn1_s_p5_0[] = { static const static_codebook _44cn1_s_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44cn1_s_p5_0, + (char *)_vq_lengthlist__44cn1_s_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_s_p5_0, 0 @@ -14647,7 +14647,7 @@ static const long _vq_quantlist__44cn1_s_p6_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_s_p6_0[] = { +static const char _vq_lengthlist__44cn1_s_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 6, 6,10, 9, 9,11, 9, 9, 4, 6, 6,10, 9, 9,10, 9, 9, 7,10,10,11,11, 11,12,11,11, 7, 9, 9,11,11,10,11,10,10, 7, 9, 9, @@ -14658,7 +14658,7 @@ static const long _vq_lengthlist__44cn1_s_p6_0[] = { static const static_codebook _44cn1_s_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44cn1_s_p6_0, + (char *)_vq_lengthlist__44cn1_s_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44cn1_s_p6_0, 0 @@ -14678,7 +14678,7 @@ static const long _vq_quantlist__44cn1_s_p6_1[] = { 10, }; -static const long _vq_lengthlist__44cn1_s_p6_1[] = { +static const char _vq_lengthlist__44cn1_s_p6_1[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 6, 8, 8, 8, 8, 8, 8,10,10,10, 7, 6, 7, 7, 8, 8, 8, 8,10,10,10, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -14691,7 +14691,7 @@ static const long _vq_lengthlist__44cn1_s_p6_1[] = { static const static_codebook _44cn1_s_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44cn1_s_p6_1, + (char *)_vq_lengthlist__44cn1_s_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_s_p6_1, 0 @@ -14713,7 +14713,7 @@ static const long _vq_quantlist__44cn1_s_p7_0[] = { 12, }; -static const long _vq_lengthlist__44cn1_s_p7_0[] = { +static const char _vq_lengthlist__44cn1_s_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 6, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9,11,11, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -14729,7 +14729,7 @@ static const long _vq_lengthlist__44cn1_s_p7_0[] = { static const static_codebook _44cn1_s_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44cn1_s_p7_0, + (char *)_vq_lengthlist__44cn1_s_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44cn1_s_p7_0, 0 @@ -14743,14 +14743,14 @@ static const long _vq_quantlist__44cn1_s_p7_1[] = { 4, }; -static const long _vq_lengthlist__44cn1_s_p7_1[] = { +static const char _vq_lengthlist__44cn1_s_p7_1[] = { 2, 3, 3, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44cn1_s_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44cn1_s_p7_1, + (char *)_vq_lengthlist__44cn1_s_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_s_p7_1, 0 @@ -14764,7 +14764,7 @@ static const long _vq_quantlist__44cn1_s_p8_0[] = { 4, }; -static const long _vq_lengthlist__44cn1_s_p8_0[] = { +static const char _vq_lengthlist__44cn1_s_p8_0[] = { 1, 7, 7,11,11, 8,11,11,11,11, 4,11, 3,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,10,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -14809,7 +14809,7 @@ static const long _vq_lengthlist__44cn1_s_p8_0[] = { static const static_codebook _44cn1_s_p8_0 = { 4, 625, - (long *)_vq_lengthlist__44cn1_s_p8_0, + (char *)_vq_lengthlist__44cn1_s_p8_0, 1, -518283264, 1627103232, 3, 0, (long *)_vq_quantlist__44cn1_s_p8_0, 0 @@ -14831,7 +14831,7 @@ static const long _vq_quantlist__44cn1_s_p8_1[] = { 12, }; -static const long _vq_lengthlist__44cn1_s_p8_1[] = { +static const char _vq_lengthlist__44cn1_s_p8_1[] = { 1, 4, 4, 6, 6, 8, 8, 9,10,10,11,11,11, 6, 5, 5, 7, 7, 8, 8, 9,10, 9,11,11,12, 5, 5, 5, 7, 7, 8, 9,10,10,12,12,14,13,15, 7, 7, 8, 8, 9,10,11,11, @@ -14847,7 +14847,7 @@ static const long _vq_lengthlist__44cn1_s_p8_1[] = { static const static_codebook _44cn1_s_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44cn1_s_p8_1, + (char *)_vq_lengthlist__44cn1_s_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44cn1_s_p8_1, 0 @@ -14873,7 +14873,7 @@ static const long _vq_quantlist__44cn1_s_p8_2[] = { 16, }; -static const long _vq_lengthlist__44cn1_s_p8_2[] = { +static const char _vq_lengthlist__44cn1_s_p8_2[] = { 3, 4, 3, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,11,11, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, @@ -14897,13 +14897,13 @@ static const long _vq_lengthlist__44cn1_s_p8_2[] = { static const static_codebook _44cn1_s_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44cn1_s_p8_2, + (char *)_vq_lengthlist__44cn1_s_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_s_p8_2, 0 }; -static const long _huff_lengthlist__44cn1_s_short[] = { +static const char _huff_lengthlist__44cn1_s_short[] = { 10, 9,12,15,12,13,16,14,16, 7, 1, 5,14, 7,10,13, 16,16, 9, 4, 6,16, 8,11,16,16,16,14, 4, 7,16, 9, 12,14,16,16,10, 5, 7,14, 9,12,14,15,15,13, 8, 9, @@ -14914,13 +14914,13 @@ static const long _huff_lengthlist__44cn1_s_short[] = { static const static_codebook _huff_book__44cn1_s_short = { 2, 81, - (long *)_huff_lengthlist__44cn1_s_short, + (char *)_huff_lengthlist__44cn1_s_short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44cn1_sm_long[] = { +static const char _huff_lengthlist__44cn1_sm_long[] = { 3, 3, 8, 8, 8, 8,10,12,14, 3, 2, 6, 7, 7, 8,10, 12,16, 7, 6, 7, 9, 8,10,12,14,16, 8, 6, 8, 4, 5, 7, 9,11,13, 7, 6, 8, 5, 6, 7, 9,11,14, 8, 8,10, @@ -14931,7 +14931,7 @@ static const long _huff_lengthlist__44cn1_sm_long[] = { static const static_codebook _huff_book__44cn1_sm_long = { 2, 81, - (long *)_huff_lengthlist__44cn1_sm_long, + (char *)_huff_lengthlist__44cn1_sm_long, 0, 0, 0, 0, 0, NULL, 0 @@ -14943,7 +14943,7 @@ static const long _vq_quantlist__44cn1_sm_p1_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_sm_p1_0[] = { +static const char _vq_lengthlist__44cn1_sm_p1_0[] = { 1, 4, 5, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -15359,7 +15359,7 @@ static const long _vq_lengthlist__44cn1_sm_p1_0[] = { static const static_codebook _44cn1_sm_p1_0 = { 8, 6561, - (long *)_vq_lengthlist__44cn1_sm_p1_0, + (char *)_vq_lengthlist__44cn1_sm_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44cn1_sm_p1_0, 0 @@ -15373,7 +15373,7 @@ static const long _vq_quantlist__44cn1_sm_p2_0[] = { 4, }; -static const long _vq_lengthlist__44cn1_sm_p2_0[] = { +static const char _vq_lengthlist__44cn1_sm_p2_0[] = { 1, 4, 4, 6, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -15418,7 +15418,7 @@ static const long _vq_lengthlist__44cn1_sm_p2_0[] = { static const static_codebook _44cn1_sm_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44cn1_sm_p2_0, + (char *)_vq_lengthlist__44cn1_sm_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_sm_p2_0, 0 @@ -15436,7 +15436,7 @@ static const long _vq_quantlist__44cn1_sm_p3_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_sm_p3_0[] = { +static const char _vq_lengthlist__44cn1_sm_p3_0[] = { 1, 3, 4, 7, 7, 0, 0, 0, 0, 0, 4, 4, 7, 7, 0, 0, 0, 0, 0, 4, 5, 7, 7, 0, 0, 0, 0, 0, 6, 7, 8, 8, 0, 0, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, 0, @@ -15447,7 +15447,7 @@ static const long _vq_lengthlist__44cn1_sm_p3_0[] = { static const static_codebook _44cn1_sm_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_sm_p3_0, + (char *)_vq_lengthlist__44cn1_sm_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_sm_p3_0, 0 @@ -15465,7 +15465,7 @@ static const long _vq_quantlist__44cn1_sm_p4_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_sm_p4_0[] = { +static const char _vq_lengthlist__44cn1_sm_p4_0[] = { 1, 4, 3, 6, 6, 7, 7, 9, 9, 0, 5, 5, 7, 7, 8, 7, 9, 9, 0, 5, 5, 7, 7, 8, 8, 9, 9, 0, 7, 7, 8, 8, 8, 8,10,10, 0, 0, 0, 8, 8, 8, 8,10,10, 0, 0, 0, @@ -15476,7 +15476,7 @@ static const long _vq_lengthlist__44cn1_sm_p4_0[] = { static const static_codebook _44cn1_sm_p4_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_sm_p4_0, + (char *)_vq_lengthlist__44cn1_sm_p4_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_sm_p4_0, 0 @@ -15502,7 +15502,7 @@ static const long _vq_quantlist__44cn1_sm_p5_0[] = { 16, }; -static const long _vq_lengthlist__44cn1_sm_p5_0[] = { +static const char _vq_lengthlist__44cn1_sm_p5_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9, 8, 8, 9, 9,10,10,11, 11, 0, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11,11, 12,12, 0, 6, 5, 7, 7, 8, 8, 9, 9, 9, 9,10,10,11, @@ -15526,7 +15526,7 @@ static const long _vq_lengthlist__44cn1_sm_p5_0[] = { static const static_codebook _44cn1_sm_p5_0 = { 2, 289, - (long *)_vq_lengthlist__44cn1_sm_p5_0, + (char *)_vq_lengthlist__44cn1_sm_p5_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_sm_p5_0, 0 @@ -15538,7 +15538,7 @@ static const long _vq_quantlist__44cn1_sm_p6_0[] = { 2, }; -static const long _vq_lengthlist__44cn1_sm_p6_0[] = { +static const char _vq_lengthlist__44cn1_sm_p6_0[] = { 1, 4, 4, 7, 6, 6, 7, 6, 6, 4, 7, 6,10, 9, 9,11, 9, 9, 4, 6, 7,10, 9, 9,11, 9, 9, 7,10,10,10,11, 11,11,11,10, 6, 9, 9,11,10,10,11,10,10, 6, 9, 9, @@ -15549,7 +15549,7 @@ static const long _vq_lengthlist__44cn1_sm_p6_0[] = { static const static_codebook _44cn1_sm_p6_0 = { 4, 81, - (long *)_vq_lengthlist__44cn1_sm_p6_0, + (char *)_vq_lengthlist__44cn1_sm_p6_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44cn1_sm_p6_0, 0 @@ -15569,7 +15569,7 @@ static const long _vq_quantlist__44cn1_sm_p6_1[] = { 10, }; -static const long _vq_lengthlist__44cn1_sm_p6_1[] = { +static const char _vq_lengthlist__44cn1_sm_p6_1[] = { 2, 4, 4, 5, 5, 7, 7, 7, 7, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8,10, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8,10,10,10, 7, @@ -15582,7 +15582,7 @@ static const long _vq_lengthlist__44cn1_sm_p6_1[] = { static const static_codebook _44cn1_sm_p6_1 = { 2, 121, - (long *)_vq_lengthlist__44cn1_sm_p6_1, + (char *)_vq_lengthlist__44cn1_sm_p6_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44cn1_sm_p6_1, 0 @@ -15604,7 +15604,7 @@ static const long _vq_quantlist__44cn1_sm_p7_0[] = { 12, }; -static const long _vq_lengthlist__44cn1_sm_p7_0[] = { +static const char _vq_lengthlist__44cn1_sm_p7_0[] = { 1, 4, 4, 6, 6, 7, 7, 7, 7, 9, 9,10,10, 7, 5, 5, 7, 7, 8, 8, 8, 8,10, 9,11,10, 7, 5, 5, 7, 7, 8, 8, 8, 8, 9,10,11,11, 0, 8, 8, 8, 8, 9, 9, 9, 9, @@ -15620,7 +15620,7 @@ static const long _vq_lengthlist__44cn1_sm_p7_0[] = { static const static_codebook _44cn1_sm_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44cn1_sm_p7_0, + (char *)_vq_lengthlist__44cn1_sm_p7_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44cn1_sm_p7_0, 0 @@ -15634,14 +15634,14 @@ static const long _vq_quantlist__44cn1_sm_p7_1[] = { 4, }; -static const long _vq_lengthlist__44cn1_sm_p7_1[] = { +static const char _vq_lengthlist__44cn1_sm_p7_1[] = { 2, 4, 4, 4, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 5, 5, 5, 5, 6, 6, 6, 5, 5, }; static const static_codebook _44cn1_sm_p7_1 = { 2, 25, - (long *)_vq_lengthlist__44cn1_sm_p7_1, + (char *)_vq_lengthlist__44cn1_sm_p7_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44cn1_sm_p7_1, 0 @@ -15659,7 +15659,7 @@ static const long _vq_quantlist__44cn1_sm_p8_0[] = { 8, }; -static const long _vq_lengthlist__44cn1_sm_p8_0[] = { +static const char _vq_lengthlist__44cn1_sm_p8_0[] = { 1, 4, 4,12,11,13,13,14,14, 4, 7, 7,11,13,14,14, 14,14, 3, 8, 3,14,14,14,14,14,14,14,10,12,14,14, 14,14,14,14,14,14, 5,14, 8,14,14,14,14,14,12,14, @@ -15670,7 +15670,7 @@ static const long _vq_lengthlist__44cn1_sm_p8_0[] = { static const static_codebook _44cn1_sm_p8_0 = { 2, 81, - (long *)_vq_lengthlist__44cn1_sm_p8_0, + (char *)_vq_lengthlist__44cn1_sm_p8_0, 1, -516186112, 1627103232, 4, 0, (long *)_vq_quantlist__44cn1_sm_p8_0, 0 @@ -15692,7 +15692,7 @@ static const long _vq_quantlist__44cn1_sm_p8_1[] = { 12, }; -static const long _vq_lengthlist__44cn1_sm_p8_1[] = { +static const char _vq_lengthlist__44cn1_sm_p8_1[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,11,11, 6, 5, 5, 7, 7, 8, 8,10,10,10,11,11,11, 6, 5, 5, 7, 7, 8, 8,10,10,11,12,12,12,14, 7, 7, 7, 8, 9, 9,11,11, @@ -15708,7 +15708,7 @@ static const long _vq_lengthlist__44cn1_sm_p8_1[] = { static const static_codebook _44cn1_sm_p8_1 = { 2, 169, - (long *)_vq_lengthlist__44cn1_sm_p8_1, + (char *)_vq_lengthlist__44cn1_sm_p8_1, 1, -522616832, 1620115456, 4, 0, (long *)_vq_quantlist__44cn1_sm_p8_1, 0 @@ -15734,7 +15734,7 @@ static const long _vq_quantlist__44cn1_sm_p8_2[] = { 16, }; -static const long _vq_lengthlist__44cn1_sm_p8_2[] = { +static const char _vq_lengthlist__44cn1_sm_p8_2[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9,10, 6, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, @@ -15758,13 +15758,13 @@ static const long _vq_lengthlist__44cn1_sm_p8_2[] = { static const static_codebook _44cn1_sm_p8_2 = { 2, 289, - (long *)_vq_lengthlist__44cn1_sm_p8_2, + (char *)_vq_lengthlist__44cn1_sm_p8_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44cn1_sm_p8_2, 0 }; -static const long _huff_lengthlist__44cn1_sm_short[] = { +static const char _huff_lengthlist__44cn1_sm_short[] = { 5, 6,12,14,12,14,16,17,18, 4, 2, 5,11, 7,10,12, 14,15, 9, 4, 5,11, 7,10,13,15,18,15, 6, 7, 5, 6, 8,11,13,16,11, 5, 6, 5, 5, 6, 9,13,15,12, 5, 7, @@ -15775,7 +15775,7 @@ static const long _huff_lengthlist__44cn1_sm_short[] = { static const static_codebook _huff_book__44cn1_sm_short = { 2, 81, - (long *)_huff_lengthlist__44cn1_sm_short, + (char *)_huff_lengthlist__44cn1_sm_short, 0, 0, 0, 0, 0, NULL, 0 diff --git a/drivers/vorbis/books/floor/Makefile.am b/drivers/vorbis/books/floor/Makefile.am deleted file mode 100644 index 272ab1a28c..0000000000 --- a/drivers/vorbis/books/floor/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = floor_books.h diff --git a/drivers/vorbis/books/floor/Makefile.in b/drivers/vorbis/books/floor/Makefile.in deleted file mode 100644 index 6148dc21f1..0000000000 --- a/drivers/vorbis/books/floor/Makefile.in +++ /dev/null @@ -1,356 +0,0 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = lib/books/floor -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEBUG = @DEBUG@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_DOXYGEN = @HAVE_DOXYGEN@ -HTLATEX = @HTLATEX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PDFLATEX = @PDFLATEX@ -PKG_CONFIG = @PKG_CONFIG@ -PROFILE = @PROFILE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -VE_LIB_AGE = @VE_LIB_AGE@ -VE_LIB_CURRENT = @VE_LIB_CURRENT@ -VE_LIB_REVISION = @VE_LIB_REVISION@ -VF_LIB_AGE = @VF_LIB_AGE@ -VF_LIB_CURRENT = @VF_LIB_CURRENT@ -VF_LIB_REVISION = @VF_LIB_REVISION@ -VORBIS_LIBS = @VORBIS_LIBS@ -V_LIB_AGE = @V_LIB_AGE@ -V_LIB_CURRENT = @V_LIB_CURRENT@ -V_LIB_REVISION = @V_LIB_REVISION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pthread_lib = @pthread_lib@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = floor_books.h -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/books/floor/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/books/floor/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/drivers/vorbis/books/floor/floor_books.h b/drivers/vorbis/books/floor/floor_books.h index 14320cf692..e925313f7b 100644 --- a/drivers/vorbis/books/floor/floor_books.h +++ b/drivers/vorbis/books/floor/floor_books.h @@ -11,38 +11,38 @@ ******************************************************************** function: static codebooks autogenerated by huff/huffbuld - last modified: $Id: floor_books.h 16939 2010-03-01 08:38:14Z xiphmont $ + last modified: $Id: floor_books.h 19057 2014-01-22 12:32:31Z xiphmont $ ********************************************************************/ #include "codebook.h" -static const long _huff_lengthlist_line_256x7_0sub1[] = { +static const char _huff_lengthlist_line_256x7_0sub1[] = { 0, 2, 3, 3, 3, 3, 4, 3, 4, }; static const static_codebook _huff_book_line_256x7_0sub1 = { 1, 9, - (long *)_huff_lengthlist_line_256x7_0sub1, + (char *)_huff_lengthlist_line_256x7_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_0sub2[] = { +static const char _huff_lengthlist_line_256x7_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 5, 3, 6, 3, 6, 4, 6, 4, 7, 5, 7, }; static const static_codebook _huff_book_line_256x7_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x7_0sub2, + (char *)_huff_lengthlist_line_256x7_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_0sub3[] = { +static const char _huff_lengthlist_line_256x7_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 2, 5, 3, 5, 3, 6, 3, 6, 4, 7, 6, 7, 8, 7, 9, 8, 9, 9, 9,10, 9, @@ -51,38 +51,38 @@ static const long _huff_lengthlist_line_256x7_0sub3[] = { static const static_codebook _huff_book_line_256x7_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x7_0sub3, + (char *)_huff_lengthlist_line_256x7_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_1sub1[] = { +static const char _huff_lengthlist_line_256x7_1sub1[] = { 0, 3, 3, 3, 3, 2, 4, 3, 4, }; static const static_codebook _huff_book_line_256x7_1sub1 = { 1, 9, - (long *)_huff_lengthlist_line_256x7_1sub1, + (char *)_huff_lengthlist_line_256x7_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_1sub2[] = { +static const char _huff_lengthlist_line_256x7_1sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 4, 4, 5, 4, 6, 5, 6, 7, 6, 8, 8, }; static const static_codebook _huff_book_line_256x7_1sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x7_1sub2, + (char *)_huff_lengthlist_line_256x7_1sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_1sub3[] = { +static const char _huff_lengthlist_line_256x7_1sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 4, 3, 6, 3, 7, 3, 8, 5, 8, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -91,13 +91,13 @@ static const long _huff_lengthlist_line_256x7_1sub3[] = { static const static_codebook _huff_book_line_256x7_1sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x7_1sub3, + (char *)_huff_lengthlist_line_256x7_1sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_class0[] = { +static const char _huff_lengthlist_line_256x7_class0[] = { 7, 5, 5, 9, 9, 6, 6, 9,12, 8, 7, 8,11, 8, 9,15, 6, 3, 3, 7, 7, 4, 3, 6, 9, 6, 5, 6, 8, 6, 8,15, 8, 5, 5, 9, 8, 5, 4, 6,10, 7, 5, 5,11, 8, 7,15, @@ -106,13 +106,13 @@ static const long _huff_lengthlist_line_256x7_class0[] = { static const static_codebook _huff_book_line_256x7_class0 = { 1, 64, - (long *)_huff_lengthlist_line_256x7_class0, + (char *)_huff_lengthlist_line_256x7_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x7_class1[] = { +static const char _huff_lengthlist_line_256x7_class1[] = { 5, 6, 8,15, 6, 9,10,15,10,11,12,15,15,15,15,15, 4, 6, 7,15, 6, 7, 8,15, 9, 8, 9,15,15,15,15,15, 6, 8, 9,15, 7, 7, 8,15,10, 9,10,15,15,15,15,15, @@ -133,13 +133,13 @@ static const long _huff_lengthlist_line_256x7_class1[] = { static const static_codebook _huff_book_line_256x7_class1 = { 1, 256, - (long *)_huff_lengthlist_line_256x7_class1, + (char *)_huff_lengthlist_line_256x7_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_0sub0[] = { +static const char _huff_lengthlist_line_512x17_0sub0[] = { 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 6, 6, 6, 5, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 8, 7, 8, 7, 9, 7, 9, 7, @@ -152,26 +152,26 @@ static const long _huff_lengthlist_line_512x17_0sub0[] = { static const static_codebook _huff_book_line_512x17_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_0sub0, + (char *)_huff_lengthlist_line_512x17_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_1sub0[] = { +static const char _huff_lengthlist_line_512x17_1sub0[] = { 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 6, 7, 6, 7, 6, 8, 7, 8, 7, 8, 7, 8, 7, }; static const static_codebook _huff_book_line_512x17_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_512x17_1sub0, + (char *)_huff_lengthlist_line_512x17_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_1sub1[] = { +static const char _huff_lengthlist_line_512x17_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 5, 3, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, @@ -184,26 +184,26 @@ static const long _huff_lengthlist_line_512x17_1sub1[] = { static const static_codebook _huff_book_line_512x17_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_1sub1, + (char *)_huff_lengthlist_line_512x17_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_2sub1[] = { +static const char _huff_lengthlist_line_512x17_2sub1[] = { 0, 4, 5, 4, 4, 4, 5, 4, 4, 4, 5, 4, 5, 4, 5, 3, 5, 3, }; static const static_codebook _huff_book_line_512x17_2sub1 = { 1, 18, - (long *)_huff_lengthlist_line_512x17_2sub1, + (char *)_huff_lengthlist_line_512x17_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_2sub2[] = { +static const char _huff_lengthlist_line_512x17_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 6, 4, 6, 5, 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 7, 8, 7, 9, 7, @@ -212,13 +212,13 @@ static const long _huff_lengthlist_line_512x17_2sub2[] = { static const static_codebook _huff_book_line_512x17_2sub2 = { 1, 50, - (long *)_huff_lengthlist_line_512x17_2sub2, + (char *)_huff_lengthlist_line_512x17_2sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_2sub3[] = { +static const char _huff_lengthlist_line_512x17_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -231,26 +231,26 @@ static const long _huff_lengthlist_line_512x17_2sub3[] = { static const static_codebook _huff_book_line_512x17_2sub3 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_2sub3, + (char *)_huff_lengthlist_line_512x17_2sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_3sub1[] = { +static const char _huff_lengthlist_line_512x17_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 3, 4, 4, 4, 4, 4, 5, 4, 5, 5, 5, }; static const static_codebook _huff_book_line_512x17_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_512x17_3sub1, + (char *)_huff_lengthlist_line_512x17_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_3sub2[] = { +static const char _huff_lengthlist_line_512x17_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3, 4, 3, 5, 4, 6, 4, 6, 5, 7, 6, 7, 6, 8, 6, 8, 7, 9, 8,10, 8,12, 9,13,10,15,10,15, @@ -259,13 +259,13 @@ static const long _huff_lengthlist_line_512x17_3sub2[] = { static const static_codebook _huff_book_line_512x17_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_512x17_3sub2, + (char *)_huff_lengthlist_line_512x17_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_3sub3[] = { +static const char _huff_lengthlist_line_512x17_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -278,25 +278,25 @@ static const long _huff_lengthlist_line_512x17_3sub3[] = { static const static_codebook _huff_book_line_512x17_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_512x17_3sub3, + (char *)_huff_lengthlist_line_512x17_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_class1[] = { +static const char _huff_lengthlist_line_512x17_class1[] = { 1, 2, 3, 6, 5, 4, 7, 7, }; static const static_codebook _huff_book_line_512x17_class1 = { 1, 8, - (long *)_huff_lengthlist_line_512x17_class1, + (char *)_huff_lengthlist_line_512x17_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_class2[] = { +static const char _huff_lengthlist_line_512x17_class2[] = { 3, 3, 3,14, 5, 4, 4,11, 8, 6, 6,10,17,12,11,17, 6, 5, 5,15, 5, 3, 4,11, 8, 5, 5, 8,16, 9,10,14, 10, 8, 9,17, 8, 6, 6,13,10, 7, 7,10,16,11,13,14, @@ -305,13 +305,13 @@ static const long _huff_lengthlist_line_512x17_class2[] = { static const static_codebook _huff_book_line_512x17_class2 = { 1, 64, - (long *)_huff_lengthlist_line_512x17_class2, + (char *)_huff_lengthlist_line_512x17_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_512x17_class3[] = { +static const char _huff_lengthlist_line_512x17_class3[] = { 2, 4, 6,17, 4, 5, 7,17, 8, 7,10,17,17,17,17,17, 3, 4, 6,15, 3, 3, 6,15, 7, 6, 9,17,17,17,17,17, 6, 8,10,17, 6, 6, 8,16, 9, 8,10,17,17,15,16,17, @@ -320,13 +320,13 @@ static const long _huff_lengthlist_line_512x17_class3[] = { static const static_codebook _huff_book_line_512x17_class3 = { 1, 64, - (long *)_huff_lengthlist_line_512x17_class3, + (char *)_huff_lengthlist_line_512x17_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_class0[] = { +static const char _huff_lengthlist_line_128x4_class0[] = { 7, 7, 7,11, 6, 6, 7,11, 7, 6, 6,10,12,10,10,13, 7, 7, 8,11, 7, 7, 7,11, 7, 6, 7,10,11,10,10,13, 10,10, 9,12, 9, 9, 9,11, 8, 8, 8,11,13,11,10,14, @@ -347,50 +347,50 @@ static const long _huff_lengthlist_line_128x4_class0[] = { static const static_codebook _huff_book_line_128x4_class0 = { 1, 256, - (long *)_huff_lengthlist_line_128x4_class0, + (char *)_huff_lengthlist_line_128x4_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub0[] = { +static const char _huff_lengthlist_line_128x4_0sub0[] = { 2, 2, 2, 2, }; static const static_codebook _huff_book_line_128x4_0sub0 = { 1, 4, - (long *)_huff_lengthlist_line_128x4_0sub0, + (char *)_huff_lengthlist_line_128x4_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub1[] = { +static const char _huff_lengthlist_line_128x4_0sub1[] = { 0, 0, 0, 0, 3, 2, 3, 2, 3, 3, }; static const static_codebook _huff_book_line_128x4_0sub1 = { 1, 10, - (long *)_huff_lengthlist_line_128x4_0sub1, + (char *)_huff_lengthlist_line_128x4_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub2[] = { +static const char _huff_lengthlist_line_128x4_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 6, 5, 6, }; static const static_codebook _huff_book_line_128x4_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_128x4_0sub2, + (char *)_huff_lengthlist_line_128x4_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x4_0sub3[] = { +static const char _huff_lengthlist_line_128x4_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3, 5, 4, 6, 5, 6, 5, 7, 6, 6, 7, 7, 9, 9,11,11,16, @@ -399,13 +399,13 @@ static const long _huff_lengthlist_line_128x4_0sub3[] = { static const static_codebook _huff_book_line_128x4_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_128x4_0sub3, + (char *)_huff_lengthlist_line_128x4_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_class0[] = { +static const char _huff_lengthlist_line_256x4_class0[] = { 6, 7, 7,12, 6, 6, 7,12, 7, 6, 6,10,15,12,11,13, 7, 7, 8,13, 7, 7, 8,12, 7, 7, 7,11,12,12,11,13, 10, 9, 9,11, 9, 9, 9,10,10, 8, 8,12,14,12,12,14, @@ -426,50 +426,50 @@ static const long _huff_lengthlist_line_256x4_class0[] = { static const static_codebook _huff_book_line_256x4_class0 = { 1, 256, - (long *)_huff_lengthlist_line_256x4_class0, + (char *)_huff_lengthlist_line_256x4_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub0[] = { +static const char _huff_lengthlist_line_256x4_0sub0[] = { 2, 2, 2, 2, }; static const static_codebook _huff_book_line_256x4_0sub0 = { 1, 4, - (long *)_huff_lengthlist_line_256x4_0sub0, + (char *)_huff_lengthlist_line_256x4_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub1[] = { +static const char _huff_lengthlist_line_256x4_0sub1[] = { 0, 0, 0, 0, 2, 2, 3, 3, 3, 3, }; static const static_codebook _huff_book_line_256x4_0sub1 = { 1, 10, - (long *)_huff_lengthlist_line_256x4_0sub1, + (char *)_huff_lengthlist_line_256x4_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub2[] = { +static const char _huff_lengthlist_line_256x4_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 3, 5, 3, 5, 4, 5, 4, 6, 4, 6, }; static const static_codebook _huff_book_line_256x4_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x4_0sub2, + (char *)_huff_lengthlist_line_256x4_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4_0sub3[] = { +static const char _huff_lengthlist_line_256x4_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 3, 5, 3, 5, 3, 6, 4, 7, 4, 7, 5, 7, 6, 7, 6, 7, 8,10,13,13,13, @@ -478,13 +478,13 @@ static const long _huff_lengthlist_line_256x4_0sub3[] = { static const static_codebook _huff_book_line_256x4_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x4_0sub3, + (char *)_huff_lengthlist_line_256x4_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_class0[] = { +static const char _huff_lengthlist_line_128x7_class0[] = { 10, 7, 8,13, 9, 6, 7,11,10, 8, 8,12,17,17,17,17, 7, 5, 5, 9, 6, 4, 4, 8, 8, 5, 5, 8,16,14,13,16, 7, 5, 5, 7, 6, 3, 3, 5, 8, 5, 4, 7,14,12,12,15, @@ -493,13 +493,13 @@ static const long _huff_lengthlist_line_128x7_class0[] = { static const static_codebook _huff_book_line_128x7_class0 = { 1, 64, - (long *)_huff_lengthlist_line_128x7_class0, + (char *)_huff_lengthlist_line_128x7_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_class1[] = { +static const char _huff_lengthlist_line_128x7_class1[] = { 8,13,17,17, 8,11,17,17,11,13,17,17,17,17,17,17, 6,10,16,17, 6,10,15,17, 8,10,16,17,17,17,17,17, 9,13,15,17, 8,11,17,17,10,12,17,17,17,17,17,17, @@ -520,38 +520,38 @@ static const long _huff_lengthlist_line_128x7_class1[] = { static const static_codebook _huff_book_line_128x7_class1 = { 1, 256, - (long *)_huff_lengthlist_line_128x7_class1, + (char *)_huff_lengthlist_line_128x7_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_0sub1[] = { +static const char _huff_lengthlist_line_128x7_0sub1[] = { 0, 3, 3, 3, 3, 3, 3, 3, 3, }; static const static_codebook _huff_book_line_128x7_0sub1 = { 1, 9, - (long *)_huff_lengthlist_line_128x7_0sub1, + (char *)_huff_lengthlist_line_128x7_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_0sub2[] = { +static const char _huff_lengthlist_line_128x7_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 6, 4, 6, }; static const static_codebook _huff_book_line_128x7_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_128x7_0sub2, + (char *)_huff_lengthlist_line_128x7_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_0sub3[] = { +static const char _huff_lengthlist_line_128x7_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 5, 3, 5, 3, 5, 4, 5, 4, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, @@ -560,38 +560,38 @@ static const long _huff_lengthlist_line_128x7_0sub3[] = { static const static_codebook _huff_book_line_128x7_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_128x7_0sub3, + (char *)_huff_lengthlist_line_128x7_0sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_1sub1[] = { +static const char _huff_lengthlist_line_128x7_1sub1[] = { 0, 3, 3, 2, 3, 3, 4, 3, 4, }; static const static_codebook _huff_book_line_128x7_1sub1 = { 1, 9, - (long *)_huff_lengthlist_line_128x7_1sub1, + (char *)_huff_lengthlist_line_128x7_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_1sub2[] = { +static const char _huff_lengthlist_line_128x7_1sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 6, 3, 6, 3, 6, 3, 7, 3, 8, 4, 9, 4, 9, }; static const static_codebook _huff_book_line_128x7_1sub2 = { 1, 25, - (long *)_huff_lengthlist_line_128x7_1sub2, + (char *)_huff_lengthlist_line_128x7_1sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x7_1sub3[] = { +static const char _huff_lengthlist_line_128x7_1sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 7, 2, 7, 3, 8, 4, 9, 5, 9, 8,10,11,11,12,14,14,14,14,14,14,14,14, @@ -600,25 +600,25 @@ static const long _huff_lengthlist_line_128x7_1sub3[] = { static const static_codebook _huff_book_line_128x7_1sub3 = { 1, 64, - (long *)_huff_lengthlist_line_128x7_1sub3, + (char *)_huff_lengthlist_line_128x7_1sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_class1[] = { +static const char _huff_lengthlist_line_128x11_class1[] = { 1, 6, 3, 7, 2, 4, 5, 7, }; static const static_codebook _huff_book_line_128x11_class1 = { 1, 8, - (long *)_huff_lengthlist_line_128x11_class1, + (char *)_huff_lengthlist_line_128x11_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_class2[] = { +static const char _huff_lengthlist_line_128x11_class2[] = { 1, 6,12,16, 4,12,15,16, 9,15,16,16,16,16,16,16, 2, 5,11,16, 5,11,13,16, 9,13,16,16,16,16,16,16, 4, 8,12,16, 5, 9,12,16, 9,13,15,16,16,16,16,16, @@ -627,13 +627,13 @@ static const long _huff_lengthlist_line_128x11_class2[] = { static const static_codebook _huff_book_line_128x11_class2 = { 1, 64, - (long *)_huff_lengthlist_line_128x11_class2, + (char *)_huff_lengthlist_line_128x11_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_class3[] = { +static const char _huff_lengthlist_line_128x11_class3[] = { 7, 6, 9,17, 7, 6, 8,17,12, 9,11,16,16,16,16,16, 5, 4, 7,16, 5, 3, 6,14, 9, 6, 8,15,16,16,16,16, 5, 4, 6,13, 3, 2, 4,11, 7, 4, 6,13,16,11,10,14, @@ -642,13 +642,13 @@ static const long _huff_lengthlist_line_128x11_class3[] = { static const static_codebook _huff_book_line_128x11_class3 = { 1, 64, - (long *)_huff_lengthlist_line_128x11_class3, + (char *)_huff_lengthlist_line_128x11_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_0sub0[] = { +static const char _huff_lengthlist_line_128x11_0sub0[] = { 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, 8, 7, @@ -661,26 +661,26 @@ static const long _huff_lengthlist_line_128x11_0sub0[] = { static const static_codebook _huff_book_line_128x11_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_0sub0, + (char *)_huff_lengthlist_line_128x11_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_1sub0[] = { +static const char _huff_lengthlist_line_128x11_1sub0[] = { 2, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 8, 6, }; static const static_codebook _huff_book_line_128x11_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_128x11_1sub0, + (char *)_huff_lengthlist_line_128x11_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_1sub1[] = { +static const char _huff_lengthlist_line_128x11_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 5, 3, 6, 4, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4, @@ -693,26 +693,26 @@ static const long _huff_lengthlist_line_128x11_1sub1[] = { static const static_codebook _huff_book_line_128x11_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_1sub1, + (char *)_huff_lengthlist_line_128x11_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_2sub1[] = { +static const char _huff_lengthlist_line_128x11_2sub1[] = { 0, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 5, 5, }; static const static_codebook _huff_book_line_128x11_2sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x11_2sub1, + (char *)_huff_lengthlist_line_128x11_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_2sub2[] = { +static const char _huff_lengthlist_line_128x11_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4, 5, 4, 5, 4, 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 9, 7, 9, 7,10, 7, 9, 8,11, @@ -721,13 +721,13 @@ static const long _huff_lengthlist_line_128x11_2sub2[] = { static const static_codebook _huff_book_line_128x11_2sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x11_2sub2, + (char *)_huff_lengthlist_line_128x11_2sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_2sub3[] = { +static const char _huff_lengthlist_line_128x11_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -740,26 +740,26 @@ static const long _huff_lengthlist_line_128x11_2sub3[] = { static const static_codebook _huff_book_line_128x11_2sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_2sub3, + (char *)_huff_lengthlist_line_128x11_2sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_3sub1[] = { +static const char _huff_lengthlist_line_128x11_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, }; static const static_codebook _huff_book_line_128x11_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x11_3sub1, + (char *)_huff_lengthlist_line_128x11_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_3sub2[] = { +static const char _huff_lengthlist_line_128x11_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 5, 4, 6, 4, 6, 4, 7, 4, 7, 4, 8, 4, 8, 4, 9, 4, 9, 4,10, 4,10, 5,10, 5,11, 5,12, 6, @@ -768,13 +768,13 @@ static const long _huff_lengthlist_line_128x11_3sub2[] = { static const static_codebook _huff_book_line_128x11_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x11_3sub2, + (char *)_huff_lengthlist_line_128x11_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x11_3sub3[] = { +static const char _huff_lengthlist_line_128x11_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -787,25 +787,25 @@ static const long _huff_lengthlist_line_128x11_3sub3[] = { static const static_codebook _huff_book_line_128x11_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x11_3sub3, + (char *)_huff_lengthlist_line_128x11_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_class1[] = { +static const char _huff_lengthlist_line_128x17_class1[] = { 1, 3, 4, 7, 2, 5, 6, 7, }; static const static_codebook _huff_book_line_128x17_class1 = { 1, 8, - (long *)_huff_lengthlist_line_128x17_class1, + (char *)_huff_lengthlist_line_128x17_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_class2[] = { +static const char _huff_lengthlist_line_128x17_class2[] = { 1, 4,10,19, 3, 8,13,19, 7,12,19,19,19,19,19,19, 2, 6,11,19, 8,13,19,19, 9,11,19,19,19,19,19,19, 6, 7,13,19, 9,13,19,19,10,13,18,18,18,18,18,18, @@ -814,13 +814,13 @@ static const long _huff_lengthlist_line_128x17_class2[] = { static const static_codebook _huff_book_line_128x17_class2 = { 1, 64, - (long *)_huff_lengthlist_line_128x17_class2, + (char *)_huff_lengthlist_line_128x17_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_class3[] = { +static const char _huff_lengthlist_line_128x17_class3[] = { 3, 6,10,17, 4, 8,11,20, 8,10,11,20,20,20,20,20, 2, 4, 8,18, 4, 6, 8,17, 7, 8,10,20,20,17,20,20, 3, 5, 8,17, 3, 4, 6,17, 8, 8,10,17,17,12,16,20, @@ -829,13 +829,13 @@ static const long _huff_lengthlist_line_128x17_class3[] = { static const static_codebook _huff_book_line_128x17_class3 = { 1, 64, - (long *)_huff_lengthlist_line_128x17_class3, + (char *)_huff_lengthlist_line_128x17_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_0sub0[] = { +static const char _huff_lengthlist_line_128x17_0sub0[] = { 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5, 8, 5, 8, 5, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, 9, 6, @@ -848,26 +848,26 @@ static const long _huff_lengthlist_line_128x17_0sub0[] = { static const static_codebook _huff_book_line_128x17_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_0sub0, + (char *)_huff_lengthlist_line_128x17_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_1sub0[] = { +static const char _huff_lengthlist_line_128x17_1sub0[] = { 2, 5, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 7, 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7, }; static const static_codebook _huff_book_line_128x17_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_128x17_1sub0, + (char *)_huff_lengthlist_line_128x17_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_1sub1[] = { +static const char _huff_lengthlist_line_128x17_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 5, 3, 5, 3, 6, 3, 6, 4, 6, 4, 7, 4, 7, 5, @@ -880,26 +880,26 @@ static const long _huff_lengthlist_line_128x17_1sub1[] = { static const static_codebook _huff_book_line_128x17_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_1sub1, + (char *)_huff_lengthlist_line_128x17_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_2sub1[] = { +static const char _huff_lengthlist_line_128x17_2sub1[] = { 0, 4, 5, 4, 6, 4, 8, 3, 9, 3, 9, 2, 9, 3, 8, 4, 9, 4, }; static const static_codebook _huff_book_line_128x17_2sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x17_2sub1, + (char *)_huff_lengthlist_line_128x17_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_2sub2[] = { +static const char _huff_lengthlist_line_128x17_2sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 1, 5, 3, 5, 3, 5, 4, 7, 5,10, 7,10, 7, 12,10,14,10,14, 9,14,11,14,14,14,13,13,13,13,13, @@ -908,13 +908,13 @@ static const long _huff_lengthlist_line_128x17_2sub2[] = { static const static_codebook _huff_book_line_128x17_2sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x17_2sub2, + (char *)_huff_lengthlist_line_128x17_2sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_2sub3[] = { +static const char _huff_lengthlist_line_128x17_2sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -927,26 +927,26 @@ static const long _huff_lengthlist_line_128x17_2sub3[] = { static const static_codebook _huff_book_line_128x17_2sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_2sub3, + (char *)_huff_lengthlist_line_128x17_2sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_3sub1[] = { +static const char _huff_lengthlist_line_128x17_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 4, 5, 3, 5, 3, 5, 4, 6, 4, 6, 4, }; static const static_codebook _huff_book_line_128x17_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_128x17_3sub1, + (char *)_huff_lengthlist_line_128x17_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_3sub2[] = { +static const char _huff_lengthlist_line_128x17_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 3, 6, 3, 6, 4, 7, 4, 7, 4, 7, 4, 8, 4, 8, 4, 8, 4, 8, 4, 9, 4, 9, 5,10, 5,10, 7,10, 8, @@ -955,13 +955,13 @@ static const long _huff_lengthlist_line_128x17_3sub2[] = { static const static_codebook _huff_book_line_128x17_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_128x17_3sub2, + (char *)_huff_lengthlist_line_128x17_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_128x17_3sub3[] = { +static const char _huff_lengthlist_line_128x17_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -974,37 +974,37 @@ static const long _huff_lengthlist_line_128x17_3sub3[] = { static const static_codebook _huff_book_line_128x17_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_128x17_3sub3, + (char *)_huff_lengthlist_line_128x17_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class1[] = { +static const char _huff_lengthlist_line_1024x27_class1[] = { 2,10, 8,14, 7,12,11,14, 1, 5, 3, 7, 4, 9, 7,13, }; static const static_codebook _huff_book_line_1024x27_class1 = { 1, 16, - (long *)_huff_lengthlist_line_1024x27_class1, + (char *)_huff_lengthlist_line_1024x27_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class2[] = { +static const char _huff_lengthlist_line_1024x27_class2[] = { 1, 4, 2, 6, 3, 7, 5, 7, }; static const static_codebook _huff_book_line_1024x27_class2 = { 1, 8, - (long *)_huff_lengthlist_line_1024x27_class2, + (char *)_huff_lengthlist_line_1024x27_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class3[] = { +static const char _huff_lengthlist_line_1024x27_class3[] = { 1, 5, 7,21, 5, 8, 9,21,10, 9,12,20,20,16,20,20, 4, 8, 9,20, 6, 8, 9,20,11,11,13,20,20,15,17,20, 9,11,14,20, 8,10,15,20,11,13,15,20,20,20,20,20, @@ -1025,13 +1025,13 @@ static const long _huff_lengthlist_line_1024x27_class3[] = { static const static_codebook _huff_book_line_1024x27_class3 = { 1, 256, - (long *)_huff_lengthlist_line_1024x27_class3, + (char *)_huff_lengthlist_line_1024x27_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_class4[] = { +static const char _huff_lengthlist_line_1024x27_class4[] = { 2, 3, 7,13, 4, 4, 7,15, 8, 6, 9,17,21,16,15,21, 2, 5, 7,11, 5, 5, 7,14, 9, 7,10,16,17,15,16,21, 4, 7,10,17, 7, 7, 9,15,11, 9,11,16,21,18,15,21, @@ -1040,13 +1040,13 @@ static const long _huff_lengthlist_line_1024x27_class4[] = { static const static_codebook _huff_book_line_1024x27_class4 = { 1, 64, - (long *)_huff_lengthlist_line_1024x27_class4, + (char *)_huff_lengthlist_line_1024x27_class4, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_0sub0[] = { +static const char _huff_lengthlist_line_1024x27_0sub0[] = { 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 7, 5, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6,10, 6,10, 6,11, 6, @@ -1059,26 +1059,26 @@ static const long _huff_lengthlist_line_1024x27_0sub0[] = { static const static_codebook _huff_book_line_1024x27_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_0sub0, + (char *)_huff_lengthlist_line_1024x27_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_1sub0[] = { +static const char _huff_lengthlist_line_1024x27_1sub0[] = { 2, 5, 5, 4, 5, 4, 5, 4, 5, 4, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 6, 8, 6, 8, 6, 8, 6, 9, 6, 9, 6, }; static const static_codebook _huff_book_line_1024x27_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_1024x27_1sub0, + (char *)_huff_lengthlist_line_1024x27_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_1sub1[] = { +static const char _huff_lengthlist_line_1024x27_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 5, 8, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, 9, 4, @@ -1091,26 +1091,26 @@ static const long _huff_lengthlist_line_1024x27_1sub1[] = { static const static_codebook _huff_book_line_1024x27_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_1sub1, + (char *)_huff_lengthlist_line_1024x27_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_2sub0[] = { +static const char _huff_lengthlist_line_1024x27_2sub0[] = { 1, 5, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 6, 7, 7, 7, 7, 8, 7, 8, 8, 9, 8,10, 9,10, 9, }; static const static_codebook _huff_book_line_1024x27_2sub0 = { 1, 32, - (long *)_huff_lengthlist_line_1024x27_2sub0, + (char *)_huff_lengthlist_line_1024x27_2sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_2sub1[] = { +static const char _huff_lengthlist_line_1024x27_2sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 3, 4, 3, 4, 4, 5, 4, 5, 4, 5, 5, 6, 5, 6, 5, @@ -1123,26 +1123,26 @@ static const long _huff_lengthlist_line_1024x27_2sub1[] = { static const static_codebook _huff_book_line_1024x27_2sub1 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_2sub1, + (char *)_huff_lengthlist_line_1024x27_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_3sub1[] = { +static const char _huff_lengthlist_line_1024x27_3sub1[] = { 0, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 4, 4, 4, 5, 5, 5, }; static const static_codebook _huff_book_line_1024x27_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_1024x27_3sub1, + (char *)_huff_lengthlist_line_1024x27_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_3sub2[] = { +static const char _huff_lengthlist_line_1024x27_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 4, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 5, 7, 5, 8, 6, 8, 6, 9, 7,10, 7,10, 8,10, 8,11, @@ -1151,13 +1151,13 @@ static const long _huff_lengthlist_line_1024x27_3sub2[] = { static const static_codebook _huff_book_line_1024x27_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_1024x27_3sub2, + (char *)_huff_lengthlist_line_1024x27_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_3sub3[] = { +static const char _huff_lengthlist_line_1024x27_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1170,26 +1170,26 @@ static const long _huff_lengthlist_line_1024x27_3sub3[] = { static const static_codebook _huff_book_line_1024x27_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_3sub3, + (char *)_huff_lengthlist_line_1024x27_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_4sub1[] = { +static const char _huff_lengthlist_line_1024x27_4sub1[] = { 0, 4, 5, 4, 5, 4, 5, 4, 5, 3, 5, 3, 5, 3, 5, 4, 5, 4, }; static const static_codebook _huff_book_line_1024x27_4sub1 = { 1, 18, - (long *)_huff_lengthlist_line_1024x27_4sub1, + (char *)_huff_lengthlist_line_1024x27_4sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_4sub2[] = { +static const char _huff_lengthlist_line_1024x27_4sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 2, 4, 2, 5, 3, 5, 4, 6, 6, 6, 7, 7, 8, 7, 8, 7, 8, 7, 9, 8, 9, 8, 9, 8,10, 8,11, 9,12, @@ -1198,13 +1198,13 @@ static const long _huff_lengthlist_line_1024x27_4sub2[] = { static const static_codebook _huff_book_line_1024x27_4sub2 = { 1, 50, - (long *)_huff_lengthlist_line_1024x27_4sub2, + (char *)_huff_lengthlist_line_1024x27_4sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_1024x27_4sub3[] = { +static const char _huff_lengthlist_line_1024x27_4sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1217,37 +1217,37 @@ static const long _huff_lengthlist_line_1024x27_4sub3[] = { static const static_codebook _huff_book_line_1024x27_4sub3 = { 1, 128, - (long *)_huff_lengthlist_line_1024x27_4sub3, + (char *)_huff_lengthlist_line_1024x27_4sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class1[] = { +static const char _huff_lengthlist_line_2048x27_class1[] = { 2, 6, 8, 9, 7,11,13,13, 1, 3, 5, 5, 6, 6,12,10, }; static const static_codebook _huff_book_line_2048x27_class1 = { 1, 16, - (long *)_huff_lengthlist_line_2048x27_class1, + (char *)_huff_lengthlist_line_2048x27_class1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class2[] = { +static const char _huff_lengthlist_line_2048x27_class2[] = { 1, 2, 3, 6, 4, 7, 5, 7, }; static const static_codebook _huff_book_line_2048x27_class2 = { 1, 8, - (long *)_huff_lengthlist_line_2048x27_class2, + (char *)_huff_lengthlist_line_2048x27_class2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class3[] = { +static const char _huff_lengthlist_line_2048x27_class3[] = { 3, 3, 6,16, 5, 5, 7,16, 9, 8,11,16,16,16,16,16, 5, 5, 8,16, 5, 5, 7,16, 8, 7, 9,16,16,16,16,16, 9, 9,12,16, 6, 8,11,16, 9,10,11,16,16,16,16,16, @@ -1268,13 +1268,13 @@ static const long _huff_lengthlist_line_2048x27_class3[] = { static const static_codebook _huff_book_line_2048x27_class3 = { 1, 256, - (long *)_huff_lengthlist_line_2048x27_class3, + (char *)_huff_lengthlist_line_2048x27_class3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_class4[] = { +static const char _huff_lengthlist_line_2048x27_class4[] = { 2, 4, 7,13, 4, 5, 7,15, 8, 7,10,16,16,14,16,16, 2, 4, 7,16, 3, 4, 7,14, 8, 8,10,16,16,16,15,16, 6, 8,11,16, 7, 7, 9,16,11, 9,13,16,16,16,15,16, @@ -1283,13 +1283,13 @@ static const long _huff_lengthlist_line_2048x27_class4[] = { static const static_codebook _huff_book_line_2048x27_class4 = { 1, 64, - (long *)_huff_lengthlist_line_2048x27_class4, + (char *)_huff_lengthlist_line_2048x27_class4, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_0sub0[] = { +static const char _huff_lengthlist_line_2048x27_0sub0[] = { 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 7, 5, 7, 5, 7, 5, 8, 5, 8, 5, 8, 5, 9, 5, 9, 6,10, 6,10, 6,11, 6,11, 6,11, 6,11, 6,11, 6, @@ -1302,26 +1302,26 @@ static const long _huff_lengthlist_line_2048x27_0sub0[] = { static const static_codebook _huff_book_line_2048x27_0sub0 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_0sub0, + (char *)_huff_lengthlist_line_2048x27_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_1sub0[] = { +static const char _huff_lengthlist_line_2048x27_1sub0[] = { 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7, 6, 7, 6, }; static const static_codebook _huff_book_line_2048x27_1sub0 = { 1, 32, - (long *)_huff_lengthlist_line_2048x27_1sub0, + (char *)_huff_lengthlist_line_2048x27_1sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_1sub1[] = { +static const char _huff_lengthlist_line_2048x27_1sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 5, 7, 5, 7, 4, 7, 4, 8, 4, 8, 4, 8, 4, 8, 3, @@ -1334,26 +1334,26 @@ static const long _huff_lengthlist_line_2048x27_1sub1[] = { static const static_codebook _huff_book_line_2048x27_1sub1 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_1sub1, + (char *)_huff_lengthlist_line_2048x27_1sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_2sub0[] = { +static const char _huff_lengthlist_line_2048x27_2sub0[] = { 2, 4, 5, 4, 5, 4, 5, 4, 5, 5, 5, 5, 5, 5, 6, 5, 6, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, }; static const static_codebook _huff_book_line_2048x27_2sub0 = { 1, 32, - (long *)_huff_lengthlist_line_2048x27_2sub0, + (char *)_huff_lengthlist_line_2048x27_2sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_2sub1[] = { +static const char _huff_lengthlist_line_2048x27_2sub1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 3, 4, 3, 4, 4, 5, 4, 5, 5, 5, 6, 6, 6, 7, @@ -1366,26 +1366,26 @@ static const long _huff_lengthlist_line_2048x27_2sub1[] = { static const static_codebook _huff_book_line_2048x27_2sub1 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_2sub1, + (char *)_huff_lengthlist_line_2048x27_2sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_3sub1[] = { +static const char _huff_lengthlist_line_2048x27_3sub1[] = { 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, }; static const static_codebook _huff_book_line_2048x27_3sub1 = { 1, 18, - (long *)_huff_lengthlist_line_2048x27_3sub1, + (char *)_huff_lengthlist_line_2048x27_3sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_3sub2[] = { +static const char _huff_lengthlist_line_2048x27_3sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 6, 7, 6, 8, 6, 9, 7, 9, 7, 9, 9,11, 9,12, @@ -1394,13 +1394,13 @@ static const long _huff_lengthlist_line_2048x27_3sub2[] = { static const static_codebook _huff_book_line_2048x27_3sub2 = { 1, 50, - (long *)_huff_lengthlist_line_2048x27_3sub2, + (char *)_huff_lengthlist_line_2048x27_3sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_3sub3[] = { +static const char _huff_lengthlist_line_2048x27_3sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1413,26 +1413,26 @@ static const long _huff_lengthlist_line_2048x27_3sub3[] = { static const static_codebook _huff_book_line_2048x27_3sub3 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_3sub3, + (char *)_huff_lengthlist_line_2048x27_3sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_4sub1[] = { +static const char _huff_lengthlist_line_2048x27_4sub1[] = { 0, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 4, 5, 4, 5, 4, 4, 5, }; static const static_codebook _huff_book_line_2048x27_4sub1 = { 1, 18, - (long *)_huff_lengthlist_line_2048x27_4sub1, + (char *)_huff_lengthlist_line_2048x27_4sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_4sub2[] = { +static const char _huff_lengthlist_line_2048x27_4sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 4, 3, 4, 4, 4, 5, 5, 6, 5, 6, 5, 7, 6, 6, 6, 7, 7, 7, 8, 9, 9, 9,12,10,11,10,10,12, @@ -1441,13 +1441,13 @@ static const long _huff_lengthlist_line_2048x27_4sub2[] = { static const static_codebook _huff_book_line_2048x27_4sub2 = { 1, 50, - (long *)_huff_lengthlist_line_2048x27_4sub2, + (char *)_huff_lengthlist_line_2048x27_4sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_2048x27_4sub3[] = { +static const char _huff_lengthlist_line_2048x27_4sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1460,13 +1460,13 @@ static const long _huff_lengthlist_line_2048x27_4sub3[] = { static const static_codebook _huff_book_line_2048x27_4sub3 = { 1, 128, - (long *)_huff_lengthlist_line_2048x27_4sub3, + (char *)_huff_lengthlist_line_2048x27_4sub3, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_class0[] = { +static const char _huff_lengthlist_line_256x4low_class0[] = { 4, 5, 6,11, 5, 5, 6,10, 7, 7, 6, 6,14,13, 9, 9, 6, 6, 6,10, 6, 6, 6, 9, 8, 7, 7, 9,14,12, 8,11, 8, 7, 7,11, 8, 8, 7,11, 9, 9, 7, 9,13,11, 9,13, @@ -1487,50 +1487,50 @@ static const long _huff_lengthlist_line_256x4low_class0[] = { static const static_codebook _huff_book_line_256x4low_class0 = { 1, 256, - (long *)_huff_lengthlist_line_256x4low_class0, + (char *)_huff_lengthlist_line_256x4low_class0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub0[] = { +static const char _huff_lengthlist_line_256x4low_0sub0[] = { 1, 3, 2, 3, }; static const static_codebook _huff_book_line_256x4low_0sub0 = { 1, 4, - (long *)_huff_lengthlist_line_256x4low_0sub0, + (char *)_huff_lengthlist_line_256x4low_0sub0, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub1[] = { +static const char _huff_lengthlist_line_256x4low_0sub1[] = { 0, 0, 0, 0, 2, 3, 2, 3, 3, 3, }; static const static_codebook _huff_book_line_256x4low_0sub1 = { 1, 10, - (long *)_huff_lengthlist_line_256x4low_0sub1, + (char *)_huff_lengthlist_line_256x4low_0sub1, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub2[] = { +static const char _huff_lengthlist_line_256x4low_0sub2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 4, 3, 4, 4, 4, 4, 4, 5, 5, 5, 6, 6, }; static const static_codebook _huff_book_line_256x4low_0sub2 = { 1, 25, - (long *)_huff_lengthlist_line_256x4low_0sub2, + (char *)_huff_lengthlist_line_256x4low_0sub2, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist_line_256x4low_0sub3[] = { +static const char _huff_lengthlist_line_256x4low_0sub3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, 2, 4, 3, 5, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 6, 9, @@ -1539,7 +1539,7 @@ static const long _huff_lengthlist_line_256x4low_0sub3[] = { static const static_codebook _huff_book_line_256x4low_0sub3 = { 1, 64, - (long *)_huff_lengthlist_line_256x4low_0sub3, + (char *)_huff_lengthlist_line_256x4low_0sub3, 0, 0, 0, 0, 0, NULL, 0 diff --git a/drivers/vorbis/books/uncoupled/Makefile.am b/drivers/vorbis/books/uncoupled/Makefile.am deleted file mode 100644 index 93ff417c8f..0000000000 --- a/drivers/vorbis/books/uncoupled/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = res_books_uncoupled.h diff --git a/drivers/vorbis/books/uncoupled/Makefile.in b/drivers/vorbis/books/uncoupled/Makefile.in deleted file mode 100644 index 34362f1454..0000000000 --- a/drivers/vorbis/books/uncoupled/Makefile.in +++ /dev/null @@ -1,356 +0,0 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = lib/books/uncoupled -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALLOCA = @ALLOCA@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEBUG = @DEBUG@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_DOXYGEN = @HAVE_DOXYGEN@ -HTLATEX = @HTLATEX@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PDFLATEX = @PDFLATEX@ -PKG_CONFIG = @PKG_CONFIG@ -PROFILE = @PROFILE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -VE_LIB_AGE = @VE_LIB_AGE@ -VE_LIB_CURRENT = @VE_LIB_CURRENT@ -VE_LIB_REVISION = @VE_LIB_REVISION@ -VF_LIB_AGE = @VF_LIB_AGE@ -VF_LIB_CURRENT = @VF_LIB_CURRENT@ -VF_LIB_REVISION = @VF_LIB_REVISION@ -VORBIS_LIBS = @VORBIS_LIBS@ -V_LIB_AGE = @V_LIB_AGE@ -V_LIB_CURRENT = @V_LIB_CURRENT@ -V_LIB_REVISION = @V_LIB_REVISION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pthread_lib = @pthread_lib@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = res_books_uncoupled.h -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/books/uncoupled/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu lib/books/uncoupled/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/drivers/vorbis/books/uncoupled/res_books_uncoupled.h b/drivers/vorbis/books/uncoupled/res_books_uncoupled.h index d2473635b5..736353b675 100644 --- a/drivers/vorbis/books/uncoupled/res_books_uncoupled.h +++ b/drivers/vorbis/books/uncoupled/res_books_uncoupled.h @@ -11,7 +11,7 @@ ******************************************************************** function: static codebooks autogenerated by huff/huffbuld - last modified: $Id: res_books_uncoupled.h 17022 2010-03-25 03:45:42Z xiphmont $ + last modified: $Id: res_books_uncoupled.h 19057 2014-01-22 12:32:31Z xiphmont $ ********************************************************************/ @@ -23,7 +23,7 @@ static const long _vq_quantlist__16u0__p1_0[] = { 2, }; -static const long _vq_lengthlist__16u0__p1_0[] = { +static const char _vq_lengthlist__16u0__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 8, 5, 8, 8, 8,10,10, 8, 10,11, 5, 8, 8, 8,10,10, 8,10,10, 4, 9, 9, 9,12, 11, 8,11,11, 8,12,11,10,12,14,10,13,13, 7,11,11, @@ -34,7 +34,7 @@ static const long _vq_lengthlist__16u0__p1_0[] = { static const static_codebook _16u0__p1_0 = { 4, 81, - (long *)_vq_lengthlist__16u0__p1_0, + (char *)_vq_lengthlist__16u0__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u0__p1_0, 0 @@ -46,7 +46,7 @@ static const long _vq_quantlist__16u0__p2_0[] = { 2, }; -static const long _vq_lengthlist__16u0__p2_0[] = { +static const char _vq_lengthlist__16u0__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 9, 7, 8, 9, 5, 7, 7, 7, 9, 8, 7, 9, 7, 4, 7, 7, 7, 9, 9, 7, 8, 8, 6, 9, 8, 7, 8,11, 9,11,10, 6, 8, 9, @@ -57,7 +57,7 @@ static const long _vq_lengthlist__16u0__p2_0[] = { static const static_codebook _16u0__p2_0 = { 4, 81, - (long *)_vq_lengthlist__16u0__p2_0, + (char *)_vq_lengthlist__16u0__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u0__p2_0, 0 @@ -71,7 +71,7 @@ static const long _vq_quantlist__16u0__p3_0[] = { 4, }; -static const long _vq_lengthlist__16u0__p3_0[] = { +static const char _vq_lengthlist__16u0__p3_0[] = { 1, 5, 5, 7, 7, 6, 7, 7, 8, 8, 6, 7, 8, 8, 8, 8, 9, 9,11,11, 8, 9, 9,11,11, 6, 9, 8,10,10, 8,10, 10,11,11, 8,10,10,11,11,10,11,10,13,12, 9,11,10, @@ -116,7 +116,7 @@ static const long _vq_lengthlist__16u0__p3_0[] = { static const static_codebook _16u0__p3_0 = { 4, 625, - (long *)_vq_lengthlist__16u0__p3_0, + (char *)_vq_lengthlist__16u0__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u0__p3_0, 0 @@ -130,7 +130,7 @@ static const long _vq_quantlist__16u0__p4_0[] = { 4, }; -static const long _vq_lengthlist__16u0__p4_0[] = { +static const char _vq_lengthlist__16u0__p4_0[] = { 3, 5, 5, 8, 8, 6, 6, 6, 9, 9, 6, 6, 6, 9, 9, 9, 10, 9,11,11, 9, 9, 9,11,11, 6, 7, 7,10,10, 7, 7, 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10, @@ -175,7 +175,7 @@ static const long _vq_lengthlist__16u0__p4_0[] = { static const static_codebook _16u0__p4_0 = { 4, 625, - (long *)_vq_lengthlist__16u0__p4_0, + (char *)_vq_lengthlist__16u0__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u0__p4_0, 0 @@ -193,7 +193,7 @@ static const long _vq_quantlist__16u0__p5_0[] = { 8, }; -static const long _vq_lengthlist__16u0__p5_0[] = { +static const char _vq_lengthlist__16u0__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 7, 8, 8, @@ -204,7 +204,7 @@ static const long _vq_lengthlist__16u0__p5_0[] = { static const static_codebook _16u0__p5_0 = { 2, 81, - (long *)_vq_lengthlist__16u0__p5_0, + (char *)_vq_lengthlist__16u0__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u0__p5_0, 0 @@ -226,7 +226,7 @@ static const long _vq_quantlist__16u0__p6_0[] = { 12, }; -static const long _vq_lengthlist__16u0__p6_0[] = { +static const char _vq_lengthlist__16u0__p6_0[] = { 1, 4, 4, 7, 7,10,10,12,12,13,13,18,17, 3, 6, 6, 9, 9,11,11,13,13,14,14,18,17, 3, 6, 6, 9, 9,11, 11,13,13,14,14,17,18, 7, 9, 9,11,11,13,13,14,14, @@ -242,7 +242,7 @@ static const long _vq_lengthlist__16u0__p6_0[] = { static const static_codebook _16u0__p6_0 = { 2, 169, - (long *)_vq_lengthlist__16u0__p6_0, + (char *)_vq_lengthlist__16u0__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16u0__p6_0, 0 @@ -256,14 +256,14 @@ static const long _vq_quantlist__16u0__p6_1[] = { 4, }; -static const long _vq_lengthlist__16u0__p6_1[] = { +static const char _vq_lengthlist__16u0__p6_1[] = { 1, 4, 5, 6, 6, 4, 6, 6, 6, 6, 4, 6, 6, 6, 6, 6, 6, 6, 7, 7, 6, 6, 6, 7, 7, }; static const static_codebook _16u0__p6_1 = { 2, 25, - (long *)_vq_lengthlist__16u0__p6_1, + (char *)_vq_lengthlist__16u0__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u0__p6_1, 0 @@ -275,7 +275,7 @@ static const long _vq_quantlist__16u0__p7_0[] = { 2, }; -static const long _vq_lengthlist__16u0__p7_0[] = { +static const char _vq_lengthlist__16u0__p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -286,7 +286,7 @@ static const long _vq_lengthlist__16u0__p7_0[] = { static const static_codebook _16u0__p7_0 = { 4, 81, - (long *)_vq_lengthlist__16u0__p7_0, + (char *)_vq_lengthlist__16u0__p7_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__16u0__p7_0, 0 @@ -310,7 +310,7 @@ static const long _vq_quantlist__16u0__p7_1[] = { 14, }; -static const long _vq_lengthlist__16u0__p7_1[] = { +static const char _vq_lengthlist__16u0__p7_1[] = { 1, 5, 5, 6, 5, 9,10,11,11,10,10,10,10,10,10, 5, 8, 8, 8,10,10,10,10,10,10,10,10,10,10,10, 5, 8, 9, 9, 9,10,10,10,10,10,10,10,10,10,10, 5,10, 8, @@ -330,7 +330,7 @@ static const long _vq_lengthlist__16u0__p7_1[] = { static const static_codebook _16u0__p7_1 = { 2, 225, - (long *)_vq_lengthlist__16u0__p7_1, + (char *)_vq_lengthlist__16u0__p7_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16u0__p7_1, 0 @@ -360,7 +360,7 @@ static const long _vq_quantlist__16u0__p7_2[] = { 20, }; -static const long _vq_lengthlist__16u0__p7_2[] = { +static const char _vq_lengthlist__16u0__p7_2[] = { 1, 6, 6, 7, 8, 7, 7,10, 9,10, 9,11,10, 9,11,10, 9, 9, 9, 9,10, 6, 8, 7, 9, 9, 8, 8,10,10, 9,11, 11,12,12,10, 9,11, 9,12,10, 9, 6, 9, 8, 9,12, 8, @@ -393,13 +393,13 @@ static const long _vq_lengthlist__16u0__p7_2[] = { static const static_codebook _16u0__p7_2 = { 2, 441, - (long *)_vq_lengthlist__16u0__p7_2, + (char *)_vq_lengthlist__16u0__p7_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16u0__p7_2, 0 }; -static const long _huff_lengthlist__16u0__single[] = { +static const char _huff_lengthlist__16u0__single[] = { 3, 5, 8, 7,14, 8, 9,19, 5, 2, 5, 5, 9, 6, 9,19, 8, 4, 5, 7, 8, 9,13,19, 7, 4, 6, 5, 9, 6, 9,19, 12, 8, 7, 9,10,11,13,19, 8, 5, 8, 6, 9, 6, 7,19, @@ -408,13 +408,13 @@ static const long _huff_lengthlist__16u0__single[] = { static const static_codebook _huff_book__16u0__single = { 2, 64, - (long *)_huff_lengthlist__16u0__single, + (char *)_huff_lengthlist__16u0__single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16u1__long[] = { +static const char _huff_lengthlist__16u1__long[] = { 3, 6,10, 8,12, 8,14, 8,14,19, 5, 3, 5, 5, 7, 6, 11, 7,16,19, 7, 5, 6, 7, 7, 9,11,12,19,19, 6, 4, 7, 5, 7, 6,10, 7,18,18, 8, 6, 7, 7, 7, 7, 8, 9, @@ -426,7 +426,7 @@ static const long _huff_lengthlist__16u1__long[] = { static const static_codebook _huff_book__16u1__long = { 2, 100, - (long *)_huff_lengthlist__16u1__long, + (char *)_huff_lengthlist__16u1__long, 0, 0, 0, 0, 0, NULL, 0 @@ -438,7 +438,7 @@ static const long _vq_quantlist__16u1__p1_0[] = { 2, }; -static const long _vq_lengthlist__16u1__p1_0[] = { +static const char _vq_lengthlist__16u1__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 7, 7,10,10, 7, 9,10, 5, 7, 8, 7,10, 9, 7,10,10, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10,10,11,12,10,12,13, 7,10,10, @@ -449,7 +449,7 @@ static const long _vq_lengthlist__16u1__p1_0[] = { static const static_codebook _16u1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__16u1__p1_0, + (char *)_vq_lengthlist__16u1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u1__p1_0, 0 @@ -461,7 +461,7 @@ static const long _vq_quantlist__16u1__p2_0[] = { 2, }; -static const long _vq_lengthlist__16u1__p2_0[] = { +static const char _vq_lengthlist__16u1__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 7, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 7, 7,10, 8, 9, 9, 6, 8, 8, @@ -472,7 +472,7 @@ static const long _vq_lengthlist__16u1__p2_0[] = { static const static_codebook _16u1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__16u1__p2_0, + (char *)_vq_lengthlist__16u1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u1__p2_0, 0 @@ -486,7 +486,7 @@ static const long _vq_quantlist__16u1__p3_0[] = { 4, }; -static const long _vq_lengthlist__16u1__p3_0[] = { +static const char _vq_lengthlist__16u1__p3_0[] = { 1, 5, 5, 8, 8, 6, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9, 10, 9,11,11, 9, 9,10,11,11, 6, 8, 8,10,10, 8, 9, 10,11,11, 8, 9,10,11,11,10,11,11,12,13,10,11,11, @@ -531,7 +531,7 @@ static const long _vq_lengthlist__16u1__p3_0[] = { static const static_codebook _16u1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__16u1__p3_0, + (char *)_vq_lengthlist__16u1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u1__p3_0, 0 @@ -545,7 +545,7 @@ static const long _vq_quantlist__16u1__p4_0[] = { 4, }; -static const long _vq_lengthlist__16u1__p4_0[] = { +static const char _vq_lengthlist__16u1__p4_0[] = { 4, 5, 5, 8, 8, 6, 6, 7, 9, 9, 6, 6, 6, 9, 9, 9, 10, 9,11,11, 9, 9,10,11,11, 6, 7, 7,10, 9, 7, 7, 8, 9,10, 7, 7, 8,10,10,10,10,10,10,12, 9, 9,10, @@ -590,7 +590,7 @@ static const long _vq_lengthlist__16u1__p4_0[] = { static const static_codebook _16u1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__16u1__p4_0, + (char *)_vq_lengthlist__16u1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u1__p4_0, 0 @@ -608,7 +608,7 @@ static const long _vq_quantlist__16u1__p5_0[] = { 8, }; -static const long _vq_lengthlist__16u1__p5_0[] = { +static const char _vq_lengthlist__16u1__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, @@ -619,7 +619,7 @@ static const long _vq_lengthlist__16u1__p5_0[] = { static const static_codebook _16u1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__16u1__p5_0, + (char *)_vq_lengthlist__16u1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p5_0, 0 @@ -637,7 +637,7 @@ static const long _vq_quantlist__16u1__p6_0[] = { 8, }; -static const long _vq_lengthlist__16u1__p6_0[] = { +static const char _vq_lengthlist__16u1__p6_0[] = { 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 4, 6, 6, 8, 8, 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7, 8, 8,10, 9, 6, 6, 6, 7, 7, 8, 8, 9,10, 7, 8, 7, @@ -648,7 +648,7 @@ static const long _vq_lengthlist__16u1__p6_0[] = { static const static_codebook _16u1__p6_0 = { 2, 81, - (long *)_vq_lengthlist__16u1__p6_0, + (char *)_vq_lengthlist__16u1__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p6_0, 0 @@ -660,7 +660,7 @@ static const long _vq_quantlist__16u1__p7_0[] = { 2, }; -static const long _vq_lengthlist__16u1__p7_0[] = { +static const char _vq_lengthlist__16u1__p7_0[] = { 1, 4, 4, 4, 8, 8, 4, 8, 8, 5,11, 9, 8,12,11, 8, 12,11, 5,10,11, 8,11,12, 8,11,12, 4,11,11,11,14, 13,10,13,13, 8,14,13,12,14,16,12,16,15, 8,14,14, @@ -671,7 +671,7 @@ static const long _vq_lengthlist__16u1__p7_0[] = { static const static_codebook _16u1__p7_0 = { 4, 81, - (long *)_vq_lengthlist__16u1__p7_0, + (char *)_vq_lengthlist__16u1__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16u1__p7_0, 0 @@ -691,7 +691,7 @@ static const long _vq_quantlist__16u1__p7_1[] = { 10, }; -static const long _vq_lengthlist__16u1__p7_1[] = { +static const char _vq_lengthlist__16u1__p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 5, 7, 7, 8, 8, 8, 8, 8, 8, 4, 5, 6, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, @@ -704,7 +704,7 @@ static const long _vq_lengthlist__16u1__p7_1[] = { static const static_codebook _16u1__p7_1 = { 2, 121, - (long *)_vq_lengthlist__16u1__p7_1, + (char *)_vq_lengthlist__16u1__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p7_1, 0 @@ -724,7 +724,7 @@ static const long _vq_quantlist__16u1__p8_0[] = { 10, }; -static const long _vq_lengthlist__16u1__p8_0[] = { +static const char _vq_lengthlist__16u1__p8_0[] = { 1, 4, 4, 5, 5, 8, 8,10,10,12,12, 4, 7, 7, 8, 8, 9, 9,12,11,14,13, 4, 7, 7, 7, 8, 9,10,11,11,13, 12, 5, 8, 8, 9, 9,11,11,12,13,15,14, 5, 7, 8, 9, @@ -737,7 +737,7 @@ static const long _vq_lengthlist__16u1__p8_0[] = { static const static_codebook _16u1__p8_0 = { 2, 121, - (long *)_vq_lengthlist__16u1__p8_0, + (char *)_vq_lengthlist__16u1__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__16u1__p8_0, 0 @@ -757,7 +757,7 @@ static const long _vq_quantlist__16u1__p8_1[] = { 10, }; -static const long _vq_lengthlist__16u1__p8_1[] = { +static const char _vq_lengthlist__16u1__p8_1[] = { 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 4, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 9, 6, 7, 7, 7, @@ -770,7 +770,7 @@ static const long _vq_lengthlist__16u1__p8_1[] = { static const static_codebook _16u1__p8_1 = { 2, 121, - (long *)_vq_lengthlist__16u1__p8_1, + (char *)_vq_lengthlist__16u1__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u1__p8_1, 0 @@ -794,7 +794,7 @@ static const long _vq_quantlist__16u1__p9_0[] = { 14, }; -static const long _vq_lengthlist__16u1__p9_0[] = { +static const char _vq_lengthlist__16u1__p9_0[] = { 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -814,7 +814,7 @@ static const long _vq_lengthlist__16u1__p9_0[] = { static const static_codebook _16u1__p9_0 = { 2, 225, - (long *)_vq_lengthlist__16u1__p9_0, + (char *)_vq_lengthlist__16u1__p9_0, 1, -514071552, 1627381760, 4, 0, (long *)_vq_quantlist__16u1__p9_0, 0 @@ -838,7 +838,7 @@ static const long _vq_quantlist__16u1__p9_1[] = { 14, }; -static const long _vq_lengthlist__16u1__p9_1[] = { +static const char _vq_lengthlist__16u1__p9_1[] = { 1, 6, 5, 9, 9,10,10, 6, 7, 9, 9,10,10,10,10, 5, 10, 8,10, 8,10,10, 8, 8,10, 9,10,10,10,10, 5, 8, 9,10,10,10,10, 8,10,10,10,10,10,10,10, 9,10,10, @@ -858,7 +858,7 @@ static const long _vq_lengthlist__16u1__p9_1[] = { static const static_codebook _16u1__p9_1 = { 2, 225, - (long *)_vq_lengthlist__16u1__p9_1, + (char *)_vq_lengthlist__16u1__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__16u1__p9_1, 0 @@ -884,7 +884,7 @@ static const long _vq_quantlist__16u1__p9_2[] = { 16, }; -static const long _vq_lengthlist__16u1__p9_2[] = { +static const char _vq_lengthlist__16u1__p9_2[] = { 1, 6, 6, 7, 8, 8,11,10, 9, 9,11, 9,10, 9,11,11, 9, 6, 7, 6,11, 8,11, 9,10,10,11, 9,11,10,10,10, 11, 9, 5, 7, 7, 8, 8,10,11, 8, 8,11, 9, 9,10,11, @@ -908,13 +908,13 @@ static const long _vq_lengthlist__16u1__p9_2[] = { static const static_codebook _16u1__p9_2 = { 2, 289, - (long *)_vq_lengthlist__16u1__p9_2, + (char *)_vq_lengthlist__16u1__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16u1__p9_2, 0 }; -static const long _huff_lengthlist__16u1__short[] = { +static const char _huff_lengthlist__16u1__short[] = { 5, 7,10, 9,11,10,15,11,13,16, 6, 4, 6, 6, 7, 7, 10, 9,12,16,10, 6, 5, 6, 6, 7,10,11,16,16, 9, 6, 7, 6, 7, 7,10, 8,14,16,11, 6, 5, 4, 5, 6, 8, 9, @@ -926,13 +926,13 @@ static const long _huff_lengthlist__16u1__short[] = { static const static_codebook _huff_book__16u1__short = { 2, 100, - (long *)_huff_lengthlist__16u1__short, + (char *)_huff_lengthlist__16u1__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__16u2__long[] = { +static const char _huff_lengthlist__16u2__long[] = { 5, 8,10,10,10,11,11,12,14,18, 7, 5, 5, 6, 8, 9, 10,12,14,17, 9, 5, 4, 5, 6, 8,10,11,13,19, 9, 5, 4, 4, 5, 6, 9,10,12,17, 8, 6, 5, 4, 4, 5, 7,10, @@ -944,7 +944,7 @@ static const long _huff_lengthlist__16u2__long[] = { static const static_codebook _huff_book__16u2__long = { 2, 100, - (long *)_huff_lengthlist__16u2__long, + (char *)_huff_lengthlist__16u2__long, 0, 0, 0, 0, 0, NULL, 0 @@ -956,7 +956,7 @@ static const long _vq_quantlist__16u2_p1_0[] = { 2, }; -static const long _vq_lengthlist__16u2_p1_0[] = { +static const char _vq_lengthlist__16u2_p1_0[] = { 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 8, 9, 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,10,10, 7, 9, 9, @@ -967,7 +967,7 @@ static const long _vq_lengthlist__16u2_p1_0[] = { static const static_codebook _16u2_p1_0 = { 4, 81, - (long *)_vq_lengthlist__16u2_p1_0, + (char *)_vq_lengthlist__16u2_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__16u2_p1_0, 0 @@ -981,7 +981,7 @@ static const long _vq_quantlist__16u2_p2_0[] = { 4, }; -static const long _vq_lengthlist__16u2_p2_0[] = { +static const char _vq_lengthlist__16u2_p2_0[] = { 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 9, 10, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10,10,10,10,12,12, 9,10,10, @@ -1026,7 +1026,7 @@ static const long _vq_lengthlist__16u2_p2_0[] = { static const static_codebook _16u2_p2_0 = { 4, 625, - (long *)_vq_lengthlist__16u2_p2_0, + (char *)_vq_lengthlist__16u2_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u2_p2_0, 0 @@ -1044,7 +1044,7 @@ static const long _vq_quantlist__16u2_p3_0[] = { 8, }; -static const long _vq_lengthlist__16u2_p3_0[] = { +static const char _vq_lengthlist__16u2_p3_0[] = { 2, 4, 4, 6, 6, 7, 7, 9, 9, 4, 5, 5, 6, 6, 8, 7, 9, 9, 4, 5, 5, 6, 6, 7, 8, 9, 9, 6, 6, 6, 7, 7, 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, @@ -1055,7 +1055,7 @@ static const long _vq_lengthlist__16u2_p3_0[] = { static const static_codebook _16u2_p3_0 = { 2, 81, - (long *)_vq_lengthlist__16u2_p3_0, + (char *)_vq_lengthlist__16u2_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__16u2_p3_0, 0 @@ -1081,7 +1081,7 @@ static const long _vq_quantlist__16u2_p4_0[] = { 16, }; -static const long _vq_lengthlist__16u2_p4_0[] = { +static const char _vq_lengthlist__16u2_p4_0[] = { 2, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11,11, 11, 5, 5, 5, 7, 6, 8, 7, 9, 9, 9, 9,10,10,11,11, 12,12, 5, 5, 5, 6, 6, 7, 8, 8, 9, 9, 9,10,10,11, @@ -1105,7 +1105,7 @@ static const long _vq_lengthlist__16u2_p4_0[] = { static const static_codebook _16u2_p4_0 = { 2, 289, - (long *)_vq_lengthlist__16u2_p4_0, + (char *)_vq_lengthlist__16u2_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__16u2_p4_0, 0 @@ -1117,7 +1117,7 @@ static const long _vq_quantlist__16u2_p5_0[] = { 2, }; -static const long _vq_lengthlist__16u2_p5_0[] = { +static const char _vq_lengthlist__16u2_p5_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 7, 9, 9, 7, 9,10, 5, 8, 8, 7,10, 9, 7,10, 9, 5, 8, 8, 8,11, 10, 8,10,10, 7,10,10, 9, 9,12,10,12,12, 7,10,10, @@ -1128,7 +1128,7 @@ static const long _vq_lengthlist__16u2_p5_0[] = { static const static_codebook _16u2_p5_0 = { 4, 81, - (long *)_vq_lengthlist__16u2_p5_0, + (char *)_vq_lengthlist__16u2_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__16u2_p5_0, 0 @@ -1148,7 +1148,7 @@ static const long _vq_quantlist__16u2_p5_1[] = { 10, }; -static const long _vq_lengthlist__16u2_p5_1[] = { +static const char _vq_lengthlist__16u2_p5_1[] = { 2, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, @@ -1161,7 +1161,7 @@ static const long _vq_lengthlist__16u2_p5_1[] = { static const static_codebook _16u2_p5_1 = { 2, 121, - (long *)_vq_lengthlist__16u2_p5_1, + (char *)_vq_lengthlist__16u2_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u2_p5_1, 0 @@ -1183,7 +1183,7 @@ static const long _vq_quantlist__16u2_p6_0[] = { 12, }; -static const long _vq_lengthlist__16u2_p6_0[] = { +static const char _vq_lengthlist__16u2_p6_0[] = { 1, 5, 4, 7, 7, 8, 8, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, 9, 9, 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9, 9, 9,10,10,11,11, 7, 8, 8, 9, 9, 9, 9,10,10, @@ -1199,7 +1199,7 @@ static const long _vq_lengthlist__16u2_p6_0[] = { static const static_codebook _16u2_p6_0 = { 2, 169, - (long *)_vq_lengthlist__16u2_p6_0, + (char *)_vq_lengthlist__16u2_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__16u2_p6_0, 0 @@ -1213,14 +1213,14 @@ static const long _vq_quantlist__16u2_p6_1[] = { 4, }; -static const long _vq_lengthlist__16u2_p6_1[] = { +static const char _vq_lengthlist__16u2_p6_1[] = { 2, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _16u2_p6_1 = { 2, 25, - (long *)_vq_lengthlist__16u2_p6_1, + (char *)_vq_lengthlist__16u2_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__16u2_p6_1, 0 @@ -1242,7 +1242,7 @@ static const long _vq_quantlist__16u2_p7_0[] = { 12, }; -static const long _vq_lengthlist__16u2_p7_0[] = { +static const char _vq_lengthlist__16u2_p7_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,10, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,11, 7, 8, 8,10, 9,10,10,10,10, @@ -1258,7 +1258,7 @@ static const long _vq_lengthlist__16u2_p7_0[] = { static const static_codebook _16u2_p7_0 = { 2, 169, - (long *)_vq_lengthlist__16u2_p7_0, + (char *)_vq_lengthlist__16u2_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__16u2_p7_0, 0 @@ -1278,7 +1278,7 @@ static const long _vq_quantlist__16u2_p7_1[] = { 10, }; -static const long _vq_lengthlist__16u2_p7_1[] = { +static const char _vq_lengthlist__16u2_p7_1[] = { 2, 5, 5, 7, 7, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, @@ -1291,7 +1291,7 @@ static const long _vq_lengthlist__16u2_p7_1[] = { static const static_codebook _16u2_p7_1 = { 2, 121, - (long *)_vq_lengthlist__16u2_p7_1, + (char *)_vq_lengthlist__16u2_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__16u2_p7_1, 0 @@ -1315,7 +1315,7 @@ static const long _vq_quantlist__16u2_p8_0[] = { 14, }; -static const long _vq_lengthlist__16u2_p8_0[] = { +static const char _vq_lengthlist__16u2_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 7, 7, 9, 8,10, 9,11,11, 4, 7, 6, 9, 8, 9, 9, 9, 9,10, 9,11, 9,12, 9, 4, 6, 7, 8, 8, 9, 9, 9, 9,10,10,10,11,11,12, 7, 9, 8, @@ -1335,7 +1335,7 @@ static const long _vq_lengthlist__16u2_p8_0[] = { static const static_codebook _16u2_p8_0 = { 2, 225, - (long *)_vq_lengthlist__16u2_p8_0, + (char *)_vq_lengthlist__16u2_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__16u2_p8_0, 0 @@ -1365,7 +1365,7 @@ static const long _vq_quantlist__16u2_p8_1[] = { 20, }; -static const long _vq_lengthlist__16u2_p8_1[] = { +static const char _vq_lengthlist__16u2_p8_1[] = { 3, 5, 5, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10,10,10,10, 5, 6, 6, 7, 7, 8, @@ -1398,7 +1398,7 @@ static const long _vq_lengthlist__16u2_p8_1[] = { static const static_codebook _16u2_p8_1 = { 2, 441, - (long *)_vq_lengthlist__16u2_p8_1, + (char *)_vq_lengthlist__16u2_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__16u2_p8_1, 0 @@ -1422,7 +1422,7 @@ static const long _vq_quantlist__16u2_p9_0[] = { 14, }; -static const long _vq_lengthlist__16u2_p9_0[] = { +static const char _vq_lengthlist__16u2_p9_0[] = { 1, 5, 3, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -1442,7 +1442,7 @@ static const long _vq_lengthlist__16u2_p9_0[] = { static const static_codebook _16u2_p9_0 = { 2, 225, - (long *)_vq_lengthlist__16u2_p9_0, + (char *)_vq_lengthlist__16u2_p9_0, 1, -510036736, 1631393792, 4, 0, (long *)_vq_quantlist__16u2_p9_0, 0 @@ -1470,7 +1470,7 @@ static const long _vq_quantlist__16u2_p9_1[] = { 18, }; -static const long _vq_lengthlist__16u2_p9_1[] = { +static const char _vq_lengthlist__16u2_p9_1[] = { 1, 4, 4, 7, 7, 7, 7, 7, 6, 9, 7,10, 8,12,12,13, 13,14,14, 4, 7, 7, 9, 9, 9, 8, 9, 8,10, 9,11, 9, 14, 9,14,10,13,11, 4, 7, 7, 9, 9, 9, 9, 8, 9,10, @@ -1498,7 +1498,7 @@ static const long _vq_lengthlist__16u2_p9_1[] = { static const static_codebook _16u2_p9_1 = { 2, 361, - (long *)_vq_lengthlist__16u2_p9_1, + (char *)_vq_lengthlist__16u2_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__16u2_p9_1, 0 @@ -1556,7 +1556,7 @@ static const long _vq_quantlist__16u2_p9_2[] = { 48, }; -static const long _vq_lengthlist__16u2_p9_2[] = { +static const char _vq_lengthlist__16u2_p9_2[] = { 2, 3, 4, 4, 4, 5, 5, 6, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 7, 8, 8, 8, 8, 8, @@ -1565,13 +1565,13 @@ static const long _vq_lengthlist__16u2_p9_2[] = { static const static_codebook _16u2_p9_2 = { 1, 49, - (long *)_vq_lengthlist__16u2_p9_2, + (char *)_vq_lengthlist__16u2_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__16u2_p9_2, 0 }; -static const long _huff_lengthlist__16u2__short[] = { +static const char _huff_lengthlist__16u2__short[] = { 8,11,13,13,15,16,19,19,19,19,11, 8, 8, 9, 9,11, 13,15,19,20,14, 8, 7, 7, 8, 9,12,13,15,20,15, 9, 6, 5, 5, 7,10,12,14,18,14, 9, 7, 5, 3, 4, 7,10, @@ -1583,7 +1583,7 @@ static const long _huff_lengthlist__16u2__short[] = { static const static_codebook _huff_book__16u2__short = { 2, 100, - (long *)_huff_lengthlist__16u2__short, + (char *)_huff_lengthlist__16u2__short, 0, 0, 0, 0, 0, NULL, 0 @@ -1595,7 +1595,7 @@ static const long _vq_quantlist__8u0__p1_0[] = { 2, }; -static const long _vq_lengthlist__8u0__p1_0[] = { +static const char _vq_lengthlist__8u0__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 10,10, 5, 8, 8, 7,10,10, 8,10,10, 4, 9, 8, 8,11, 11, 8,11,11, 7,11,11,10,11,13,10,13,13, 7,11,11, @@ -1606,7 +1606,7 @@ static const long _vq_lengthlist__8u0__p1_0[] = { static const static_codebook _8u0__p1_0 = { 4, 81, - (long *)_vq_lengthlist__8u0__p1_0, + (char *)_vq_lengthlist__8u0__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u0__p1_0, 0 @@ -1618,7 +1618,7 @@ static const long _vq_quantlist__8u0__p2_0[] = { 2, }; -static const long _vq_lengthlist__8u0__p2_0[] = { +static const char _vq_lengthlist__8u0__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 6, 7, 8, 6, 7, 8, 5, 7, 7, 6, 8, 8, 7, 9, 7, 5, 7, 7, 7, 9, 9, 7, 8, 8, 6, 9, 8, 7, 7,10, 8,10,10, 6, 8, 8, @@ -1629,7 +1629,7 @@ static const long _vq_lengthlist__8u0__p2_0[] = { static const static_codebook _8u0__p2_0 = { 4, 81, - (long *)_vq_lengthlist__8u0__p2_0, + (char *)_vq_lengthlist__8u0__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u0__p2_0, 0 @@ -1643,7 +1643,7 @@ static const long _vq_quantlist__8u0__p3_0[] = { 4, }; -static const long _vq_lengthlist__8u0__p3_0[] = { +static const char _vq_lengthlist__8u0__p3_0[] = { 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, 10, 9,11,11, 8, 9, 9,11,11, 6, 8, 8,10,10, 8,10, 10,11,11, 8,10,10,11,11,10,11,11,12,12,10,11,11, @@ -1688,7 +1688,7 @@ static const long _vq_lengthlist__8u0__p3_0[] = { static const static_codebook _8u0__p3_0 = { 4, 625, - (long *)_vq_lengthlist__8u0__p3_0, + (char *)_vq_lengthlist__8u0__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u0__p3_0, 0 @@ -1702,7 +1702,7 @@ static const long _vq_quantlist__8u0__p4_0[] = { 4, }; -static const long _vq_lengthlist__8u0__p4_0[] = { +static const char _vq_lengthlist__8u0__p4_0[] = { 3, 5, 5, 8, 8, 5, 6, 7, 9, 9, 6, 7, 6, 9, 9, 9, 9, 9,10,11, 9, 9, 9,11,10, 6, 7, 7,10,10, 7, 7, 8,10,10, 7, 8, 8,10,10,10,10,10,10,11, 9,10,10, @@ -1747,7 +1747,7 @@ static const long _vq_lengthlist__8u0__p4_0[] = { static const static_codebook _8u0__p4_0 = { 4, 625, - (long *)_vq_lengthlist__8u0__p4_0, + (char *)_vq_lengthlist__8u0__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u0__p4_0, 0 @@ -1765,7 +1765,7 @@ static const long _vq_quantlist__8u0__p5_0[] = { 8, }; -static const long _vq_lengthlist__8u0__p5_0[] = { +static const char _vq_lengthlist__8u0__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 7, 8, 8, 10,10, 4, 6, 6, 8, 8, 8, 8,10,10, 6, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, @@ -1776,7 +1776,7 @@ static const long _vq_lengthlist__8u0__p5_0[] = { static const static_codebook _8u0__p5_0 = { 2, 81, - (long *)_vq_lengthlist__8u0__p5_0, + (char *)_vq_lengthlist__8u0__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8u0__p5_0, 0 @@ -1798,7 +1798,7 @@ static const long _vq_quantlist__8u0__p6_0[] = { 12, }; -static const long _vq_lengthlist__8u0__p6_0[] = { +static const char _vq_lengthlist__8u0__p6_0[] = { 1, 4, 4, 7, 7, 9, 9,11,11,12,12,16,16, 3, 6, 6, 9, 9,11,11,12,12,13,14,18,16, 3, 6, 7, 9, 9,11, 11,13,12,14,14,17,16, 7, 9, 9,11,11,12,12,14,14, @@ -1814,7 +1814,7 @@ static const long _vq_lengthlist__8u0__p6_0[] = { static const static_codebook _8u0__p6_0 = { 2, 169, - (long *)_vq_lengthlist__8u0__p6_0, + (char *)_vq_lengthlist__8u0__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__8u0__p6_0, 0 @@ -1828,14 +1828,14 @@ static const long _vq_quantlist__8u0__p6_1[] = { 4, }; -static const long _vq_lengthlist__8u0__p6_1[] = { +static const char _vq_lengthlist__8u0__p6_1[] = { 1, 4, 4, 6, 6, 4, 6, 5, 7, 7, 4, 5, 6, 7, 7, 6, 7, 7, 7, 7, 6, 7, 7, 7, 7, }; static const static_codebook _8u0__p6_1 = { 2, 25, - (long *)_vq_lengthlist__8u0__p6_1, + (char *)_vq_lengthlist__8u0__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u0__p6_1, 0 @@ -1847,7 +1847,7 @@ static const long _vq_quantlist__8u0__p7_0[] = { 2, }; -static const long _vq_lengthlist__8u0__p7_0[] = { +static const char _vq_lengthlist__8u0__p7_0[] = { 1, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -1858,7 +1858,7 @@ static const long _vq_lengthlist__8u0__p7_0[] = { static const static_codebook _8u0__p7_0 = { 4, 81, - (long *)_vq_lengthlist__8u0__p7_0, + (char *)_vq_lengthlist__8u0__p7_0, 1, -518803456, 1628680192, 2, 0, (long *)_vq_quantlist__8u0__p7_0, 0 @@ -1882,7 +1882,7 @@ static const long _vq_quantlist__8u0__p7_1[] = { 14, }; -static const long _vq_lengthlist__8u0__p7_1[] = { +static const char _vq_lengthlist__8u0__p7_1[] = { 1, 5, 5, 5, 5,10,10,11,11,11,11,11,11,11,11, 5, 7, 6, 8, 8, 9,10,11,11,11,11,11,11,11,11, 6, 6, 7, 9, 7,11,10,11,11,11,11,11,11,11,11, 5, 6, 6, @@ -1902,7 +1902,7 @@ static const long _vq_lengthlist__8u0__p7_1[] = { static const static_codebook _8u0__p7_1 = { 2, 225, - (long *)_vq_lengthlist__8u0__p7_1, + (char *)_vq_lengthlist__8u0__p7_1, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__8u0__p7_1, 0 @@ -1932,7 +1932,7 @@ static const long _vq_quantlist__8u0__p7_2[] = { 20, }; -static const long _vq_lengthlist__8u0__p7_2[] = { +static const char _vq_lengthlist__8u0__p7_2[] = { 1, 6, 5, 7, 7, 9, 9, 9, 9,10,12,12,10,11,11,10, 11,11,11,10,11, 6, 8, 8, 9, 9,10,10, 9,10,11,11, 10,11,11,11,11,10,11,11,11,11, 6, 7, 8, 9, 9, 9, @@ -1965,13 +1965,13 @@ static const long _vq_lengthlist__8u0__p7_2[] = { static const static_codebook _8u0__p7_2 = { 2, 441, - (long *)_vq_lengthlist__8u0__p7_2, + (char *)_vq_lengthlist__8u0__p7_2, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__8u0__p7_2, 0 }; -static const long _huff_lengthlist__8u0__single[] = { +static const char _huff_lengthlist__8u0__single[] = { 4, 7,11, 9,12, 8, 7,10, 6, 4, 5, 5, 7, 5, 6,16, 9, 5, 5, 6, 7, 7, 9,16, 7, 4, 6, 5, 7, 5, 7,17, 10, 7, 7, 8, 7, 7, 8,18, 7, 5, 6, 4, 5, 4, 5,15, @@ -1980,7 +1980,7 @@ static const long _huff_lengthlist__8u0__single[] = { static const static_codebook _huff_book__8u0__single = { 2, 64, - (long *)_huff_lengthlist__8u0__single, + (char *)_huff_lengthlist__8u0__single, 0, 0, 0, 0, 0, NULL, 0 @@ -1992,7 +1992,7 @@ static const long _vq_quantlist__8u1__p1_0[] = { 2, }; -static const long _vq_lengthlist__8u1__p1_0[] = { +static const char _vq_lengthlist__8u1__p1_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 7, 9,10, 7, 9, 9, 5, 8, 8, 7,10, 9, 7, 9, 9, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10, 9,10,12,10,12,12, 7,10,10, @@ -2003,7 +2003,7 @@ static const long _vq_lengthlist__8u1__p1_0[] = { static const static_codebook _8u1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__8u1__p1_0, + (char *)_vq_lengthlist__8u1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u1__p1_0, 0 @@ -2015,7 +2015,7 @@ static const long _vq_quantlist__8u1__p2_0[] = { 2, }; -static const long _vq_lengthlist__8u1__p2_0[] = { +static const char _vq_lengthlist__8u1__p2_0[] = { 3, 4, 5, 5, 6, 6, 5, 6, 6, 5, 7, 6, 6, 7, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 7, 5, 6, 6, 7, 8, 8, 6, 7, 7, 6, 8, 7, 7, 7, 9, 8, 9, 9, 6, 7, 8, @@ -2026,7 +2026,7 @@ static const long _vq_lengthlist__8u1__p2_0[] = { static const static_codebook _8u1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__8u1__p2_0, + (char *)_vq_lengthlist__8u1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__8u1__p2_0, 0 @@ -2040,7 +2040,7 @@ static const long _vq_quantlist__8u1__p3_0[] = { 4, }; -static const long _vq_lengthlist__8u1__p3_0[] = { +static const char _vq_lengthlist__8u1__p3_0[] = { 1, 5, 5, 7, 7, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, 10, 9,11,11, 9, 9, 9,11,11, 6, 8, 8,10,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,12,12,10,11,11, @@ -2085,7 +2085,7 @@ static const long _vq_lengthlist__8u1__p3_0[] = { static const static_codebook _8u1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__8u1__p3_0, + (char *)_vq_lengthlist__8u1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u1__p3_0, 0 @@ -2099,7 +2099,7 @@ static const long _vq_quantlist__8u1__p4_0[] = { 4, }; -static const long _vq_lengthlist__8u1__p4_0[] = { +static const char _vq_lengthlist__8u1__p4_0[] = { 4, 5, 5, 9, 9, 6, 7, 7, 9, 9, 6, 7, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 7, 8, 9,10, 7, 7, 8, 9,10, 9, 9,10,10,11, 9, 9,10, @@ -2144,7 +2144,7 @@ static const long _vq_lengthlist__8u1__p4_0[] = { static const static_codebook _8u1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__8u1__p4_0, + (char *)_vq_lengthlist__8u1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__8u1__p4_0, 0 @@ -2162,7 +2162,7 @@ static const long _vq_quantlist__8u1__p5_0[] = { 8, }; -static const long _vq_lengthlist__8u1__p5_0[] = { +static const char _vq_lengthlist__8u1__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 5, 8, 7, 8, 8, 10,10, 4, 6, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 8, 8, 8, @@ -2173,7 +2173,7 @@ static const long _vq_lengthlist__8u1__p5_0[] = { static const static_codebook _8u1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__8u1__p5_0, + (char *)_vq_lengthlist__8u1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p5_0, 0 @@ -2191,7 +2191,7 @@ static const long _vq_quantlist__8u1__p6_0[] = { 8, }; -static const long _vq_lengthlist__8u1__p6_0[] = { +static const char _vq_lengthlist__8u1__p6_0[] = { 3, 4, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 4, 4, 4, 6, 6, 7, 7, 9, 9, 6, 6, 6, 7, 7, 8, 8, 9, 9, 6, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7, @@ -2202,7 +2202,7 @@ static const long _vq_lengthlist__8u1__p6_0[] = { static const static_codebook _8u1__p6_0 = { 2, 81, - (long *)_vq_lengthlist__8u1__p6_0, + (char *)_vq_lengthlist__8u1__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p6_0, 0 @@ -2214,7 +2214,7 @@ static const long _vq_quantlist__8u1__p7_0[] = { 2, }; -static const long _vq_lengthlist__8u1__p7_0[] = { +static const char _vq_lengthlist__8u1__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,10,10, 8, 10,10, 5, 9, 9, 7,10,10, 8,10,10, 4,10,10, 9,12, 12, 9,11,11, 7,12,11,10,11,13,10,13,13, 7,12,12, @@ -2225,7 +2225,7 @@ static const long _vq_lengthlist__8u1__p7_0[] = { static const static_codebook _8u1__p7_0 = { 4, 81, - (long *)_vq_lengthlist__8u1__p7_0, + (char *)_vq_lengthlist__8u1__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__8u1__p7_0, 0 @@ -2245,7 +2245,7 @@ static const long _vq_quantlist__8u1__p7_1[] = { 10, }; -static const long _vq_lengthlist__8u1__p7_1[] = { +static const char _vq_lengthlist__8u1__p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, @@ -2258,7 +2258,7 @@ static const long _vq_lengthlist__8u1__p7_1[] = { static const static_codebook _8u1__p7_1 = { 2, 121, - (long *)_vq_lengthlist__8u1__p7_1, + (char *)_vq_lengthlist__8u1__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p7_1, 0 @@ -2278,7 +2278,7 @@ static const long _vq_quantlist__8u1__p8_0[] = { 10, }; -static const long _vq_lengthlist__8u1__p8_0[] = { +static const char _vq_lengthlist__8u1__p8_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,11,11,13,12, 4, 6, 6, 7, 7, 9, 9,11,11,12, 12, 6, 7, 7, 9, 9,11,11,12,12,13,13, 6, 7, 7, 9, @@ -2291,7 +2291,7 @@ static const long _vq_lengthlist__8u1__p8_0[] = { static const static_codebook _8u1__p8_0 = { 2, 121, - (long *)_vq_lengthlist__8u1__p8_0, + (char *)_vq_lengthlist__8u1__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__8u1__p8_0, 0 @@ -2311,7 +2311,7 @@ static const long _vq_quantlist__8u1__p8_1[] = { 10, }; -static const long _vq_lengthlist__8u1__p8_1[] = { +static const char _vq_lengthlist__8u1__p8_1[] = { 2, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, @@ -2324,7 +2324,7 @@ static const long _vq_lengthlist__8u1__p8_1[] = { static const static_codebook _8u1__p8_1 = { 2, 121, - (long *)_vq_lengthlist__8u1__p8_1, + (char *)_vq_lengthlist__8u1__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__8u1__p8_1, 0 @@ -2348,7 +2348,7 @@ static const long _vq_quantlist__8u1__p9_0[] = { 14, }; -static const long _vq_lengthlist__8u1__p9_0[] = { +static const char _vq_lengthlist__8u1__p9_0[] = { 1, 4, 4,11,11,11,11,11,11,11,11,11,11,11,11, 3, 11, 8,11,11,11,11,11,11,11,11,11,11,11,11, 3, 9, 9,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -2368,7 +2368,7 @@ static const long _vq_lengthlist__8u1__p9_0[] = { static const static_codebook _8u1__p9_0 = { 2, 225, - (long *)_vq_lengthlist__8u1__p9_0, + (char *)_vq_lengthlist__8u1__p9_0, 1, -514071552, 1627381760, 4, 0, (long *)_vq_quantlist__8u1__p9_0, 0 @@ -2392,7 +2392,7 @@ static const long _vq_quantlist__8u1__p9_1[] = { 14, }; -static const long _vq_lengthlist__8u1__p9_1[] = { +static const char _vq_lengthlist__8u1__p9_1[] = { 1, 4, 4, 7, 7, 9, 9, 7, 7, 8, 8,10,10,11,11, 4, 7, 7, 9, 9,10,10, 8, 8,10,10,10,11,10,11, 4, 7, 7, 9, 9,10,10, 8, 8,10, 9,11,11,11,11, 7, 9, 9, @@ -2412,7 +2412,7 @@ static const long _vq_lengthlist__8u1__p9_1[] = { static const static_codebook _8u1__p9_1 = { 2, 225, - (long *)_vq_lengthlist__8u1__p9_1, + (char *)_vq_lengthlist__8u1__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__8u1__p9_1, 0 @@ -2438,7 +2438,7 @@ static const long _vq_quantlist__8u1__p9_2[] = { 16, }; -static const long _vq_lengthlist__8u1__p9_2[] = { +static const char _vq_lengthlist__8u1__p9_2[] = { 2, 5, 4, 6, 6, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9, 9, @@ -2462,13 +2462,13 @@ static const long _vq_lengthlist__8u1__p9_2[] = { static const static_codebook _8u1__p9_2 = { 2, 289, - (long *)_vq_lengthlist__8u1__p9_2, + (char *)_vq_lengthlist__8u1__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__8u1__p9_2, 0 }; -static const long _huff_lengthlist__8u1__single[] = { +static const char _huff_lengthlist__8u1__single[] = { 4, 7,13, 9,15, 9,16, 8,10,13, 7, 5, 8, 6, 9, 7, 10, 7,10,11,11, 6, 7, 8, 8, 9, 9, 9,12,16, 8, 5, 8, 6, 8, 6, 9, 7,10,12,11, 7, 7, 7, 6, 7, 7, 7, @@ -2480,13 +2480,13 @@ static const long _huff_lengthlist__8u1__single[] = { static const static_codebook _huff_book__8u1__single = { 2, 100, - (long *)_huff_lengthlist__8u1__single, + (char *)_huff_lengthlist__8u1__single, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u0__long[] = { +static const char _huff_lengthlist__44u0__long[] = { 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16, 13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18, 15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17, @@ -2495,7 +2495,7 @@ static const long _huff_lengthlist__44u0__long[] = { static const static_codebook _huff_book__44u0__long = { 2, 64, - (long *)_huff_lengthlist__44u0__long, + (char *)_huff_lengthlist__44u0__long, 0, 0, 0, 0, 0, NULL, 0 @@ -2507,7 +2507,7 @@ static const long _vq_quantlist__44u0__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u0__p1_0[] = { +static const char _vq_lengthlist__44u0__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, 10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11, @@ -2518,7 +2518,7 @@ static const long _vq_lengthlist__44u0__p1_0[] = { static const static_codebook _44u0__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u0__p1_0, + (char *)_vq_lengthlist__44u0__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u0__p1_0, 0 @@ -2530,7 +2530,7 @@ static const long _vq_quantlist__44u0__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u0__p2_0[] = { +static const char _vq_lengthlist__44u0__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -2541,7 +2541,7 @@ static const long _vq_lengthlist__44u0__p2_0[] = { static const static_codebook _44u0__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u0__p2_0, + (char *)_vq_lengthlist__44u0__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u0__p2_0, 0 @@ -2555,7 +2555,7 @@ static const long _vq_quantlist__44u0__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u0__p3_0[] = { +static const char _vq_lengthlist__44u0__p3_0[] = { 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11, @@ -2600,7 +2600,7 @@ static const long _vq_lengthlist__44u0__p3_0[] = { static const static_codebook _44u0__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u0__p3_0, + (char *)_vq_lengthlist__44u0__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u0__p3_0, 0 @@ -2614,7 +2614,7 @@ static const long _vq_quantlist__44u0__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u0__p4_0[] = { +static const char _vq_lengthlist__44u0__p4_0[] = { 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7, 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10, @@ -2659,7 +2659,7 @@ static const long _vq_lengthlist__44u0__p4_0[] = { static const static_codebook _44u0__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u0__p4_0, + (char *)_vq_lengthlist__44u0__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u0__p4_0, 0 @@ -2677,7 +2677,7 @@ static const long _vq_quantlist__44u0__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u0__p5_0[] = { +static const char _vq_lengthlist__44u0__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,10, 7, 8, 8, @@ -2688,7 +2688,7 @@ static const long _vq_lengthlist__44u0__p5_0[] = { static const static_codebook _44u0__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u0__p5_0, + (char *)_vq_lengthlist__44u0__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u0__p5_0, 0 @@ -2710,7 +2710,7 @@ static const long _vq_quantlist__44u0__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u0__p6_0[] = { +static const char _vq_lengthlist__44u0__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5, 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -2726,7 +2726,7 @@ static const long _vq_lengthlist__44u0__p6_0[] = { static const static_codebook _44u0__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u0__p6_0, + (char *)_vq_lengthlist__44u0__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u0__p6_0, 0 @@ -2740,14 +2740,14 @@ static const long _vq_quantlist__44u0__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u0__p6_1[] = { +static const char _vq_lengthlist__44u0__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 5, 6, 6, 6, 6, }; static const static_codebook _44u0__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u0__p6_1, + (char *)_vq_lengthlist__44u0__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u0__p6_1, 0 @@ -2761,7 +2761,7 @@ static const long _vq_quantlist__44u0__p7_0[] = { 4, }; -static const long _vq_lengthlist__44u0__p7_0[] = { +static const char _vq_lengthlist__44u0__p7_0[] = { 1, 4, 4,11,11, 9,11,11,11,11,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -2806,7 +2806,7 @@ static const long _vq_lengthlist__44u0__p7_0[] = { static const static_codebook _44u0__p7_0 = { 4, 625, - (long *)_vq_lengthlist__44u0__p7_0, + (char *)_vq_lengthlist__44u0__p7_0, 1, -518709248, 1626677248, 3, 0, (long *)_vq_quantlist__44u0__p7_0, 0 @@ -2828,7 +2828,7 @@ static const long _vq_quantlist__44u0__p7_1[] = { 12, }; -static const long _vq_lengthlist__44u0__p7_1[] = { +static const char _vq_lengthlist__44u0__p7_1[] = { 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7, 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7, 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10, @@ -2844,7 +2844,7 @@ static const long _vq_lengthlist__44u0__p7_1[] = { static const static_codebook _44u0__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44u0__p7_1, + (char *)_vq_lengthlist__44u0__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44u0__p7_1, 0 @@ -2866,7 +2866,7 @@ static const long _vq_quantlist__44u0__p7_2[] = { 12, }; -static const long _vq_lengthlist__44u0__p7_2[] = { +static const char _vq_lengthlist__44u0__p7_2[] = { 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8, @@ -2882,13 +2882,13 @@ static const long _vq_lengthlist__44u0__p7_2[] = { static const static_codebook _44u0__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44u0__p7_2, + (char *)_vq_lengthlist__44u0__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44u0__p7_2, 0 }; -static const long _huff_lengthlist__44u0__short[] = { +static const char _huff_lengthlist__44u0__short[] = { 12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16, 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16, 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16, @@ -2897,13 +2897,13 @@ static const long _huff_lengthlist__44u0__short[] = { static const static_codebook _huff_book__44u0__short = { 2, 64, - (long *)_huff_lengthlist__44u0__short, + (char *)_huff_lengthlist__44u0__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u1__long[] = { +static const char _huff_lengthlist__44u1__long[] = { 5, 8,13,10,17,11,11,15, 7, 2, 4, 5, 8, 7, 9,16, 13, 4, 3, 5, 6, 8,11,20,10, 4, 5, 5, 7, 6, 8,18, 15, 7, 6, 7, 8,10,14,20,10, 6, 7, 6, 9, 7, 8,17, @@ -2912,7 +2912,7 @@ static const long _huff_lengthlist__44u1__long[] = { static const static_codebook _huff_book__44u1__long = { 2, 64, - (long *)_huff_lengthlist__44u1__long, + (char *)_huff_lengthlist__44u1__long, 0, 0, 0, 0, 0, NULL, 0 @@ -2924,7 +2924,7 @@ static const long _vq_quantlist__44u1__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u1__p1_0[] = { +static const char _vq_lengthlist__44u1__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, 10,10, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,12,11,11,13,13,11,13,14, 7,11,11, @@ -2935,7 +2935,7 @@ static const long _vq_lengthlist__44u1__p1_0[] = { static const static_codebook _44u1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u1__p1_0, + (char *)_vq_lengthlist__44u1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u1__p1_0, 0 @@ -2947,7 +2947,7 @@ static const long _vq_quantlist__44u1__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u1__p2_0[] = { +static const char _vq_lengthlist__44u1__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, 8, 8, 5, 7, 7, 6, 8, 8, 7, 8, 8, 4, 7, 7, 7, 8, 8, 7, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -2958,7 +2958,7 @@ static const long _vq_lengthlist__44u1__p2_0[] = { static const static_codebook _44u1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u1__p2_0, + (char *)_vq_lengthlist__44u1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u1__p2_0, 0 @@ -2972,7 +2972,7 @@ static const long _vq_quantlist__44u1__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u1__p3_0[] = { +static const char _vq_lengthlist__44u1__p3_0[] = { 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 6, 8, 8,11,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,14,13,10,11,11, @@ -3017,7 +3017,7 @@ static const long _vq_lengthlist__44u1__p3_0[] = { static const static_codebook _44u1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u1__p3_0, + (char *)_vq_lengthlist__44u1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u1__p3_0, 0 @@ -3031,7 +3031,7 @@ static const long _vq_quantlist__44u1__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u1__p4_0[] = { +static const char _vq_lengthlist__44u1__p4_0[] = { 4, 5, 5, 9, 9, 5, 6, 6, 9, 9, 5, 6, 6, 9, 9, 9, 10, 9,12,12, 9, 9,10,12,12, 5, 7, 7,10,10, 7, 7, 8,10,10, 6, 7, 8,10,10,10,10,10,11,13,10, 9,10, @@ -3076,7 +3076,7 @@ static const long _vq_lengthlist__44u1__p4_0[] = { static const static_codebook _44u1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u1__p4_0, + (char *)_vq_lengthlist__44u1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u1__p4_0, 0 @@ -3094,7 +3094,7 @@ static const long _vq_quantlist__44u1__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u1__p5_0[] = { +static const char _vq_lengthlist__44u1__p5_0[] = { 1, 4, 4, 7, 7, 7, 7, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 4, 6, 6, 8, 8, 8, 8, 9, 9, 7, 8, 8, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,10, 7, 8, 8, @@ -3105,7 +3105,7 @@ static const long _vq_lengthlist__44u1__p5_0[] = { static const static_codebook _44u1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u1__p5_0, + (char *)_vq_lengthlist__44u1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u1__p5_0, 0 @@ -3127,7 +3127,7 @@ static const long _vq_quantlist__44u1__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u1__p6_0[] = { +static const char _vq_lengthlist__44u1__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10, 9,11,10,14,13, 4, 6, 5, 8, 8, 9, 9,11,10,11,11,14,14, 4, 5, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -3143,7 +3143,7 @@ static const long _vq_lengthlist__44u1__p6_0[] = { static const static_codebook _44u1__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u1__p6_0, + (char *)_vq_lengthlist__44u1__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u1__p6_0, 0 @@ -3157,14 +3157,14 @@ static const long _vq_quantlist__44u1__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u1__p6_1[] = { +static const char _vq_lengthlist__44u1__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 5, 6, 6, 6, 6, }; static const static_codebook _44u1__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u1__p6_1, + (char *)_vq_lengthlist__44u1__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u1__p6_1, 0 @@ -3180,7 +3180,7 @@ static const long _vq_quantlist__44u1__p7_0[] = { 6, }; -static const long _vq_lengthlist__44u1__p7_0[] = { +static const char _vq_lengthlist__44u1__p7_0[] = { 1, 3, 2, 9, 9, 7, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -3189,7 +3189,7 @@ static const long _vq_lengthlist__44u1__p7_0[] = { static const static_codebook _44u1__p7_0 = { 2, 49, - (long *)_vq_lengthlist__44u1__p7_0, + (char *)_vq_lengthlist__44u1__p7_0, 1, -518017024, 1626677248, 3, 0, (long *)_vq_quantlist__44u1__p7_0, 0 @@ -3211,7 +3211,7 @@ static const long _vq_quantlist__44u1__p7_1[] = { 12, }; -static const long _vq_lengthlist__44u1__p7_1[] = { +static const char _vq_lengthlist__44u1__p7_1[] = { 1, 4, 4, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, 5, 7, 7, 8, 7, 7, 7, 9, 8,10, 9,10,11, 5, 7, 7, 8, 8, 7, 7, 8, 9,10,10,11,11, 6, 8, 8, 9, 9, 9, 9,11,10, @@ -3227,7 +3227,7 @@ static const long _vq_lengthlist__44u1__p7_1[] = { static const static_codebook _44u1__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44u1__p7_1, + (char *)_vq_lengthlist__44u1__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44u1__p7_1, 0 @@ -3249,7 +3249,7 @@ static const long _vq_quantlist__44u1__p7_2[] = { 12, }; -static const long _vq_lengthlist__44u1__p7_2[] = { +static const char _vq_lengthlist__44u1__p7_2[] = { 2, 5, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 5, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 5, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 6, 7, 7, 8, 8, 8, 8, 9, 8, @@ -3265,13 +3265,13 @@ static const long _vq_lengthlist__44u1__p7_2[] = { static const static_codebook _44u1__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44u1__p7_2, + (char *)_vq_lengthlist__44u1__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44u1__p7_2, 0 }; -static const long _huff_lengthlist__44u1__short[] = { +static const char _huff_lengthlist__44u1__short[] = { 12,13,14,13,17,12,15,17, 5, 5, 6,10,10,11,15,16, 4, 3, 3, 7, 5, 7,10,16, 7, 7, 7,10, 9,11,12,16, 6, 5, 5, 9, 5, 6,10,16, 8, 7, 7, 9, 6, 7, 9,16, @@ -3280,13 +3280,13 @@ static const long _huff_lengthlist__44u1__short[] = { static const static_codebook _huff_book__44u1__short = { 2, 64, - (long *)_huff_lengthlist__44u1__short, + (char *)_huff_lengthlist__44u1__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u2__long[] = { +static const char _huff_lengthlist__44u2__long[] = { 5, 9,14,12,15,13,10,13, 7, 4, 5, 6, 8, 7, 8,12, 13, 4, 3, 5, 5, 6, 9,15,12, 6, 5, 6, 6, 6, 7,14, 14, 7, 4, 6, 4, 6, 8,15,12, 6, 6, 5, 5, 5, 6,14, @@ -3295,7 +3295,7 @@ static const long _huff_lengthlist__44u2__long[] = { static const static_codebook _huff_book__44u2__long = { 2, 64, - (long *)_huff_lengthlist__44u2__long, + (char *)_huff_lengthlist__44u2__long, 0, 0, 0, 0, 0, NULL, 0 @@ -3307,7 +3307,7 @@ static const long _vq_quantlist__44u2__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u2__p1_0[] = { +static const char _vq_lengthlist__44u2__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,11,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,11,11,11,13,14,11,13,13, 7,11,11, @@ -3318,7 +3318,7 @@ static const long _vq_lengthlist__44u2__p1_0[] = { static const static_codebook _44u2__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u2__p1_0, + (char *)_vq_lengthlist__44u2__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u2__p1_0, 0 @@ -3330,7 +3330,7 @@ static const long _vq_quantlist__44u2__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u2__p2_0[] = { +static const char _vq_lengthlist__44u2__p2_0[] = { 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8, 7, 7, 8, 8, 5, 6, 6, 7, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -3341,7 +3341,7 @@ static const long _vq_lengthlist__44u2__p2_0[] = { static const static_codebook _44u2__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u2__p2_0, + (char *)_vq_lengthlist__44u2__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u2__p2_0, 0 @@ -3355,7 +3355,7 @@ static const long _vq_quantlist__44u2__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u2__p3_0[] = { +static const char _vq_lengthlist__44u2__p3_0[] = { 2, 4, 4, 7, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, 9, 9,12,11, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11, @@ -3400,7 +3400,7 @@ static const long _vq_lengthlist__44u2__p3_0[] = { static const static_codebook _44u2__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u2__p3_0, + (char *)_vq_lengthlist__44u2__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u2__p3_0, 0 @@ -3414,7 +3414,7 @@ static const long _vq_quantlist__44u2__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u2__p4_0[] = { +static const char _vq_lengthlist__44u2__p4_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8,10,10,10,10,10,11,12, 9,10,10, @@ -3459,7 +3459,7 @@ static const long _vq_lengthlist__44u2__p4_0[] = { static const static_codebook _44u2__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u2__p4_0, + (char *)_vq_lengthlist__44u2__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u2__p4_0, 0 @@ -3477,7 +3477,7 @@ static const long _vq_quantlist__44u2__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u2__p5_0[] = { +static const char _vq_lengthlist__44u2__p5_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 8, 8, 8, 10,10, 4, 5, 6, 8, 8, 8, 8,10,10, 7, 8, 8, 9, 9, 9, 9,11,11, 7, 8, 8, 9, 9, 9, 9,11,11, 8, 8, 8, @@ -3488,7 +3488,7 @@ static const long _vq_lengthlist__44u2__p5_0[] = { static const static_codebook _44u2__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u2__p5_0, + (char *)_vq_lengthlist__44u2__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u2__p5_0, 0 @@ -3510,7 +3510,7 @@ static const long _vq_quantlist__44u2__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u2__p6_0[] = { +static const char _vq_lengthlist__44u2__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11,14,13, 4, 6, 5, 8, 8, 9, 9,11,10,12,11,15,14, 4, 5, 6, 8, 8, 9, 9,11,11,11,11,14,14, 6, 8, 8,10, 9,11,11,11,11, @@ -3526,7 +3526,7 @@ static const long _vq_lengthlist__44u2__p6_0[] = { static const static_codebook _44u2__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u2__p6_0, + (char *)_vq_lengthlist__44u2__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u2__p6_0, 0 @@ -3540,14 +3540,14 @@ static const long _vq_quantlist__44u2__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u2__p6_1[] = { +static const char _vq_lengthlist__44u2__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 6, 5, 6, 6, 5, 5, 6, 6, 6, }; static const static_codebook _44u2__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u2__p6_1, + (char *)_vq_lengthlist__44u2__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u2__p6_1, 0 @@ -3565,7 +3565,7 @@ static const long _vq_quantlist__44u2__p7_0[] = { 8, }; -static const long _vq_lengthlist__44u2__p7_0[] = { +static const char _vq_lengthlist__44u2__p7_0[] = { 1, 3, 2,12,12,12,12,12,12, 4,12,12,12,12,12,12, 12,12, 5,12,12,12,12,12,12,12,12,12,12,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -3576,7 +3576,7 @@ static const long _vq_lengthlist__44u2__p7_0[] = { static const static_codebook _44u2__p7_0 = { 2, 81, - (long *)_vq_lengthlist__44u2__p7_0, + (char *)_vq_lengthlist__44u2__p7_0, 1, -516612096, 1626677248, 4, 0, (long *)_vq_quantlist__44u2__p7_0, 0 @@ -3598,7 +3598,7 @@ static const long _vq_quantlist__44u2__p7_1[] = { 12, }; -static const long _vq_lengthlist__44u2__p7_1[] = { +static const char _vq_lengthlist__44u2__p7_1[] = { 1, 4, 4, 7, 6, 7, 6, 8, 7, 9, 7, 9, 8, 4, 7, 6, 8, 8, 9, 8,10, 9,10,10,11,11, 4, 7, 7, 8, 8, 8, 8, 9,10,11,11,11,11, 6, 8, 8,10,10,10,10,11,11, @@ -3614,7 +3614,7 @@ static const long _vq_lengthlist__44u2__p7_1[] = { static const static_codebook _44u2__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44u2__p7_1, + (char *)_vq_lengthlist__44u2__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44u2__p7_1, 0 @@ -3636,7 +3636,7 @@ static const long _vq_quantlist__44u2__p7_2[] = { 12, }; -static const long _vq_lengthlist__44u2__p7_2[] = { +static const char _vq_lengthlist__44u2__p7_2[] = { 2, 5, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 5, 6, 6, 7, 7, 8, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, 8, 8, 8, 8, 8, @@ -3652,13 +3652,13 @@ static const long _vq_lengthlist__44u2__p7_2[] = { static const static_codebook _44u2__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44u2__p7_2, + (char *)_vq_lengthlist__44u2__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44u2__p7_2, 0 }; -static const long _huff_lengthlist__44u2__short[] = { +static const char _huff_lengthlist__44u2__short[] = { 13,15,17,17,15,15,12,17,11, 9, 7,10,10, 9,12,17, 10, 6, 3, 6, 5, 7,10,17,15,10, 6, 9, 8, 9,11,17, 15, 8, 4, 7, 3, 5, 9,16,16,10, 5, 8, 4, 5, 8,16, @@ -3667,13 +3667,13 @@ static const long _huff_lengthlist__44u2__short[] = { static const static_codebook _huff_book__44u2__short = { 2, 64, - (long *)_huff_lengthlist__44u2__short, + (char *)_huff_lengthlist__44u2__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u3__long[] = { +static const char _huff_lengthlist__44u3__long[] = { 6, 9,13,12,14,11,10,13, 8, 4, 5, 7, 8, 7, 8,12, 11, 4, 3, 5, 5, 7, 9,14,11, 6, 5, 6, 6, 6, 7,13, 13, 7, 5, 6, 4, 5, 7,14,11, 7, 6, 6, 5, 5, 6,13, @@ -3682,7 +3682,7 @@ static const long _huff_lengthlist__44u3__long[] = { static const static_codebook _huff_book__44u3__long = { 2, 64, - (long *)_huff_lengthlist__44u3__long, + (char *)_huff_lengthlist__44u3__long, 0, 0, 0, 0, 0, NULL, 0 @@ -3694,7 +3694,7 @@ static const long _vq_quantlist__44u3__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u3__p1_0[] = { +static const char _vq_lengthlist__44u3__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,11,11,11,13,14,11,14,14, 8,11,11, @@ -3705,7 +3705,7 @@ static const long _vq_lengthlist__44u3__p1_0[] = { static const static_codebook _44u3__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u3__p1_0, + (char *)_vq_lengthlist__44u3__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u3__p1_0, 0 @@ -3717,7 +3717,7 @@ static const long _vq_quantlist__44u3__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u3__p2_0[] = { +static const char _vq_lengthlist__44u3__p2_0[] = { 2, 5, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 7, 8, 8, 6, 8, 8, 7, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -3728,7 +3728,7 @@ static const long _vq_lengthlist__44u3__p2_0[] = { static const static_codebook _44u3__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u3__p2_0, + (char *)_vq_lengthlist__44u3__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u3__p2_0, 0 @@ -3742,7 +3742,7 @@ static const long _vq_quantlist__44u3__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u3__p3_0[] = { +static const char _vq_lengthlist__44u3__p3_0[] = { 2, 4, 4, 7, 7, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, 9, 9,12,12, 8, 9, 9,11,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 7, 9, 9,10,11,10,11,11,13,13, 9,10,11, @@ -3787,7 +3787,7 @@ static const long _vq_lengthlist__44u3__p3_0[] = { static const static_codebook _44u3__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u3__p3_0, + (char *)_vq_lengthlist__44u3__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u3__p3_0, 0 @@ -3801,7 +3801,7 @@ static const long _vq_quantlist__44u3__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u3__p4_0[] = { +static const char _vq_lengthlist__44u3__p4_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, 9, 9,11,11, 9, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10, @@ -3846,7 +3846,7 @@ static const long _vq_lengthlist__44u3__p4_0[] = { static const static_codebook _44u3__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u3__p4_0, + (char *)_vq_lengthlist__44u3__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u3__p4_0, 0 @@ -3864,7 +3864,7 @@ static const long _vq_quantlist__44u3__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u3__p5_0[] = { +static const char _vq_lengthlist__44u3__p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8, 10,10, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8, 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,10, 7, 8, 8, @@ -3875,7 +3875,7 @@ static const long _vq_lengthlist__44u3__p5_0[] = { static const static_codebook _44u3__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u3__p5_0, + (char *)_vq_lengthlist__44u3__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u3__p5_0, 0 @@ -3897,7 +3897,7 @@ static const long _vq_quantlist__44u3__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u3__p6_0[] = { +static const char _vq_lengthlist__44u3__p6_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,11,13,14, 4, 6, 5, 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -3913,7 +3913,7 @@ static const long _vq_lengthlist__44u3__p6_0[] = { static const static_codebook _44u3__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u3__p6_0, + (char *)_vq_lengthlist__44u3__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u3__p6_0, 0 @@ -3927,14 +3927,14 @@ static const long _vq_quantlist__44u3__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u3__p6_1[] = { +static const char _vq_lengthlist__44u3__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 6, 5, 6, 6, 5, 5, 6, 6, 6, }; static const static_codebook _44u3__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u3__p6_1, + (char *)_vq_lengthlist__44u3__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u3__p6_1, 0 @@ -3952,7 +3952,7 @@ static const long _vq_quantlist__44u3__p7_0[] = { 8, }; -static const long _vq_lengthlist__44u3__p7_0[] = { +static const char _vq_lengthlist__44u3__p7_0[] = { 1, 3, 3,10,10,10,10,10,10, 4,10,10,10,10,10,10, 10,10, 4,10,10,10,10,10,10,10,10,10,10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -3963,7 +3963,7 @@ static const long _vq_lengthlist__44u3__p7_0[] = { static const static_codebook _44u3__p7_0 = { 2, 81, - (long *)_vq_lengthlist__44u3__p7_0, + (char *)_vq_lengthlist__44u3__p7_0, 1, -515907584, 1627381760, 4, 0, (long *)_vq_quantlist__44u3__p7_0, 0 @@ -3987,7 +3987,7 @@ static const long _vq_quantlist__44u3__p7_1[] = { 14, }; -static const long _vq_lengthlist__44u3__p7_1[] = { +static const char _vq_lengthlist__44u3__p7_1[] = { 1, 4, 4, 6, 6, 7, 6, 8, 7, 9, 8,10, 9,11,11, 4, 7, 7, 8, 7, 9, 9,10,10,11,11,11,11,12,12, 4, 7, 7, 7, 7, 9, 9,10,10,11,11,12,12,12,11, 6, 8, 8, @@ -4007,7 +4007,7 @@ static const long _vq_lengthlist__44u3__p7_1[] = { static const static_codebook _44u3__p7_1 = { 2, 225, - (long *)_vq_lengthlist__44u3__p7_1, + (char *)_vq_lengthlist__44u3__p7_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u3__p7_1, 0 @@ -4033,7 +4033,7 @@ static const long _vq_quantlist__44u3__p7_2[] = { 16, }; -static const long _vq_lengthlist__44u3__p7_2[] = { +static const char _vq_lengthlist__44u3__p7_2[] = { 2, 5, 5, 7, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 10,10, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 8, 9, 9, 9, @@ -4057,13 +4057,13 @@ static const long _vq_lengthlist__44u3__p7_2[] = { static const static_codebook _44u3__p7_2 = { 2, 289, - (long *)_vq_lengthlist__44u3__p7_2, + (char *)_vq_lengthlist__44u3__p7_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u3__p7_2, 0 }; -static const long _huff_lengthlist__44u3__short[] = { +static const char _huff_lengthlist__44u3__short[] = { 14,14,14,15,13,15,12,16,10, 8, 7, 9, 9, 8,12,16, 10, 5, 4, 6, 5, 6, 9,16,14, 8, 6, 8, 7, 8,10,16, 14, 7, 4, 6, 3, 5, 8,16,15, 9, 5, 7, 4, 4, 7,16, @@ -4072,13 +4072,13 @@ static const long _huff_lengthlist__44u3__short[] = { static const static_codebook _huff_book__44u3__short = { 2, 64, - (long *)_huff_lengthlist__44u3__short, + (char *)_huff_lengthlist__44u3__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u4__long[] = { +static const char _huff_lengthlist__44u4__long[] = { 3, 8,12,12,13,12,11,13, 5, 4, 6, 7, 8, 8, 9,13, 9, 5, 4, 5, 5, 7, 9,13, 9, 6, 5, 6, 6, 7, 8,12, 12, 7, 5, 6, 4, 5, 8,13,11, 7, 6, 6, 5, 5, 6,12, @@ -4087,7 +4087,7 @@ static const long _huff_lengthlist__44u4__long[] = { static const static_codebook _huff_book__44u4__long = { 2, 64, - (long *)_huff_lengthlist__44u4__long, + (char *)_huff_lengthlist__44u4__long, 0, 0, 0, 0, 0, NULL, 0 @@ -4099,7 +4099,7 @@ static const long _vq_quantlist__44u4__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u4__p1_0[] = { +static const char _vq_lengthlist__44u4__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,11, 4, 8, 8, 8,11, 11, 8,11,11, 8,11,11,11,13,14,11,15,14, 8,11,11, @@ -4110,7 +4110,7 @@ static const long _vq_lengthlist__44u4__p1_0[] = { static const static_codebook _44u4__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u4__p1_0, + (char *)_vq_lengthlist__44u4__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u4__p1_0, 0 @@ -4122,7 +4122,7 @@ static const long _vq_quantlist__44u4__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u4__p2_0[] = { +static const char _vq_lengthlist__44u4__p2_0[] = { 2, 5, 5, 5, 6, 6, 5, 6, 6, 5, 6, 6, 7, 8, 8, 6, 8, 8, 5, 6, 6, 6, 8, 8, 7, 8, 8, 5, 7, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9,10, 8,10,10, 6, 8, 8, @@ -4133,7 +4133,7 @@ static const long _vq_lengthlist__44u4__p2_0[] = { static const static_codebook _44u4__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u4__p2_0, + (char *)_vq_lengthlist__44u4__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u4__p2_0, 0 @@ -4147,7 +4147,7 @@ static const long _vq_quantlist__44u4__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u4__p3_0[] = { +static const char _vq_lengthlist__44u4__p3_0[] = { 2, 4, 4, 8, 8, 5, 7, 7, 9, 9, 5, 7, 7, 9, 9, 8, 10, 9,12,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 7, 9, 9,11,11,10,12,11,14,14, 9,10,11, @@ -4192,7 +4192,7 @@ static const long _vq_lengthlist__44u4__p3_0[] = { static const static_codebook _44u4__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u4__p3_0, + (char *)_vq_lengthlist__44u4__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u4__p3_0, 0 @@ -4206,7 +4206,7 @@ static const long _vq_quantlist__44u4__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u4__p4_0[] = { +static const char _vq_lengthlist__44u4__p4_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 9, 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8,10,10, 9,10,10,11,12, 9,10,10, @@ -4251,7 +4251,7 @@ static const long _vq_lengthlist__44u4__p4_0[] = { static const static_codebook _44u4__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u4__p4_0, + (char *)_vq_lengthlist__44u4__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u4__p4_0, 0 @@ -4269,7 +4269,7 @@ static const long _vq_quantlist__44u4__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u4__p5_0[] = { +static const char _vq_lengthlist__44u4__p5_0[] = { 2, 3, 3, 6, 6, 7, 7, 9, 9, 4, 5, 5, 7, 7, 8, 8, 10, 9, 4, 5, 5, 7, 7, 8, 8,10,10, 6, 7, 7, 8, 8, 9, 9,11,10, 6, 7, 7, 8, 8, 9, 9,10,11, 7, 8, 8, @@ -4280,7 +4280,7 @@ static const long _vq_lengthlist__44u4__p5_0[] = { static const static_codebook _44u4__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u4__p5_0, + (char *)_vq_lengthlist__44u4__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u4__p5_0, 0 @@ -4302,7 +4302,7 @@ static const long _vq_quantlist__44u4__p6_0[] = { 12, }; -static const long _vq_lengthlist__44u4__p6_0[] = { +static const char _vq_lengthlist__44u4__p6_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,11,10,13,13, 4, 6, 5, 8, 8, 9, 9,10,10,11,11,14,14, 4, 6, 6, 8, 8, 9, 9,10,10,11,11,14,14, 6, 8, 8, 9, 9,10,10,11,11, @@ -4318,7 +4318,7 @@ static const long _vq_lengthlist__44u4__p6_0[] = { static const static_codebook _44u4__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u4__p6_0, + (char *)_vq_lengthlist__44u4__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u4__p6_0, 0 @@ -4332,14 +4332,14 @@ static const long _vq_quantlist__44u4__p6_1[] = { 4, }; -static const long _vq_lengthlist__44u4__p6_1[] = { +static const char _vq_lengthlist__44u4__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 6, 5, 4, 5, 5, 5, 6, 5, 6, 5, 6, 6, 5, 5, 6, 6, 6, }; static const static_codebook _44u4__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u4__p6_1, + (char *)_vq_lengthlist__44u4__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u4__p6_1, 0 @@ -4361,7 +4361,7 @@ static const long _vq_quantlist__44u4__p7_0[] = { 12, }; -static const long _vq_lengthlist__44u4__p7_0[] = { +static const char _vq_lengthlist__44u4__p7_0[] = { 1, 3, 3,12,12,12,12,12,12,12,12,12,12, 3,12,11, 12,12,12,12,12,12,12,12,12,12, 4,11,10,12,12,12, 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12, @@ -4377,7 +4377,7 @@ static const long _vq_lengthlist__44u4__p7_0[] = { static const static_codebook _44u4__p7_0 = { 2, 169, - (long *)_vq_lengthlist__44u4__p7_0, + (char *)_vq_lengthlist__44u4__p7_0, 1, -514332672, 1627381760, 4, 0, (long *)_vq_quantlist__44u4__p7_0, 0 @@ -4401,7 +4401,7 @@ static const long _vq_quantlist__44u4__p7_1[] = { 14, }; -static const long _vq_lengthlist__44u4__p7_1[] = { +static const char _vq_lengthlist__44u4__p7_1[] = { 1, 4, 4, 6, 6, 7, 7, 9, 8,10, 8,10, 9,11,11, 4, 7, 6, 8, 7, 9, 9,10,10,11,10,11,10,12,10, 4, 6, 7, 8, 8, 9, 9,10,10,11,11,11,11,12,12, 6, 8, 8, @@ -4421,7 +4421,7 @@ static const long _vq_lengthlist__44u4__p7_1[] = { static const static_codebook _44u4__p7_1 = { 2, 225, - (long *)_vq_lengthlist__44u4__p7_1, + (char *)_vq_lengthlist__44u4__p7_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u4__p7_1, 0 @@ -4447,7 +4447,7 @@ static const long _vq_quantlist__44u4__p7_2[] = { 16, }; -static const long _vq_lengthlist__44u4__p7_2[] = { +static const char _vq_lengthlist__44u4__p7_2[] = { 2, 5, 5, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, @@ -4471,13 +4471,13 @@ static const long _vq_lengthlist__44u4__p7_2[] = { static const static_codebook _44u4__p7_2 = { 2, 289, - (long *)_vq_lengthlist__44u4__p7_2, + (char *)_vq_lengthlist__44u4__p7_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u4__p7_2, 0 }; -static const long _huff_lengthlist__44u4__short[] = { +static const char _huff_lengthlist__44u4__short[] = { 14,17,15,17,16,14,13,16,10, 7, 7,10,13,10,15,16, 9, 4, 4, 6, 5, 7, 9,16,12, 8, 7, 8, 8, 8,11,16, 14, 7, 4, 6, 3, 5, 8,15,13, 8, 5, 7, 4, 5, 7,16, @@ -4486,13 +4486,13 @@ static const long _huff_lengthlist__44u4__short[] = { static const static_codebook _huff_book__44u4__short = { 2, 64, - (long *)_huff_lengthlist__44u4__short, + (char *)_huff_lengthlist__44u4__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u5__long[] = { +static const char _huff_lengthlist__44u5__long[] = { 3, 8,13,12,14,12,16,11,13,14, 5, 4, 5, 6, 7, 8, 10, 9,12,15,10, 5, 5, 5, 6, 8, 9, 9,13,15,10, 5, 5, 6, 6, 7, 8, 8,11,13,12, 7, 5, 6, 4, 6, 7, 7, @@ -4504,7 +4504,7 @@ static const long _huff_lengthlist__44u5__long[] = { static const static_codebook _huff_book__44u5__long = { 2, 100, - (long *)_huff_lengthlist__44u5__long, + (char *)_huff_lengthlist__44u5__long, 0, 0, 0, 0, 0, NULL, 0 @@ -4516,7 +4516,7 @@ static const long _vq_quantlist__44u5__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u5__p1_0[] = { +static const char _vq_lengthlist__44u5__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10, 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, @@ -4527,7 +4527,7 @@ static const long _vq_lengthlist__44u5__p1_0[] = { static const static_codebook _44u5__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u5__p1_0, + (char *)_vq_lengthlist__44u5__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u5__p1_0, 0 @@ -4539,7 +4539,7 @@ static const long _vq_quantlist__44u5__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u5__p2_0[] = { +static const char _vq_lengthlist__44u5__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7, @@ -4550,7 +4550,7 @@ static const long _vq_lengthlist__44u5__p2_0[] = { static const static_codebook _44u5__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u5__p2_0, + (char *)_vq_lengthlist__44u5__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u5__p2_0, 0 @@ -4564,7 +4564,7 @@ static const long _vq_quantlist__44u5__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u5__p3_0[] = { +static const char _vq_lengthlist__44u5__p3_0[] = { 2, 4, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 10, 9,13,12, 8, 9,10,12,12, 5, 7, 7,10,10, 7, 9, 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11, @@ -4609,7 +4609,7 @@ static const long _vq_lengthlist__44u5__p3_0[] = { static const static_codebook _44u5__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u5__p3_0, + (char *)_vq_lengthlist__44u5__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u5__p3_0, 0 @@ -4623,7 +4623,7 @@ static const long _vq_quantlist__44u5__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u5__p4_0[] = { +static const char _vq_lengthlist__44u5__p4_0[] = { 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 6, 7, 8, 9,10, 9,10,10,11,12, 9, 9,10, @@ -4668,7 +4668,7 @@ static const long _vq_lengthlist__44u5__p4_0[] = { static const static_codebook _44u5__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u5__p4_0, + (char *)_vq_lengthlist__44u5__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u5__p4_0, 0 @@ -4686,7 +4686,7 @@ static const long _vq_quantlist__44u5__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u5__p5_0[] = { +static const char _vq_lengthlist__44u5__p5_0[] = { 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8, 11,10, 3, 5, 5, 7, 8, 8, 8,10,11, 6, 8, 7,10, 9, 10,10,11,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8, @@ -4697,7 +4697,7 @@ static const long _vq_lengthlist__44u5__p5_0[] = { static const static_codebook _44u5__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u5__p5_0, + (char *)_vq_lengthlist__44u5__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p5_0, 0 @@ -4715,7 +4715,7 @@ static const long _vq_quantlist__44u5__p6_0[] = { 8, }; -static const long _vq_lengthlist__44u5__p6_0[] = { +static const char _vq_lengthlist__44u5__p6_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7, @@ -4726,7 +4726,7 @@ static const long _vq_lengthlist__44u5__p6_0[] = { static const static_codebook _44u5__p6_0 = { 2, 81, - (long *)_vq_lengthlist__44u5__p6_0, + (char *)_vq_lengthlist__44u5__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p6_0, 0 @@ -4738,7 +4738,7 @@ static const long _vq_quantlist__44u5__p7_0[] = { 2, }; -static const long _vq_lengthlist__44u5__p7_0[] = { +static const char _vq_lengthlist__44u5__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 9, 8,11,10, 7, 11,10, 5, 9, 9, 7,10,10, 8,10,11, 4, 9, 9, 9,12, 12, 9,12,12, 8,12,12,11,12,12,10,12,13, 7,12,12, @@ -4749,7 +4749,7 @@ static const long _vq_lengthlist__44u5__p7_0[] = { static const static_codebook _44u5__p7_0 = { 4, 81, - (long *)_vq_lengthlist__44u5__p7_0, + (char *)_vq_lengthlist__44u5__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u5__p7_0, 0 @@ -4769,7 +4769,7 @@ static const long _vq_quantlist__44u5__p7_1[] = { 10, }; -static const long _vq_lengthlist__44u5__p7_1[] = { +static const char _vq_lengthlist__44u5__p7_1[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 7, 8, 8, 9, 8, 8, 9, 4, 5, 5, 7, 7, 8, 8, 9, 9, 8, 9, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 6, 7, 7, 8, @@ -4782,7 +4782,7 @@ static const long _vq_lengthlist__44u5__p7_1[] = { static const static_codebook _44u5__p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u5__p7_1, + (char *)_vq_lengthlist__44u5__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p7_1, 0 @@ -4802,7 +4802,7 @@ static const long _vq_quantlist__44u5__p8_0[] = { 10, }; -static const long _vq_lengthlist__44u5__p8_0[] = { +static const char _vq_lengthlist__44u5__p8_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11, 11, 6, 8, 7, 9, 9,10,10,11,11,13,12, 6, 8, 8, 9, @@ -4815,7 +4815,7 @@ static const long _vq_lengthlist__44u5__p8_0[] = { static const static_codebook _44u5__p8_0 = { 2, 121, - (long *)_vq_lengthlist__44u5__p8_0, + (char *)_vq_lengthlist__44u5__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__44u5__p8_0, 0 @@ -4835,7 +4835,7 @@ static const long _vq_quantlist__44u5__p8_1[] = { 10, }; -static const long _vq_lengthlist__44u5__p8_1[] = { +static const char _vq_lengthlist__44u5__p8_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 6, 7, 6, 7, 7, 8, 8, 8, 8, 8, 8, 6, 6, 7, 7, @@ -4848,7 +4848,7 @@ static const long _vq_lengthlist__44u5__p8_1[] = { static const static_codebook _44u5__p8_1 = { 2, 121, - (long *)_vq_lengthlist__44u5__p8_1, + (char *)_vq_lengthlist__44u5__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u5__p8_1, 0 @@ -4870,7 +4870,7 @@ static const long _vq_quantlist__44u5__p9_0[] = { 12, }; -static const long _vq_lengthlist__44u5__p9_0[] = { +static const char _vq_lengthlist__44u5__p9_0[] = { 1, 3, 2,12,10,13,13,13,13,13,13,13,13, 4, 9, 9, 13,13,13,13,13,13,13,13,13,13, 5,10, 9,13,13,13, 13,13,13,13,13,13,13,12,13,13,13,13,13,13,13,13, @@ -4886,7 +4886,7 @@ static const long _vq_lengthlist__44u5__p9_0[] = { static const static_codebook _44u5__p9_0 = { 2, 169, - (long *)_vq_lengthlist__44u5__p9_0, + (char *)_vq_lengthlist__44u5__p9_0, 1, -514332672, 1627381760, 4, 0, (long *)_vq_quantlist__44u5__p9_0, 0 @@ -4910,7 +4910,7 @@ static const long _vq_quantlist__44u5__p9_1[] = { 14, }; -static const long _vq_lengthlist__44u5__p9_1[] = { +static const char _vq_lengthlist__44u5__p9_1[] = { 1, 4, 4, 7, 7, 8, 8, 8, 7, 8, 7, 9, 8, 9, 9, 4, 7, 6, 9, 8,10,10, 9, 8, 9, 9, 9, 9, 9, 8, 5, 6, 6, 8, 9,10,10, 9, 9, 9,10,10,10,10,11, 7, 8, 8, @@ -4930,7 +4930,7 @@ static const long _vq_lengthlist__44u5__p9_1[] = { static const static_codebook _44u5__p9_1 = { 2, 225, - (long *)_vq_lengthlist__44u5__p9_1, + (char *)_vq_lengthlist__44u5__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u5__p9_1, 0 @@ -4956,7 +4956,7 @@ static const long _vq_quantlist__44u5__p9_2[] = { 16, }; -static const long _vq_lengthlist__44u5__p9_2[] = { +static const char _vq_lengthlist__44u5__p9_2[] = { 2, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 8, 9, 9, 9, 9, 9, @@ -4980,13 +4980,13 @@ static const long _vq_lengthlist__44u5__p9_2[] = { static const static_codebook _44u5__p9_2 = { 2, 289, - (long *)_vq_lengthlist__44u5__p9_2, + (char *)_vq_lengthlist__44u5__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u5__p9_2, 0 }; -static const long _huff_lengthlist__44u5__short[] = { +static const char _huff_lengthlist__44u5__short[] = { 4,10,17,13,17,13,17,17,17,17, 3, 6, 8, 9,11, 9, 15,12,16,17, 6, 5, 5, 7, 7, 8,10,11,17,17, 7, 8, 7, 9, 9,10,13,13,17,17, 8, 6, 5, 7, 4, 7, 5, 8, @@ -4998,13 +4998,13 @@ static const long _huff_lengthlist__44u5__short[] = { static const static_codebook _huff_book__44u5__short = { 2, 100, - (long *)_huff_lengthlist__44u5__short, + (char *)_huff_lengthlist__44u5__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u6__long[] = { +static const char _huff_lengthlist__44u6__long[] = { 3, 9,14,13,14,13,16,12,13,14, 5, 4, 6, 6, 8, 9, 11,10,12,15,10, 5, 5, 6, 6, 8,10,10,13,16,10, 6, 6, 6, 6, 8, 9, 9,12,14,13, 7, 6, 6, 4, 6, 6, 7, @@ -5016,7 +5016,7 @@ static const long _huff_lengthlist__44u6__long[] = { static const static_codebook _huff_book__44u6__long = { 2, 100, - (long *)_huff_lengthlist__44u6__long, + (char *)_huff_lengthlist__44u6__long, 0, 0, 0, 0, 0, NULL, 0 @@ -5028,7 +5028,7 @@ static const long _vq_quantlist__44u6__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u6__p1_0[] = { +static const char _vq_lengthlist__44u6__p1_0[] = { 1, 4, 4, 4, 8, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 9,10, 5, 8, 8, 7,10, 9, 8,10,10, 5, 8, 8, 8,10, 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, @@ -5039,7 +5039,7 @@ static const long _vq_lengthlist__44u6__p1_0[] = { static const static_codebook _44u6__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u6__p1_0, + (char *)_vq_lengthlist__44u6__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u6__p1_0, 0 @@ -5051,7 +5051,7 @@ static const long _vq_quantlist__44u6__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u6__p2_0[] = { +static const char _vq_lengthlist__44u6__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, 8, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 7, 7, @@ -5062,7 +5062,7 @@ static const long _vq_lengthlist__44u6__p2_0[] = { static const static_codebook _44u6__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u6__p2_0, + (char *)_vq_lengthlist__44u6__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u6__p2_0, 0 @@ -5076,7 +5076,7 @@ static const long _vq_quantlist__44u6__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u6__p3_0[] = { +static const char _vq_lengthlist__44u6__p3_0[] = { 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9, 9,11,11, 7, 8, 9,11,11,10,11,11,14,14, 9,10,11, @@ -5121,7 +5121,7 @@ static const long _vq_lengthlist__44u6__p3_0[] = { static const static_codebook _44u6__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u6__p3_0, + (char *)_vq_lengthlist__44u6__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u6__p3_0, 0 @@ -5135,7 +5135,7 @@ static const long _vq_quantlist__44u6__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u6__p4_0[] = { +static const char _vq_lengthlist__44u6__p4_0[] = { 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 7, 8, 9,10, 9,10,10,11,11, 9, 9,10, @@ -5180,7 +5180,7 @@ static const long _vq_lengthlist__44u6__p4_0[] = { static const static_codebook _44u6__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u6__p4_0, + (char *)_vq_lengthlist__44u6__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u6__p4_0, 0 @@ -5198,7 +5198,7 @@ static const long _vq_quantlist__44u6__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u6__p5_0[] = { +static const char _vq_lengthlist__44u6__p5_0[] = { 2, 3, 3, 6, 6, 8, 8,10,10, 4, 5, 5, 8, 7, 8, 8, 11,11, 3, 5, 5, 7, 8, 8, 8,11,11, 6, 8, 7, 9, 9, 10, 9,12,11, 6, 7, 8, 9, 9, 9,10,11,12, 8, 8, 8, @@ -5209,7 +5209,7 @@ static const long _vq_lengthlist__44u6__p5_0[] = { static const static_codebook _44u6__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u6__p5_0, + (char *)_vq_lengthlist__44u6__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p5_0, 0 @@ -5227,7 +5227,7 @@ static const long _vq_quantlist__44u6__p6_0[] = { 8, }; -static const long _vq_lengthlist__44u6__p6_0[] = { +static const char _vq_lengthlist__44u6__p6_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 8, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, @@ -5238,7 +5238,7 @@ static const long _vq_lengthlist__44u6__p6_0[] = { static const static_codebook _44u6__p6_0 = { 2, 81, - (long *)_vq_lengthlist__44u6__p6_0, + (char *)_vq_lengthlist__44u6__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p6_0, 0 @@ -5250,7 +5250,7 @@ static const long _vq_quantlist__44u6__p7_0[] = { 2, }; -static const long _vq_lengthlist__44u6__p7_0[] = { +static const char _vq_lengthlist__44u6__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 7,10,10, 8, 10,10, 5, 8, 9, 7,10,10, 7,10, 9, 4, 8, 8, 9,11, 11, 8,11,11, 7,11,11,10,10,13,10,13,13, 7,11,11, @@ -5261,7 +5261,7 @@ static const long _vq_lengthlist__44u6__p7_0[] = { static const static_codebook _44u6__p7_0 = { 4, 81, - (long *)_vq_lengthlist__44u6__p7_0, + (char *)_vq_lengthlist__44u6__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u6__p7_0, 0 @@ -5281,7 +5281,7 @@ static const long _vq_quantlist__44u6__p7_1[] = { 10, }; -static const long _vq_lengthlist__44u6__p7_1[] = { +static const char _vq_lengthlist__44u6__p7_1[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 7, 6, 8, 8, 8, 8, 8, 8, 4, 5, 5, 6, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 6, 7, 7, 7, @@ -5294,7 +5294,7 @@ static const long _vq_lengthlist__44u6__p7_1[] = { static const static_codebook _44u6__p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u6__p7_1, + (char *)_vq_lengthlist__44u6__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p7_1, 0 @@ -5314,7 +5314,7 @@ static const long _vq_quantlist__44u6__p8_0[] = { 10, }; -static const long _vq_lengthlist__44u6__p8_0[] = { +static const char _vq_lengthlist__44u6__p8_0[] = { 1, 4, 4, 6, 6, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 9, 9,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,10,10,11, 11, 6, 8, 8, 9, 9,10,10,11,11,12,12, 6, 8, 8, 9, @@ -5327,7 +5327,7 @@ static const long _vq_lengthlist__44u6__p8_0[] = { static const static_codebook _44u6__p8_0 = { 2, 121, - (long *)_vq_lengthlist__44u6__p8_0, + (char *)_vq_lengthlist__44u6__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__44u6__p8_0, 0 @@ -5347,7 +5347,7 @@ static const long _vq_quantlist__44u6__p8_1[] = { 10, }; -static const long _vq_lengthlist__44u6__p8_1[] = { +static const char _vq_lengthlist__44u6__p8_1[] = { 3, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 5, 7, 7, 7, 7, 8, 7, 8, 8, 5, 5, 6, 6, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, 7, 8, 7, 8, 8, 8, 8, 6, 6, 7, 7, @@ -5360,7 +5360,7 @@ static const long _vq_lengthlist__44u6__p8_1[] = { static const static_codebook _44u6__p8_1 = { 2, 121, - (long *)_vq_lengthlist__44u6__p8_1, + (char *)_vq_lengthlist__44u6__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u6__p8_1, 0 @@ -5384,7 +5384,7 @@ static const long _vq_quantlist__44u6__p9_0[] = { 14, }; -static const long _vq_lengthlist__44u6__p9_0[] = { +static const char _vq_lengthlist__44u6__p9_0[] = { 1, 3, 2, 9, 8,15,15,15,15,15,15,15,15,15,15, 4, 8, 9,13,14,14,14,14,14,14,14,14,14,14,14, 5, 8, 9,14,14,14,14,14,14,14,14,14,14,14,14,11,14,14, @@ -5404,7 +5404,7 @@ static const long _vq_lengthlist__44u6__p9_0[] = { static const static_codebook _44u6__p9_0 = { 2, 225, - (long *)_vq_lengthlist__44u6__p9_0, + (char *)_vq_lengthlist__44u6__p9_0, 1, -514071552, 1627381760, 4, 0, (long *)_vq_quantlist__44u6__p9_0, 0 @@ -5428,7 +5428,7 @@ static const long _vq_quantlist__44u6__p9_1[] = { 14, }; -static const long _vq_lengthlist__44u6__p9_1[] = { +static const char _vq_lengthlist__44u6__p9_1[] = { 1, 4, 4, 7, 7, 8, 9, 8, 8, 9, 8, 9, 8, 9, 9, 4, 7, 6, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 4, 7, 6, 9, 9,10,10, 9, 9,10,10,10,10,11,11, 7, 9, 8, @@ -5448,7 +5448,7 @@ static const long _vq_lengthlist__44u6__p9_1[] = { static const static_codebook _44u6__p9_1 = { 2, 225, - (long *)_vq_lengthlist__44u6__p9_1, + (char *)_vq_lengthlist__44u6__p9_1, 1, -522338304, 1620115456, 4, 0, (long *)_vq_quantlist__44u6__p9_1, 0 @@ -5474,7 +5474,7 @@ static const long _vq_quantlist__44u6__p9_2[] = { 16, }; -static const long _vq_lengthlist__44u6__p9_2[] = { +static const char _vq_lengthlist__44u6__p9_2[] = { 3, 5, 5, 7, 7, 8, 8, 8, 8, 8, 8, 9, 8, 8, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 9, 9, @@ -5498,13 +5498,13 @@ static const long _vq_lengthlist__44u6__p9_2[] = { static const static_codebook _44u6__p9_2 = { 2, 289, - (long *)_vq_lengthlist__44u6__p9_2, + (char *)_vq_lengthlist__44u6__p9_2, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u6__p9_2, 0 }; -static const long _huff_lengthlist__44u6__short[] = { +static const char _huff_lengthlist__44u6__short[] = { 4,11,16,13,17,13,17,16,17,17, 4, 7, 9, 9,13,10, 16,12,16,17, 7, 6, 5, 7, 8, 9,12,12,16,17, 6, 9, 7, 9,10,10,15,15,17,17, 6, 7, 5, 7, 5, 7, 7,10, @@ -5516,13 +5516,13 @@ static const long _huff_lengthlist__44u6__short[] = { static const static_codebook _huff_book__44u6__short = { 2, 100, - (long *)_huff_lengthlist__44u6__short, + (char *)_huff_lengthlist__44u6__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u7__long[] = { +static const char _huff_lengthlist__44u7__long[] = { 3, 9,14,13,15,14,16,13,13,14, 5, 5, 7, 7, 8, 9, 11,10,12,15,10, 6, 5, 6, 6, 9,10,10,13,16,10, 6, 6, 6, 6, 8, 9, 9,12,15,14, 7, 6, 6, 5, 6, 6, 8, @@ -5534,7 +5534,7 @@ static const long _huff_lengthlist__44u7__long[] = { static const static_codebook _huff_book__44u7__long = { 2, 100, - (long *)_huff_lengthlist__44u7__long, + (char *)_huff_lengthlist__44u7__long, 0, 0, 0, 0, 0, NULL, 0 @@ -5546,7 +5546,7 @@ static const long _vq_quantlist__44u7__p1_0[] = { 2, }; -static const long _vq_lengthlist__44u7__p1_0[] = { +static const char _vq_lengthlist__44u7__p1_0[] = { 1, 4, 4, 4, 7, 7, 5, 7, 7, 5, 8, 8, 8,10,10, 7, 10,10, 5, 8, 8, 7,10,10, 8,10,10, 5, 8, 8, 8,11, 10, 8,10,10, 8,10,10,10,12,13,10,13,13, 7,10,10, @@ -5557,7 +5557,7 @@ static const long _vq_lengthlist__44u7__p1_0[] = { static const static_codebook _44u7__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u7__p1_0, + (char *)_vq_lengthlist__44u7__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u7__p1_0, 0 @@ -5569,7 +5569,7 @@ static const long _vq_quantlist__44u7__p2_0[] = { 2, }; -static const long _vq_lengthlist__44u7__p2_0[] = { +static const char _vq_lengthlist__44u7__p2_0[] = { 3, 4, 4, 5, 6, 6, 5, 6, 6, 5, 6, 6, 6, 8, 8, 6, 7, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 5, 6, 6, 6, 8, 7, 6, 8, 8, 6, 8, 8, 8, 9, 9, 8, 9, 9, 6, 8, 7, @@ -5580,7 +5580,7 @@ static const long _vq_lengthlist__44u7__p2_0[] = { static const static_codebook _44u7__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44u7__p2_0, + (char *)_vq_lengthlist__44u7__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u7__p2_0, 0 @@ -5594,7 +5594,7 @@ static const long _vq_quantlist__44u7__p3_0[] = { 4, }; -static const long _vq_lengthlist__44u7__p3_0[] = { +static const char _vq_lengthlist__44u7__p3_0[] = { 2, 5, 4, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 9, 9,13,12, 8, 9,10,12,13, 5, 7, 7,10, 9, 7, 9, 9,11,11, 6, 8, 9,11,11,10,11,11,14,14, 9,10,11, @@ -5639,7 +5639,7 @@ static const long _vq_lengthlist__44u7__p3_0[] = { static const static_codebook _44u7__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44u7__p3_0, + (char *)_vq_lengthlist__44u7__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u7__p3_0, 0 @@ -5653,7 +5653,7 @@ static const long _vq_quantlist__44u7__p4_0[] = { 4, }; -static const long _vq_lengthlist__44u7__p4_0[] = { +static const char _vq_lengthlist__44u7__p4_0[] = { 4, 5, 5, 8, 8, 6, 7, 6, 9, 9, 6, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,10,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 6, 7, 8, 9,10, 9,10,10,12,12, 9, 9,10, @@ -5698,7 +5698,7 @@ static const long _vq_lengthlist__44u7__p4_0[] = { static const static_codebook _44u7__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44u7__p4_0, + (char *)_vq_lengthlist__44u7__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u7__p4_0, 0 @@ -5716,7 +5716,7 @@ static const long _vq_quantlist__44u7__p5_0[] = { 8, }; -static const long _vq_lengthlist__44u7__p5_0[] = { +static const char _vq_lengthlist__44u7__p5_0[] = { 2, 3, 3, 6, 6, 7, 8,10,10, 4, 5, 5, 8, 7, 8, 8, 11,11, 3, 5, 5, 7, 7, 8, 9,11,11, 6, 8, 7, 9, 9, 10,10,12,12, 6, 7, 8, 9,10,10,10,12,12, 8, 8, 8, @@ -5727,7 +5727,7 @@ static const long _vq_lengthlist__44u7__p5_0[] = { static const static_codebook _44u7__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44u7__p5_0, + (char *)_vq_lengthlist__44u7__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p5_0, 0 @@ -5745,7 +5745,7 @@ static const long _vq_quantlist__44u7__p6_0[] = { 8, }; -static const long _vq_lengthlist__44u7__p6_0[] = { +static const char _vq_lengthlist__44u7__p6_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 8, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 5, 6, 6, 7, 7, 8, 8,10,10, 7, 8, 7, @@ -5756,7 +5756,7 @@ static const long _vq_lengthlist__44u7__p6_0[] = { static const static_codebook _44u7__p6_0 = { 2, 81, - (long *)_vq_lengthlist__44u7__p6_0, + (char *)_vq_lengthlist__44u7__p6_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p6_0, 0 @@ -5768,7 +5768,7 @@ static const long _vq_quantlist__44u7__p7_0[] = { 2, }; -static const long _vq_lengthlist__44u7__p7_0[] = { +static const char _vq_lengthlist__44u7__p7_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 9, 8, 8, 9, 9, 7, 10,10, 5, 8, 9, 7, 9,10, 8, 9, 9, 4, 9, 9, 9,11, 10, 8,10,10, 7,11,10,10,10,12,10,12,12, 7,10,10, @@ -5779,7 +5779,7 @@ static const long _vq_lengthlist__44u7__p7_0[] = { static const static_codebook _44u7__p7_0 = { 4, 81, - (long *)_vq_lengthlist__44u7__p7_0, + (char *)_vq_lengthlist__44u7__p7_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u7__p7_0, 0 @@ -5799,7 +5799,7 @@ static const long _vq_quantlist__44u7__p7_1[] = { 10, }; -static const long _vq_lengthlist__44u7__p7_1[] = { +static const char _vq_lengthlist__44u7__p7_1[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6, 8, 7, 8, 8, 8, 8, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8, 8, 6, 7, 6, 7, 7, 8, 8, 9, 9, 9, 9, 6, 6, 7, 7, @@ -5812,7 +5812,7 @@ static const long _vq_lengthlist__44u7__p7_1[] = { static const static_codebook _44u7__p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u7__p7_1, + (char *)_vq_lengthlist__44u7__p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p7_1, 0 @@ -5832,7 +5832,7 @@ static const long _vq_quantlist__44u7__p8_0[] = { 10, }; -static const long _vq_lengthlist__44u7__p8_0[] = { +static const char _vq_lengthlist__44u7__p8_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11, 4, 6, 6, 7, 7, 9, 9,11,10,12,12, 5, 6, 5, 7, 7, 9, 9,10,11,12, 12, 6, 7, 7, 8, 8,10,10,11,11,13,13, 6, 7, 7, 8, @@ -5845,7 +5845,7 @@ static const long _vq_lengthlist__44u7__p8_0[] = { static const static_codebook _44u7__p8_0 = { 2, 121, - (long *)_vq_lengthlist__44u7__p8_0, + (char *)_vq_lengthlist__44u7__p8_0, 1, -524582912, 1618345984, 4, 0, (long *)_vq_quantlist__44u7__p8_0, 0 @@ -5865,7 +5865,7 @@ static const long _vq_quantlist__44u7__p8_1[] = { 10, }; -static const long _vq_lengthlist__44u7__p8_1[] = { +static const char _vq_lengthlist__44u7__p8_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, @@ -5878,7 +5878,7 @@ static const long _vq_lengthlist__44u7__p8_1[] = { static const static_codebook _44u7__p8_1 = { 2, 121, - (long *)_vq_lengthlist__44u7__p8_1, + (char *)_vq_lengthlist__44u7__p8_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u7__p8_1, 0 @@ -5898,7 +5898,7 @@ static const long _vq_quantlist__44u7__p9_0[] = { 10, }; -static const long _vq_lengthlist__44u7__p9_0[] = { +static const char _vq_lengthlist__44u7__p9_0[] = { 1, 3, 3,10,10,10,10,10,10,10,10, 4,10,10,10,10, 10,10,10,10,10,10, 4,10,10,10,10,10,10,10,10,10, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10, @@ -5911,7 +5911,7 @@ static const long _vq_lengthlist__44u7__p9_0[] = { static const static_codebook _44u7__p9_0 = { 2, 121, - (long *)_vq_lengthlist__44u7__p9_0, + (char *)_vq_lengthlist__44u7__p9_0, 1, -512171520, 1630791680, 4, 0, (long *)_vq_quantlist__44u7__p9_0, 0 @@ -5933,7 +5933,7 @@ static const long _vq_quantlist__44u7__p9_1[] = { 12, }; -static const long _vq_lengthlist__44u7__p9_1[] = { +static const char _vq_lengthlist__44u7__p9_1[] = { 1, 4, 4, 6, 5, 8, 6, 9, 8,10, 9,11,10, 4, 6, 6, 8, 8, 9, 9,11,10,11,11,11,11, 4, 6, 6, 8, 8,10, 9,11,11,11,11,11,12, 6, 8, 8,10,10,11,11,12,12, @@ -5949,7 +5949,7 @@ static const long _vq_lengthlist__44u7__p9_1[] = { static const static_codebook _44u7__p9_1 = { 2, 169, - (long *)_vq_lengthlist__44u7__p9_1, + (char *)_vq_lengthlist__44u7__p9_1, 1, -518889472, 1622704128, 4, 0, (long *)_vq_quantlist__44u7__p9_1, 0 @@ -6007,7 +6007,7 @@ static const long _vq_quantlist__44u7__p9_2[] = { 48, }; -static const long _vq_lengthlist__44u7__p9_2[] = { +static const char _vq_lengthlist__44u7__p9_2[] = { 2, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, @@ -6016,13 +6016,13 @@ static const long _vq_lengthlist__44u7__p9_2[] = { static const static_codebook _44u7__p9_2 = { 1, 49, - (long *)_vq_lengthlist__44u7__p9_2, + (char *)_vq_lengthlist__44u7__p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44u7__p9_2, 0 }; -static const long _huff_lengthlist__44u7__short[] = { +static const char _huff_lengthlist__44u7__short[] = { 5,12,17,16,16,17,17,17,17,17, 4, 7,11,11,12, 9, 17,10,17,17, 7, 7, 8, 9, 7, 9,11,10,15,17, 7, 9, 10,11,10,12,14,12,16,17, 7, 8, 5, 7, 4, 7, 7, 8, @@ -6034,13 +6034,13 @@ static const long _huff_lengthlist__44u7__short[] = { static const static_codebook _huff_book__44u7__short = { 2, 100, - (long *)_huff_lengthlist__44u7__short, + (char *)_huff_lengthlist__44u7__short, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u8__long[] = { +static const char _huff_lengthlist__44u8__long[] = { 3, 9,13,14,14,15,14,14,15,15, 5, 4, 6, 8,10,12, 12,14,15,15, 9, 5, 4, 5, 8,10,11,13,16,16,10, 7, 4, 3, 5, 7, 9,11,13,13,10, 9, 7, 4, 4, 6, 8,10, @@ -6052,13 +6052,13 @@ static const long _huff_lengthlist__44u8__long[] = { static const static_codebook _huff_book__44u8__long = { 2, 100, - (long *)_huff_lengthlist__44u8__long, + (char *)_huff_lengthlist__44u8__long, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u8__short[] = { +static const char _huff_lengthlist__44u8__short[] = { 6,14,18,18,17,17,17,17,17,17, 4, 7, 9, 9,10,13, 15,17,17,17, 6, 7, 5, 6, 8,11,16,17,16,17, 5, 7, 5, 4, 6,10,14,17,17,17, 6, 6, 6, 5, 7,10,13,16, @@ -6070,7 +6070,7 @@ static const long _huff_lengthlist__44u8__short[] = { static const static_codebook _huff_book__44u8__short = { 2, 100, - (long *)_huff_lengthlist__44u8__short, + (char *)_huff_lengthlist__44u8__short, 0, 0, 0, 0, 0, NULL, 0 @@ -6082,7 +6082,7 @@ static const long _vq_quantlist__44u8_p1_0[] = { 2, }; -static const long _vq_lengthlist__44u8_p1_0[] = { +static const char _vq_lengthlist__44u8_p1_0[] = { 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 8, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 8, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 7, 9, 9, 9,10,11, 9,11,10, 7, 9, 9, @@ -6093,7 +6093,7 @@ static const long _vq_lengthlist__44u8_p1_0[] = { static const static_codebook _44u8_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u8_p1_0, + (char *)_vq_lengthlist__44u8_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u8_p1_0, 0 @@ -6107,7 +6107,7 @@ static const long _vq_quantlist__44u8_p2_0[] = { 4, }; -static const long _vq_lengthlist__44u8_p2_0[] = { +static const char _vq_lengthlist__44u8_p2_0[] = { 4, 5, 5, 8, 8, 5, 7, 6, 9, 9, 5, 6, 7, 9, 9, 8, 9, 9,11,11, 8, 9, 9,11,11, 5, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8,10,10, 9,10,10,12,12, 9,10,10, @@ -6152,7 +6152,7 @@ static const long _vq_lengthlist__44u8_p2_0[] = { static const static_codebook _44u8_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44u8_p2_0, + (char *)_vq_lengthlist__44u8_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u8_p2_0, 0 @@ -6170,7 +6170,7 @@ static const long _vq_quantlist__44u8_p3_0[] = { 8, }; -static const long _vq_lengthlist__44u8_p3_0[] = { +static const char _vq_lengthlist__44u8_p3_0[] = { 3, 4, 4, 5, 5, 7, 7, 9, 9, 4, 5, 4, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8,10,10, 6, 6, 6, 7, 7, 8, 8,10,10, 7, 7, 7, @@ -6181,7 +6181,7 @@ static const long _vq_lengthlist__44u8_p3_0[] = { static const static_codebook _44u8_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44u8_p3_0, + (char *)_vq_lengthlist__44u8_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u8_p3_0, 0 @@ -6207,7 +6207,7 @@ static const long _vq_quantlist__44u8_p4_0[] = { 16, }; -static const long _vq_lengthlist__44u8_p4_0[] = { +static const char _vq_lengthlist__44u8_p4_0[] = { 4, 4, 4, 6, 6, 7, 7, 8, 8, 8, 8,10,10,11,11,11, 11, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 12,12, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11, @@ -6231,7 +6231,7 @@ static const long _vq_lengthlist__44u8_p4_0[] = { static const static_codebook _44u8_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44u8_p4_0, + (char *)_vq_lengthlist__44u8_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u8_p4_0, 0 @@ -6243,7 +6243,7 @@ static const long _vq_quantlist__44u8_p5_0[] = { 2, }; -static const long _vq_lengthlist__44u8_p5_0[] = { +static const char _vq_lengthlist__44u8_p5_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7, 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10, 9,10,12, 9,12,11, 7,10,10, @@ -6254,7 +6254,7 @@ static const long _vq_lengthlist__44u8_p5_0[] = { static const static_codebook _44u8_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44u8_p5_0, + (char *)_vq_lengthlist__44u8_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u8_p5_0, 0 @@ -6274,7 +6274,7 @@ static const long _vq_quantlist__44u8_p5_1[] = { 10, }; -static const long _vq_lengthlist__44u8_p5_1[] = { +static const char _vq_lengthlist__44u8_p5_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 6, 6, 6, 7, @@ -6287,7 +6287,7 @@ static const long _vq_lengthlist__44u8_p5_1[] = { static const static_codebook _44u8_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44u8_p5_1, + (char *)_vq_lengthlist__44u8_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u8_p5_1, 0 @@ -6309,7 +6309,7 @@ static const long _vq_quantlist__44u8_p6_0[] = { 12, }; -static const long _vq_lengthlist__44u8_p6_0[] = { +static const char _vq_lengthlist__44u8_p6_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 6, 7, 7, 7, 8, 8, 8, 8, 9, @@ -6325,7 +6325,7 @@ static const long _vq_lengthlist__44u8_p6_0[] = { static const static_codebook _44u8_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u8_p6_0, + (char *)_vq_lengthlist__44u8_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u8_p6_0, 0 @@ -6339,14 +6339,14 @@ static const long _vq_quantlist__44u8_p6_1[] = { 4, }; -static const long _vq_lengthlist__44u8_p6_1[] = { +static const char _vq_lengthlist__44u8_p6_1[] = { 3, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44u8_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u8_p6_1, + (char *)_vq_lengthlist__44u8_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u8_p6_1, 0 @@ -6368,7 +6368,7 @@ static const long _vq_quantlist__44u8_p7_0[] = { 12, }; -static const long _vq_lengthlist__44u8_p7_0[] = { +static const char _vq_lengthlist__44u8_p7_0[] = { 1, 4, 5, 6, 6, 7, 7, 8, 8,10,10,11,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,11,10,12,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,11,11,12, 6, 7, 7, 8, 8, 9, 9,10,10, @@ -6384,7 +6384,7 @@ static const long _vq_lengthlist__44u8_p7_0[] = { static const static_codebook _44u8_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44u8_p7_0, + (char *)_vq_lengthlist__44u8_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44u8_p7_0, 0 @@ -6404,7 +6404,7 @@ static const long _vq_quantlist__44u8_p7_1[] = { 10, }; -static const long _vq_lengthlist__44u8_p7_1[] = { +static const char _vq_lengthlist__44u8_p7_1[] = { 4, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 6, 7, 7, 7, @@ -6417,7 +6417,7 @@ static const long _vq_lengthlist__44u8_p7_1[] = { static const static_codebook _44u8_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u8_p7_1, + (char *)_vq_lengthlist__44u8_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u8_p7_1, 0 @@ -6441,7 +6441,7 @@ static const long _vq_quantlist__44u8_p8_0[] = { 14, }; -static const long _vq_lengthlist__44u8_p8_0[] = { +static const char _vq_lengthlist__44u8_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 7, 9, 8,10, 9,11,10, 4, 6, 6, 8, 8,10, 9, 9, 9,10,10,11,10,12,10, 4, 6, 6, 8, 8,10,10, 9, 9,10,10,11,11,11,12, 7, 8, 8, @@ -6461,7 +6461,7 @@ static const long _vq_lengthlist__44u8_p8_0[] = { static const static_codebook _44u8_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44u8_p8_0, + (char *)_vq_lengthlist__44u8_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44u8_p8_0, 0 @@ -6491,7 +6491,7 @@ static const long _vq_quantlist__44u8_p8_1[] = { 20, }; -static const long _vq_lengthlist__44u8_p8_1[] = { +static const char _vq_lengthlist__44u8_p8_1[] = { 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 5, 6, 6, 7, 7, 8, @@ -6524,7 +6524,7 @@ static const long _vq_lengthlist__44u8_p8_1[] = { static const static_codebook _44u8_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44u8_p8_1, + (char *)_vq_lengthlist__44u8_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44u8_p8_1, 0 @@ -6542,7 +6542,7 @@ static const long _vq_quantlist__44u8_p9_0[] = { 8, }; -static const long _vq_lengthlist__44u8_p9_0[] = { +static const char _vq_lengthlist__44u8_p9_0[] = { 1, 3, 3, 9, 9, 9, 9, 9, 9, 4, 9, 9, 9, 9, 9, 9, 9, 9, 5, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -6553,7 +6553,7 @@ static const long _vq_lengthlist__44u8_p9_0[] = { static const static_codebook _44u8_p9_0 = { 2, 81, - (long *)_vq_lengthlist__44u8_p9_0, + (char *)_vq_lengthlist__44u8_p9_0, 1, -511895552, 1631393792, 4, 0, (long *)_vq_quantlist__44u8_p9_0, 0 @@ -6581,7 +6581,7 @@ static const long _vq_quantlist__44u8_p9_1[] = { 18, }; -static const long _vq_lengthlist__44u8_p9_1[] = { +static const char _vq_lengthlist__44u8_p9_1[] = { 1, 4, 4, 7, 7, 8, 7, 8, 6, 9, 7,10, 8,11,10,11, 11,11,11, 4, 7, 6, 9, 9,10, 9, 9, 9,10,10,11,10, 11,10,11,11,13,11, 4, 7, 7, 9, 9, 9, 9, 9, 9,10, @@ -6609,7 +6609,7 @@ static const long _vq_lengthlist__44u8_p9_1[] = { static const static_codebook _44u8_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44u8_p9_1, + (char *)_vq_lengthlist__44u8_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44u8_p9_1, 0 @@ -6667,7 +6667,7 @@ static const long _vq_quantlist__44u8_p9_2[] = { 48, }; -static const long _vq_lengthlist__44u8_p9_2[] = { +static const char _vq_lengthlist__44u8_p9_2[] = { 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -6676,13 +6676,13 @@ static const long _vq_lengthlist__44u8_p9_2[] = { static const static_codebook _44u8_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44u8_p9_2, + (char *)_vq_lengthlist__44u8_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44u8_p9_2, 0 }; -static const long _huff_lengthlist__44u9__long[] = { +static const char _huff_lengthlist__44u9__long[] = { 3, 9,13,13,14,15,14,14,15,15, 5, 5, 9,10,12,12, 13,14,16,15,10, 6, 6, 6, 8,11,12,13,16,15,11, 7, 5, 3, 5, 8,10,12,15,15,10,10, 7, 4, 3, 5, 8,10, @@ -6694,13 +6694,13 @@ static const long _huff_lengthlist__44u9__long[] = { static const static_codebook _huff_book__44u9__long = { 2, 100, - (long *)_huff_lengthlist__44u9__long, + (char *)_huff_lengthlist__44u9__long, 0, 0, 0, 0, 0, NULL, 0 }; -static const long _huff_lengthlist__44u9__short[] = { +static const char _huff_lengthlist__44u9__short[] = { 9,16,18,18,17,17,17,17,17,17, 5, 8,11,12,11,12, 17,17,16,16, 6, 6, 8, 8, 9,10,14,15,16,16, 6, 7, 7, 4, 6, 9,13,16,16,16, 6, 6, 7, 4, 5, 8,11,15, @@ -6712,7 +6712,7 @@ static const long _huff_lengthlist__44u9__short[] = { static const static_codebook _huff_book__44u9__short = { 2, 100, - (long *)_huff_lengthlist__44u9__short, + (char *)_huff_lengthlist__44u9__short, 0, 0, 0, 0, 0, NULL, 0 @@ -6724,7 +6724,7 @@ static const long _vq_quantlist__44u9_p1_0[] = { 2, }; -static const long _vq_lengthlist__44u9_p1_0[] = { +static const char _vq_lengthlist__44u9_p1_0[] = { 1, 5, 5, 5, 7, 7, 5, 7, 7, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 5, 7, 7, 7, 9, 9, 7, 9, 9, 8, 9, 9, 9,10,11, 9,11,11, 7, 9, 9, @@ -6735,7 +6735,7 @@ static const long _vq_lengthlist__44u9_p1_0[] = { static const static_codebook _44u9_p1_0 = { 4, 81, - (long *)_vq_lengthlist__44u9_p1_0, + (char *)_vq_lengthlist__44u9_p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44u9_p1_0, 0 @@ -6749,7 +6749,7 @@ static const long _vq_quantlist__44u9_p2_0[] = { 4, }; -static const long _vq_lengthlist__44u9_p2_0[] = { +static const char _vq_lengthlist__44u9_p2_0[] = { 3, 5, 5, 8, 8, 5, 7, 7, 9, 9, 6, 7, 7, 9, 9, 8, 9, 9,11,10, 8, 9, 9,11,11, 6, 7, 7, 9, 9, 7, 8, 8,10,10, 7, 8, 8, 9,10, 9,10,10,11,11, 9, 9,10, @@ -6794,7 +6794,7 @@ static const long _vq_lengthlist__44u9_p2_0[] = { static const static_codebook _44u9_p2_0 = { 4, 625, - (long *)_vq_lengthlist__44u9_p2_0, + (char *)_vq_lengthlist__44u9_p2_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u9_p2_0, 0 @@ -6812,7 +6812,7 @@ static const long _vq_quantlist__44u9_p3_0[] = { 8, }; -static const long _vq_lengthlist__44u9_p3_0[] = { +static const char _vq_lengthlist__44u9_p3_0[] = { 3, 4, 4, 5, 5, 7, 7, 8, 8, 4, 5, 5, 6, 6, 7, 7, 9, 9, 4, 4, 5, 6, 6, 7, 7, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 5, 6, 6, 7, 7, 8, 8, 9, 9, 7, 7, 7, @@ -6823,7 +6823,7 @@ static const long _vq_lengthlist__44u9_p3_0[] = { static const static_codebook _44u9_p3_0 = { 2, 81, - (long *)_vq_lengthlist__44u9_p3_0, + (char *)_vq_lengthlist__44u9_p3_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44u9_p3_0, 0 @@ -6849,7 +6849,7 @@ static const long _vq_quantlist__44u9_p4_0[] = { 16, }; -static const long _vq_lengthlist__44u9_p4_0[] = { +static const char _vq_lengthlist__44u9_p4_0[] = { 4, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10,11, 11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 11,11, 5, 5, 5, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9,10, @@ -6873,7 +6873,7 @@ static const long _vq_lengthlist__44u9_p4_0[] = { static const static_codebook _44u9_p4_0 = { 2, 289, - (long *)_vq_lengthlist__44u9_p4_0, + (char *)_vq_lengthlist__44u9_p4_0, 1, -529530880, 1611661312, 5, 0, (long *)_vq_quantlist__44u9_p4_0, 0 @@ -6885,7 +6885,7 @@ static const long _vq_quantlist__44u9_p5_0[] = { 2, }; -static const long _vq_lengthlist__44u9_p5_0[] = { +static const char _vq_lengthlist__44u9_p5_0[] = { 1, 4, 4, 5, 7, 7, 5, 7, 7, 5, 8, 8, 8, 9, 9, 7, 9, 9, 5, 8, 8, 7, 9, 9, 8, 9, 9, 5, 8, 8, 8,10, 10, 8,10,10, 7,10,10, 9,10,12, 9,11,11, 7,10,10, @@ -6896,7 +6896,7 @@ static const long _vq_lengthlist__44u9_p5_0[] = { static const static_codebook _44u9_p5_0 = { 4, 81, - (long *)_vq_lengthlist__44u9_p5_0, + (char *)_vq_lengthlist__44u9_p5_0, 1, -529137664, 1618345984, 2, 0, (long *)_vq_quantlist__44u9_p5_0, 0 @@ -6916,7 +6916,7 @@ static const long _vq_quantlist__44u9_p5_1[] = { 10, }; -static const long _vq_lengthlist__44u9_p5_1[] = { +static const char _vq_lengthlist__44u9_p5_1[] = { 5, 5, 5, 6, 6, 7, 7, 7, 7, 7, 7, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 7, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 6, 6, 6, 7, @@ -6929,7 +6929,7 @@ static const long _vq_lengthlist__44u9_p5_1[] = { static const static_codebook _44u9_p5_1 = { 2, 121, - (long *)_vq_lengthlist__44u9_p5_1, + (char *)_vq_lengthlist__44u9_p5_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u9_p5_1, 0 @@ -6951,7 +6951,7 @@ static const long _vq_quantlist__44u9_p6_0[] = { 12, }; -static const long _vq_lengthlist__44u9_p6_0[] = { +static const char _vq_lengthlist__44u9_p6_0[] = { 2, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9,10,10, 4, 6, 5, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 4, 5, 6, 7, 7, 8, 8, 8, 8, 9, 9,10,10, 6, 7, 7, 8, 8, 8, 8, 9, 9, @@ -6967,7 +6967,7 @@ static const long _vq_lengthlist__44u9_p6_0[] = { static const static_codebook _44u9_p6_0 = { 2, 169, - (long *)_vq_lengthlist__44u9_p6_0, + (char *)_vq_lengthlist__44u9_p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44u9_p6_0, 0 @@ -6981,14 +6981,14 @@ static const long _vq_quantlist__44u9_p6_1[] = { 4, }; -static const long _vq_lengthlist__44u9_p6_1[] = { +static const char _vq_lengthlist__44u9_p6_1[] = { 4, 4, 4, 5, 5, 4, 5, 4, 5, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, }; static const static_codebook _44u9_p6_1 = { 2, 25, - (long *)_vq_lengthlist__44u9_p6_1, + (char *)_vq_lengthlist__44u9_p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44u9_p6_1, 0 @@ -7010,7 +7010,7 @@ static const long _vq_quantlist__44u9_p7_0[] = { 12, }; -static const long _vq_lengthlist__44u9_p7_0[] = { +static const char _vq_lengthlist__44u9_p7_0[] = { 1, 4, 5, 6, 6, 7, 7, 8, 9,10,10,11,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 5, 6, 6, 7, 7, 8, 8, 9, 9,10,10,11,11, 6, 7, 7, 8, 8, 9, 9,10,10, @@ -7026,7 +7026,7 @@ static const long _vq_lengthlist__44u9_p7_0[] = { static const static_codebook _44u9_p7_0 = { 2, 169, - (long *)_vq_lengthlist__44u9_p7_0, + (char *)_vq_lengthlist__44u9_p7_0, 1, -523206656, 1618345984, 4, 0, (long *)_vq_quantlist__44u9_p7_0, 0 @@ -7046,7 +7046,7 @@ static const long _vq_quantlist__44u9_p7_1[] = { 10, }; -static const long _vq_lengthlist__44u9_p7_1[] = { +static const char _vq_lengthlist__44u9_p7_1[] = { 5, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 7, 7, 7, @@ -7059,7 +7059,7 @@ static const long _vq_lengthlist__44u9_p7_1[] = { static const static_codebook _44u9_p7_1 = { 2, 121, - (long *)_vq_lengthlist__44u9_p7_1, + (char *)_vq_lengthlist__44u9_p7_1, 1, -531365888, 1611661312, 4, 0, (long *)_vq_quantlist__44u9_p7_1, 0 @@ -7083,7 +7083,7 @@ static const long _vq_quantlist__44u9_p8_0[] = { 14, }; -static const long _vq_lengthlist__44u9_p8_0[] = { +static const char _vq_lengthlist__44u9_p8_0[] = { 1, 4, 4, 7, 7, 8, 8, 8, 8, 9, 9,10, 9,11,10, 4, 6, 6, 8, 8, 9, 9, 9, 9,10,10,11,10,12,10, 4, 6, 6, 8, 8, 9,10, 9, 9,10,10,11,11,12,12, 7, 8, 8, @@ -7103,7 +7103,7 @@ static const long _vq_lengthlist__44u9_p8_0[] = { static const static_codebook _44u9_p8_0 = { 2, 225, - (long *)_vq_lengthlist__44u9_p8_0, + (char *)_vq_lengthlist__44u9_p8_0, 1, -520986624, 1620377600, 4, 0, (long *)_vq_quantlist__44u9_p8_0, 0 @@ -7133,7 +7133,7 @@ static const long _vq_quantlist__44u9_p8_1[] = { 20, }; -static const long _vq_lengthlist__44u9_p8_1[] = { +static const char _vq_lengthlist__44u9_p8_1[] = { 4, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 6, 6, 6, 7, 7, 8, @@ -7166,7 +7166,7 @@ static const long _vq_lengthlist__44u9_p8_1[] = { static const static_codebook _44u9_p8_1 = { 2, 441, - (long *)_vq_lengthlist__44u9_p8_1, + (char *)_vq_lengthlist__44u9_p8_1, 1, -529268736, 1611661312, 5, 0, (long *)_vq_quantlist__44u9_p8_1, 0 @@ -7190,7 +7190,7 @@ static const long _vq_quantlist__44u9_p9_0[] = { 14, }; -static const long _vq_lengthlist__44u9_p9_0[] = { +static const char _vq_lengthlist__44u9_p9_0[] = { 1, 3, 3,11,11,11,11,11,11,11,11,11,11,11,11, 4, 10,11,11,11,11,11,11,11,11,11,11,11,11,11, 4,10, 10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -7210,7 +7210,7 @@ static const long _vq_lengthlist__44u9_p9_0[] = { static const static_codebook _44u9_p9_0 = { 2, 225, - (long *)_vq_lengthlist__44u9_p9_0, + (char *)_vq_lengthlist__44u9_p9_0, 1, -510036736, 1631393792, 4, 0, (long *)_vq_quantlist__44u9_p9_0, 0 @@ -7238,7 +7238,7 @@ static const long _vq_quantlist__44u9_p9_1[] = { 18, }; -static const long _vq_lengthlist__44u9_p9_1[] = { +static const char _vq_lengthlist__44u9_p9_1[] = { 1, 4, 4, 7, 7, 8, 7, 8, 7, 9, 8,10, 9,10,10,11, 11,12,12, 4, 7, 6, 9, 9,10, 9, 9, 8,10,10,11,10, 12,10,13,12,13,12, 4, 6, 6, 9, 9, 9, 9, 9, 9,10, @@ -7266,7 +7266,7 @@ static const long _vq_lengthlist__44u9_p9_1[] = { static const static_codebook _44u9_p9_1 = { 2, 361, - (long *)_vq_lengthlist__44u9_p9_1, + (char *)_vq_lengthlist__44u9_p9_1, 1, -518287360, 1622704128, 5, 0, (long *)_vq_quantlist__44u9_p9_1, 0 @@ -7324,7 +7324,7 @@ static const long _vq_quantlist__44u9_p9_2[] = { 48, }; -static const long _vq_lengthlist__44u9_p9_2[] = { +static const char _vq_lengthlist__44u9_p9_2[] = { 2, 4, 4, 5, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 7, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -7333,13 +7333,13 @@ static const long _vq_lengthlist__44u9_p9_2[] = { static const static_codebook _44u9_p9_2 = { 1, 49, - (long *)_vq_lengthlist__44u9_p9_2, + (char *)_vq_lengthlist__44u9_p9_2, 1, -526909440, 1611661312, 6, 0, (long *)_vq_quantlist__44u9_p9_2, 0 }; -static const long _huff_lengthlist__44un1__long[] = { +static const char _huff_lengthlist__44un1__long[] = { 5, 6,12, 9,14, 9, 9,19, 6, 1, 5, 5, 8, 7, 9,19, 12, 4, 4, 7, 7, 9,11,18, 9, 5, 6, 6, 8, 7, 8,17, 14, 8, 7, 8, 8,10,12,18, 9, 6, 8, 6, 8, 6, 8,18, @@ -7348,7 +7348,7 @@ static const long _huff_lengthlist__44un1__long[] = { static const static_codebook _huff_book__44un1__long = { 2, 64, - (long *)_huff_lengthlist__44un1__long, + (char *)_huff_lengthlist__44un1__long, 0, 0, 0, 0, 0, NULL, 0 @@ -7360,7 +7360,7 @@ static const long _vq_quantlist__44un1__p1_0[] = { 2, }; -static const long _vq_lengthlist__44un1__p1_0[] = { +static const char _vq_lengthlist__44un1__p1_0[] = { 1, 4, 4, 5, 8, 7, 5, 7, 8, 5, 8, 8, 8,10,11, 8, 10,11, 5, 8, 8, 8,11,10, 8,11,10, 4, 9, 9, 8,11, 11, 8,11,11, 8,12,11,10,12,14,11,13,13, 7,11,11, @@ -7371,7 +7371,7 @@ static const long _vq_lengthlist__44un1__p1_0[] = { static const static_codebook _44un1__p1_0 = { 4, 81, - (long *)_vq_lengthlist__44un1__p1_0, + (char *)_vq_lengthlist__44un1__p1_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44un1__p1_0, 0 @@ -7383,7 +7383,7 @@ static const long _vq_quantlist__44un1__p2_0[] = { 2, }; -static const long _vq_lengthlist__44un1__p2_0[] = { +static const char _vq_lengthlist__44un1__p2_0[] = { 2, 4, 4, 5, 6, 6, 5, 6, 6, 5, 7, 7, 7, 8, 8, 6, 7, 9, 5, 7, 7, 6, 8, 7, 7, 9, 8, 4, 7, 7, 7, 9, 8, 7, 8, 8, 7, 9, 8, 8, 8,10, 9,10,10, 6, 8, 8, @@ -7394,7 +7394,7 @@ static const long _vq_lengthlist__44un1__p2_0[] = { static const static_codebook _44un1__p2_0 = { 4, 81, - (long *)_vq_lengthlist__44un1__p2_0, + (char *)_vq_lengthlist__44un1__p2_0, 1, -535822336, 1611661312, 2, 0, (long *)_vq_quantlist__44un1__p2_0, 0 @@ -7408,7 +7408,7 @@ static const long _vq_quantlist__44un1__p3_0[] = { 4, }; -static const long _vq_lengthlist__44un1__p3_0[] = { +static const char _vq_lengthlist__44un1__p3_0[] = { 1, 5, 5, 8, 8, 5, 8, 7, 9, 9, 5, 7, 8, 9, 9, 9, 10, 9,12,12, 9, 9,10,11,12, 6, 8, 8,10,10, 8,10, 10,11,11, 8, 9,10,11,11,10,11,11,13,13,10,11,11, @@ -7453,7 +7453,7 @@ static const long _vq_lengthlist__44un1__p3_0[] = { static const static_codebook _44un1__p3_0 = { 4, 625, - (long *)_vq_lengthlist__44un1__p3_0, + (char *)_vq_lengthlist__44un1__p3_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44un1__p3_0, 0 @@ -7467,7 +7467,7 @@ static const long _vq_quantlist__44un1__p4_0[] = { 4, }; -static const long _vq_lengthlist__44un1__p4_0[] = { +static const char _vq_lengthlist__44un1__p4_0[] = { 3, 5, 5, 9, 9, 5, 6, 6,10, 9, 5, 6, 6, 9,10,10, 10,10,12,11, 9,10,10,12,12, 5, 7, 7,10,10, 7, 7, 8,10,11, 7, 7, 8,10,11,10,10,11,11,13,10,10,11, @@ -7512,7 +7512,7 @@ static const long _vq_lengthlist__44un1__p4_0[] = { static const static_codebook _44un1__p4_0 = { 4, 625, - (long *)_vq_lengthlist__44un1__p4_0, + (char *)_vq_lengthlist__44un1__p4_0, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44un1__p4_0, 0 @@ -7530,7 +7530,7 @@ static const long _vq_quantlist__44un1__p5_0[] = { 8, }; -static const long _vq_lengthlist__44un1__p5_0[] = { +static const char _vq_lengthlist__44un1__p5_0[] = { 1, 4, 4, 7, 7, 8, 8, 9, 9, 4, 6, 5, 8, 7, 8, 8, 10, 9, 4, 6, 6, 8, 8, 8, 8,10,10, 7, 8, 7, 9, 9, 9, 9,11,10, 7, 8, 8, 9, 9, 9, 9,10,11, 8, 8, 8, @@ -7541,7 +7541,7 @@ static const long _vq_lengthlist__44un1__p5_0[] = { static const static_codebook _44un1__p5_0 = { 2, 81, - (long *)_vq_lengthlist__44un1__p5_0, + (char *)_vq_lengthlist__44un1__p5_0, 1, -531628032, 1611661312, 4, 0, (long *)_vq_quantlist__44un1__p5_0, 0 @@ -7563,7 +7563,7 @@ static const long _vq_quantlist__44un1__p6_0[] = { 12, }; -static const long _vq_lengthlist__44un1__p6_0[] = { +static const char _vq_lengthlist__44un1__p6_0[] = { 1, 4, 4, 6, 6, 8, 8,10,10,11,11,15,15, 4, 5, 5, 8, 8, 9, 9,11,11,12,12,16,16, 4, 5, 6, 8, 8, 9, 9,11,11,12,12,14,14, 7, 8, 8, 9, 9,10,10,11,12, @@ -7579,7 +7579,7 @@ static const long _vq_lengthlist__44un1__p6_0[] = { static const static_codebook _44un1__p6_0 = { 2, 169, - (long *)_vq_lengthlist__44un1__p6_0, + (char *)_vq_lengthlist__44un1__p6_0, 1, -526516224, 1616117760, 4, 0, (long *)_vq_quantlist__44un1__p6_0, 0 @@ -7593,14 +7593,14 @@ static const long _vq_quantlist__44un1__p6_1[] = { 4, }; -static const long _vq_lengthlist__44un1__p6_1[] = { +static const char _vq_lengthlist__44un1__p6_1[] = { 2, 4, 4, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 6, 5, 5, 6, 5, 6, 6, 5, 6, 6, 6, 6, }; static const static_codebook _44un1__p6_1 = { 2, 25, - (long *)_vq_lengthlist__44un1__p6_1, + (char *)_vq_lengthlist__44un1__p6_1, 1, -533725184, 1611661312, 3, 0, (long *)_vq_quantlist__44un1__p6_1, 0 @@ -7614,7 +7614,7 @@ static const long _vq_quantlist__44un1__p7_0[] = { 4, }; -static const long _vq_lengthlist__44un1__p7_0[] = { +static const char _vq_lengthlist__44un1__p7_0[] = { 1, 5, 3,11,11,11,11,11,11,11, 8,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,10,11,11,11,11,11,11, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11, @@ -7659,7 +7659,7 @@ static const long _vq_lengthlist__44un1__p7_0[] = { static const static_codebook _44un1__p7_0 = { 4, 625, - (long *)_vq_lengthlist__44un1__p7_0, + (char *)_vq_lengthlist__44un1__p7_0, 1, -518709248, 1626677248, 3, 0, (long *)_vq_quantlist__44un1__p7_0, 0 @@ -7681,7 +7681,7 @@ static const long _vq_quantlist__44un1__p7_1[] = { 12, }; -static const long _vq_lengthlist__44un1__p7_1[] = { +static const char _vq_lengthlist__44un1__p7_1[] = { 1, 4, 4, 6, 6, 6, 6, 9, 8, 9, 8, 8, 8, 5, 7, 7, 7, 7, 8, 8, 8,10, 8,10, 8, 9, 5, 7, 7, 8, 7, 7, 8,10,10,11,10,12,11, 7, 8, 8, 9, 9, 9,10,11,11, @@ -7697,7 +7697,7 @@ static const long _vq_lengthlist__44un1__p7_1[] = { static const static_codebook _44un1__p7_1 = { 2, 169, - (long *)_vq_lengthlist__44un1__p7_1, + (char *)_vq_lengthlist__44un1__p7_1, 1, -523010048, 1618608128, 4, 0, (long *)_vq_quantlist__44un1__p7_1, 0 @@ -7719,7 +7719,7 @@ static const long _vq_quantlist__44un1__p7_2[] = { 12, }; -static const long _vq_lengthlist__44un1__p7_2[] = { +static const char _vq_lengthlist__44un1__p7_2[] = { 3, 4, 4, 6, 6, 7, 7, 8, 8, 9, 9, 9, 8, 4, 5, 5, 6, 6, 8, 8, 9, 8, 9, 9, 9, 9, 4, 5, 5, 7, 6, 8, 8, 8, 8, 9, 8, 9, 8, 6, 7, 7, 7, 8, 8, 8, 9, 9, @@ -7735,13 +7735,13 @@ static const long _vq_lengthlist__44un1__p7_2[] = { static const static_codebook _44un1__p7_2 = { 2, 169, - (long *)_vq_lengthlist__44un1__p7_2, + (char *)_vq_lengthlist__44un1__p7_2, 1, -531103744, 1611661312, 4, 0, (long *)_vq_quantlist__44un1__p7_2, 0 }; -static const long _huff_lengthlist__44un1__short[] = { +static const char _huff_lengthlist__44un1__short[] = { 12,12,14,12,14,14,14,14,12, 6, 6, 8, 9, 9,11,14, 12, 4, 2, 6, 6, 7,11,14,13, 6, 5, 7, 8, 9,11,14, 13, 8, 5, 8, 6, 8,12,14,12, 7, 7, 8, 8, 8,10,14, @@ -7750,7 +7750,7 @@ static const long _huff_lengthlist__44un1__short[] = { static const static_codebook _huff_book__44un1__short = { 2, 64, - (long *)_huff_lengthlist__44un1__short, + (char *)_huff_lengthlist__44un1__short, 0, 0, 0, 0, 0, NULL, 0 diff --git a/drivers/vorbis/codebook.c b/drivers/vorbis/codebook.c index 8a928cebb9..72f8a17a35 100644 --- a/drivers/vorbis/codebook.c +++ b/drivers/vorbis/codebook.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: basic codebook pack/unpack/code/decode operations - last mod: $Id: codebook.c 17553 2010-10-21 17:54:26Z tterribe $ + last mod: $Id: codebook.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -53,16 +53,16 @@ int vorbis_staticbook_pack(const static_codebook *c,oggpack_buffer *opb){ oggpack_write(opb,c->lengthlist[0]-1,5); /* 1 to 32 */ for(i=1;i<c->entries;i++){ - long this=c->lengthlist[i]; - long last=c->lengthlist[i-1]; + char this=c->lengthlist[i]; + char last=c->lengthlist[i-1]; if(this>last){ for(j=last;j<this;j++){ - oggpack_write(opb,i-count,_ilog(c->entries-count)); + oggpack_write(opb,i-count,ov_ilog(c->entries-count)); count=i; } } } - oggpack_write(opb,i-count,_ilog(c->entries-count)); + oggpack_write(opb,i-count,ov_ilog(c->entries-count)); }else{ /* length random. Again, we don't code the codeword itself, just @@ -159,7 +159,7 @@ static_codebook *vorbis_staticbook_unpack(oggpack_buffer *opb){ s->entries=oggpack_read(opb,24); if(s->entries==-1)goto _eofout; - if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout; + if(ov_ilog(s->dim)+ov_ilog(s->entries)>24)goto _eofout; /* codeword ordering.... length ordered or unordered? */ switch((int)oggpack_read(opb,1)){ @@ -203,7 +203,7 @@ static_codebook *vorbis_staticbook_unpack(oggpack_buffer *opb){ s->lengthlist=_ogg_malloc(sizeof(*s->lengthlist)*s->entries); for(i=0;i<s->entries;){ - long num=oggpack_read(opb,_ilog(s->entries-i)); + long num=oggpack_read(opb,ov_ilog(s->entries-i)); if(num==-1)goto _eofout; if(length>32 || num>s->entries-i || (num>0 && (num-1)>>(length-1)>1)){ @@ -312,6 +312,12 @@ STIN long decode_packed_entry_number(codebook *book, oggpack_buffer *b){ hi=book->used_entries; } + /* Single entry codebooks use a firsttablen of 1 and a + dec_maxlength of 1. If a single-entry codebook gets here (due to + failure to read one bit above), the next look attempt will also + fail and we'll correctly kick out instead of trying to walk the + underformed tree */ + lok = oggpack_look(b, read); while(lok<0 && read>1) @@ -367,6 +373,7 @@ long vorbis_book_decode(codebook *book, oggpack_buffer *b){ } /* returns 0 on OK or -1 on eof *************************************/ +/* decode vector / dim granularity gaurding is done in the upper layer */ long vorbis_book_decodevs_add(codebook *book,float *a,oggpack_buffer *b,int n){ if(book->used_entries>0){ int step=n/book->dim; @@ -386,6 +393,7 @@ long vorbis_book_decodevs_add(codebook *book,float *a,oggpack_buffer *b,int n){ return(0); } +/* decode vector / dim granularity gaurding is done in the upper layer */ long vorbis_book_decodev_add(codebook *book,float *a,oggpack_buffer *b,int n){ if(book->used_entries>0){ int i,j,entry; @@ -431,6 +439,9 @@ long vorbis_book_decodev_add(codebook *book,float *a,oggpack_buffer *b,int n){ return(0); } +/* unlike the others, we guard against n not being an integer number + of <dim> internally rather than in the upper layer (called only by + floor0) */ long vorbis_book_decodev_set(codebook *book,float *a,oggpack_buffer *b,int n){ if(book->used_entries>0){ int i,j,entry; @@ -440,15 +451,15 @@ long vorbis_book_decodev_set(codebook *book,float *a,oggpack_buffer *b,int n){ entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1); t = book->valuelist+entry*book->dim; - for (j=0;j<book->dim;) + for (j=0;i<n && j<book->dim;){ a[i++]=t[j++]; + } } }else{ - int i,j; + int i; for(i=0;i<n;){ - for (j=0;j<book->dim;) - a[i++]=0.f; + a[i++]=0.f; } } return(0); diff --git a/drivers/vorbis/codebook.h b/drivers/vorbis/codebook.h index 94c30054cf..537d6c12d3 100644 --- a/drivers/vorbis/codebook.h +++ b/drivers/vorbis/codebook.h @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: basic shared codebook operations - last mod: $Id: codebook.h 17030 2010-03-25 06:52:55Z xiphmont $ + last mod: $Id: codebook.h 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -34,14 +34,14 @@ */ typedef struct static_codebook{ - long dim; /* codebook dimensions (elements per vector) */ - long entries; /* codebook entries */ - long *lengthlist; /* codeword lengths in bits */ + long dim; /* codebook dimensions (elements per vector) */ + long entries; /* codebook entries */ + char *lengthlist; /* codeword lengths in bits */ /* mapping ***************************************************************/ - int maptype; /* 0=none - 1=implicitly populated values from map column - 2=listed arbitrary values */ + int maptype; /* 0=none + 1=implicitly populated values from map column + 2=listed arbitrary values */ /* The below does a linear, single monotonic sequence mapping. */ long q_min; /* packed 32 bit float; quant value 0 maps to minval */ @@ -89,7 +89,6 @@ extern float *_book_logdist(const static_codebook *b,float *vals); extern float _float32_unpack(long val); extern long _float32_pack(float val); extern int _best(codebook *book, float *a, int step); -extern int _ilog(unsigned int v); extern long _book_maptype1_quantvals(const static_codebook *b); extern int vorbis_book_besterror(codebook *book,float *a,int step,int addmul); diff --git a/drivers/vorbis/floor0.c b/drivers/vorbis/floor0.c index 4c32e91991..213cce4ec8 100644 --- a/drivers/vorbis/floor0.c +++ b/drivers/vorbis/floor0.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: floor backend 0 implementation - last mod: $Id: floor0.c 17558 2010-10-22 00:24:41Z tterribe $ + last mod: $Id: floor0.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -147,6 +147,9 @@ static vorbis_look_floor *floor0_look(vorbis_dsp_state *vd, vorbis_info_floor *i){ vorbis_info_floor0 *info=(vorbis_info_floor0 *)i; vorbis_look_floor0 *look=_ogg_calloc(1,sizeof(*look)); + + (void)vd; + look->m=info->order; look->ln=info->barkmap; look->vi=info; @@ -165,7 +168,7 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){ if(ampraw>0){ /* also handles the -1 out of data case */ long maxval=(1<<info->ampbits)-1; float amp=(float)ampraw/maxval*info->ampdB; - int booknum=oggpack_read(&vb->opb,_ilog(info->numbooks)); + int booknum=oggpack_read(&vb->opb,ov_ilog(info->numbooks)); if(booknum!=-1 && booknum<info->numbooks){ /* be paranoid */ codec_setup_info *ci=vb->vd->vi->codec_setup; @@ -177,10 +180,9 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){ vector */ float *lsp=_vorbis_block_alloc(vb,sizeof(*lsp)*(look->m+b->dim+1)); - for(j=0;j<look->m;j+=b->dim) - if(vorbis_book_decodev_set(b,lsp+j,&vb->opb,b->dim)==-1)goto eop; + if(vorbis_book_decodev_set(b,lsp,&vb->opb,look->m)==-1)goto eop; for(j=0;j<look->m;){ - for(k=0;k<b->dim;k++,j++)lsp[j]+=last; + for(k=0;j<look->m && k<b->dim;k++,j++)lsp[j]+=last; last=lsp[j-1]; } diff --git a/drivers/vorbis/floor1.c b/drivers/vorbis/floor1.c index ae3dcedb1f..d8bd4645c1 100644 --- a/drivers/vorbis/floor1.c +++ b/drivers/vorbis/floor1.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: floor backend 1 implementation - last mod: $Id: floor1.c 17555 2010-10-21 18:14:51Z tterribe $ + last mod: $Id: floor1.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -72,25 +72,6 @@ static void floor1_free_look(vorbis_look_floor *i){ } } -static int ilog(unsigned int v){ - int ret=0; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - -static int ilog2(unsigned int v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - static void floor1_pack (vorbis_info_floor *i,oggpack_buffer *opb){ vorbis_info_floor1 *info=(vorbis_info_floor1 *)i; int j,k; @@ -117,8 +98,10 @@ static void floor1_pack (vorbis_info_floor *i,oggpack_buffer *opb){ /* save out the post list */ oggpack_write(opb,info->mult-1,2); /* only 1,2,3,4 legal now */ - oggpack_write(opb,ilog2(maxposit),4); - rangebits=ilog2(maxposit); + /* maxposit cannot legally be less than 1; this is encode-side, we + can assume our setup is OK */ + oggpack_write(opb,ov_ilog(maxposit-1),4); + rangebits=ov_ilog(maxposit-1); for(j=0,k=0;j<info->partitions;j++){ count+=info->class_dim[info->partitionclass[j]]; @@ -167,6 +150,7 @@ static vorbis_info_floor *floor1_unpack (vorbis_info *vi,oggpack_buffer *opb){ for(j=0,k=0;j<info->partitions;j++){ count+=info->class_dim[info->partitionclass[j]]; + if(count>VIF_POSIT) goto err_out; for(;k<count;k++){ int t=info->postlist[k+2]=oggpack_read(opb,rangebits); if(t<0 || t>=(1<<rangebits)) @@ -202,6 +186,8 @@ static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd, vorbis_look_floor1 *look=_ogg_calloc(1,sizeof(*look)); int i,j,n=0; + (void)vd; + look->vi=info; look->n=info->postlist[1]; @@ -851,9 +837,9 @@ int floor1_encode(oggpack_buffer *opb,vorbis_block *vb, /* beginning/end post */ look->frames++; - look->postbits+=ilog(look->quant_q-1)*2; - oggpack_write(opb,out[0],ilog(look->quant_q-1)); - oggpack_write(opb,out[1],ilog(look->quant_q-1)); + look->postbits+=ov_ilog(look->quant_q-1)*2; + oggpack_write(opb,out[0],ov_ilog(look->quant_q-1)); + oggpack_write(opb,out[1],ov_ilog(look->quant_q-1)); /* partition by partition */ @@ -869,7 +855,9 @@ int floor1_encode(oggpack_buffer *opb,vorbis_block *vb, /* generate the partition's first stage cascade value */ if(csubbits){ - int maxval[8]; + int maxval[8]={0,0,0,0,0,0,0,0}; /* gcc's static analysis + issues a warning without + initialization */ for(k=0;k<csub;k++){ int booknum=info->class_subbook[class][k]; if(booknum<0){ @@ -977,8 +965,8 @@ static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){ if(oggpack_read(&vb->opb,1)==1){ int *fit_value=_vorbis_block_alloc(vb,(look->posts)*sizeof(*fit_value)); - fit_value[0]=oggpack_read(&vb->opb,ilog(look->quant_q-1)); - fit_value[1]=oggpack_read(&vb->opb,ilog(look->quant_q-1)); + fit_value[0]=oggpack_read(&vb->opb,ov_ilog(look->quant_q-1)); + fit_value[1]=oggpack_read(&vb->opb,ov_ilog(look->quant_q-1)); /* partition by partition */ for(i=0,j=2;i<info->partitions;i++){ diff --git a/drivers/vorbis/info.c b/drivers/vorbis/info.c index 3932480a44..8a2a001f99 100644 --- a/drivers/vorbis/info.c +++ b/drivers/vorbis/info.c @@ -5,13 +5,13 @@ * 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-2010 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: maintain the info structure, info <-> header packets - last mod: $Id: info.c 17584 2010-11-01 19:26:16Z xiphmont $ + last mod: $Id: info.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -31,20 +31,10 @@ #include "misc.h" #include "os.h" -#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.2" -#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20101101 (Schaufenugget)" +#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.5" +#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20150105 (⛄⛄⛄⛄)" /* helpers */ -static int ilog2(unsigned int v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){ while(bytes--){ @@ -272,7 +262,6 @@ static int _vorbis_unpack_comment(vorbis_comment *vc,oggpack_buffer *opb){ static int _vorbis_unpack_books(vorbis_info *vi,oggpack_buffer *opb){ codec_setup_info *ci=vi->codec_setup; int i; - if(!ci)return(OV_EFAULT); /* codebooks */ ci->books=oggpack_read(opb,8)+1; @@ -411,6 +400,10 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) /* um... we didn't get the initial header */ return(OV_EBADHEADER); } + if(vc->vendor!=NULL){ + /* previously initialized comment header */ + return(OV_EBADHEADER); + } return(_vorbis_unpack_comment(vc,&opb)); @@ -419,6 +412,14 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) /* um... we didn;t get the initial header or comments yet */ return(OV_EBADHEADER); } + if(vi->codec_setup==NULL){ + /* improperly initialized vorbis_info */ + return(OV_EFAULT); + } + if(((codec_setup_info *)vi->codec_setup)->books>0){ + /* previously initialized setup header */ + return(OV_EBADHEADER); + } return(_vorbis_unpack_books(vi,&opb)); @@ -436,7 +437,11 @@ int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op) static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){ codec_setup_info *ci=vi->codec_setup; - if(!ci)return(OV_EFAULT); + if(!ci|| + ci->blocksizes[0]<64|| + ci->blocksizes[1]<ci->blocksizes[0]){ + return(OV_EFAULT); + } /* preamble */ oggpack_write(opb,0x01,8); @@ -451,8 +456,8 @@ static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){ oggpack_write(opb,vi->bitrate_nominal,32); oggpack_write(opb,vi->bitrate_lower,32); - oggpack_write(opb,ilog2(ci->blocksizes[0]),4); - oggpack_write(opb,ilog2(ci->blocksizes[1]),4); + oggpack_write(opb,ov_ilog(ci->blocksizes[0]-1),4); + oggpack_write(opb,ov_ilog(ci->blocksizes[1]-1),4); oggpack_write(opb,1,1); return(0); @@ -550,7 +555,10 @@ int vorbis_commentheader_out(vorbis_comment *vc, oggpack_buffer opb; oggpack_writeinit(&opb); - if(_vorbis_pack_comment(&opb,vc)) return OV_EIMPL; + if(_vorbis_pack_comment(&opb,vc)){ + oggpack_writeclear(&opb); + return OV_EIMPL; + } op->packet = _ogg_malloc(oggpack_bytes(&opb)); memcpy(op->packet, opb.buffer, oggpack_bytes(&opb)); @@ -561,6 +569,7 @@ int vorbis_commentheader_out(vorbis_comment *vc, op->granulepos=0; op->packetno=1; + oggpack_writeclear(&opb); return 0; } @@ -574,7 +583,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v, oggpack_buffer opb; private_state *b=v->backend_state; - if(!b){ + if(!b||vi->channels<=0){ ret=OV_EFAULT; goto err_out; } diff --git a/drivers/vorbis/lsp.c b/drivers/vorbis/lsp.c index 50031a7a1c..6a619f7b0c 100644 --- a/drivers/vorbis/lsp.c +++ b/drivers/vorbis/lsp.c @@ -11,7 +11,7 @@ ******************************************************************** function: LSP (also called LSF) conversion routines - last mod: $Id: lsp.c 17538 2010-10-15 02:52:29Z tterribe $ + last mod: $Id: lsp.c 19453 2015-03-02 22:35:34Z xiphmont $ The LSP generation code is taken (with minimal modification and a few bugfixes) from "On the Computation of the LSP Frequencies" by @@ -309,7 +309,6 @@ static int comp(const void *a,const void *b){ #define EPSILON 10e-7 static int Laguerre_With_Deflation(float *a,int ord,float *r){ int i,m; - double lastdelta=0.f; double *defl=alloca(sizeof(*defl)*(ord+1)); for(i=0;i<=ord;i++)defl[i]=a[i]; @@ -346,7 +345,6 @@ static int Laguerre_With_Deflation(float *a,int ord,float *r){ if(delta<0.f)delta*=-1; if(fabs(delta/new)<10e-12)break; - lastdelta=delta; } r[m-1]=new; diff --git a/drivers/vorbis/mapping0.c b/drivers/vorbis/mapping0.c index 7d279a8575..85c7d22d83 100644 --- a/drivers/vorbis/mapping0.c +++ b/drivers/vorbis/mapping0.c @@ -11,7 +11,7 @@ ******************************************************************** function: channel mapping 0 implementation - last mod: $Id: mapping0.c 17022 2010-03-25 03:45:42Z xiphmont $ + last mod: $Id: mapping0.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -45,16 +45,6 @@ static void mapping0_free_info(vorbis_info_mapping *i){ } } -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; @@ -78,8 +68,8 @@ static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, 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)); + oggpack_write(opb,info->coupling_mag[i],ov_ilog(vi->channels-1)); + oggpack_write(opb,info->coupling_ang[i],ov_ilog(vi->channels-1)); } }else oggpack_write(opb,0,1); @@ -104,6 +94,7 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) vorbis_info_mapping0 *info=_ogg_calloc(1,sizeof(*info)); codec_setup_info *ci=vi->codec_setup; memset(info,0,sizeof(*info)); + if(vi->channels<=0)goto err_out; b=oggpack_read(opb,1); if(b<0)goto err_out; @@ -119,8 +110,11 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) info->coupling_steps=oggpack_read(opb,8)+1; if(info->coupling_steps<=0)goto err_out; 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)); + /* vi->channels > 0 is enforced in the caller */ + int testM=info->coupling_mag[i]= + oggpack_read(opb,ov_ilog(vi->channels-1)); + int testA=info->coupling_ang[i]= + oggpack_read(opb,ov_ilog(vi->channels-1)); if(testM<0 || testA<0 || diff --git a/drivers/vorbis/misc.h b/drivers/vorbis/misc.h index 85fe3074ac..73b4519898 100644 --- a/drivers/vorbis/misc.h +++ b/drivers/vorbis/misc.h @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: miscellaneous prototypes - last mod: $Id: misc.h 16227 2009-07-08 06:58:46Z xiphmont $ + last mod: $Id: misc.h 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -21,6 +21,7 @@ extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes); extern void _vorbis_block_ripcord(vorbis_block *vb); +extern int ov_ilog(ogg_uint32_t v); #ifdef ANALYSIS extern int analysis_noisy; diff --git a/drivers/vorbis/modes/residue_44p51.h b/drivers/vorbis/modes/residue_44p51.h index 103e960d72..a52cc5245e 100644 --- a/drivers/vorbis/modes/residue_44p51.h +++ b/drivers/vorbis/modes/residue_44p51.h @@ -11,7 +11,7 @@ ******************************************************************** function: toplevel residue templates for 32/44.1/48kHz uncoupled - last mod: $Id$ + last mod: $Id: residue_44p51.h 19013 2013-11-12 04:04:50Z giles $ ********************************************************************/ diff --git a/drivers/vorbis/modes/setup_44p51.h b/drivers/vorbis/modes/setup_44p51.h index e46468a15b..67d9979608 100644 --- a/drivers/vorbis/modes/setup_44p51.h +++ b/drivers/vorbis/modes/setup_44p51.h @@ -11,7 +11,7 @@ ******************************************************************** function: toplevel settings for 44.1/48kHz 5.1 surround modes - last mod: $Id$ + last mod: $Id: setup_44p51.h 19013 2013-11-12 04:04:50Z giles $ ********************************************************************/ diff --git a/drivers/vorbis/os.h b/drivers/vorbis/os.h index 3df1d194e9..8bc3e5fe9c 100644 --- a/drivers/vorbis/os.h +++ b/drivers/vorbis/os.h @@ -7,13 +7,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os.h 16227 2009-07-08 06:58:46Z xiphmont $ + last mod: $Id: os.h 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -119,8 +119,9 @@ static inline int vorbis_ftoi(double f){ /* yes, double! Otherwise, /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the - * 64 bit compiler */ -#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_WIN32_WCE) && !defined(WINDOWSPHONE_ENABLED) + * 64 bit compiler and doesn't work on arm. */ +#if defined(_MSC_VER) && !defined(_WIN64) && \ + !defined(_WIN32_WCE) && !defined(_M_ARM) # define VORBIS_FPU_CONTROL typedef ogg_int16_t vorbis_fpu_control; @@ -135,9 +136,11 @@ static __inline int vorbis_ftoi(double f){ } static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ + (void)fpu; } static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + (void)fpu; } #endif /* Special MSVC 32 bit implementation */ @@ -156,9 +159,11 @@ static __inline int vorbis_ftoi(double f){ } static __inline void vorbis_fpu_setround(vorbis_fpu_control *fpu){ + (void)fpu; } static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + (void)fpu; } #endif /* Special MSVC x64 implementation */ diff --git a/drivers/vorbis/psy.c b/drivers/vorbis/psy.c index 29d2824372..f7a44c6d00 100644 --- a/drivers/vorbis/psy.c +++ b/drivers/vorbis/psy.c @@ -11,7 +11,7 @@ ******************************************************************** function: psychoacoustics not including preecho - last mod: $Id: psy.c 17569 2010-10-26 17:09:47Z xiphmont $ + last mod: $Id: psy.c 18077 2011-09-02 02:49:00Z giles $ ********************************************************************/ @@ -1020,7 +1020,9 @@ void _vp_couple_quantize_normalize(int blobno, int limit = g->coupling_pointlimit[p->vi->blockflag][blobno]; float prepoint=stereo_threshholds[g->coupling_prepointamp[blobno]]; float postpoint=stereo_threshholds[g->coupling_postpointamp[blobno]]; +#if 0 float de=0.1*p->m_val; /* a blend of the AoTuV M2 and M3 code here and below */ +#endif /* mdct is our raw mdct output, floor not removed. */ /* inout passes in the ifloor, passes back quantized result */ @@ -1154,27 +1156,28 @@ void _vp_couple_quantize_normalize(int blobno, reM[j] += reA[j]; qeM[j] = fabs(reM[j]); }else{ +#if 0 /* AoTuV */ /** @ M2 ** The boost problem by the combination of noise normalization and point stereo is eased. However, this is a temporary patch. by Aoyumi @ 2004/04/18 */ - /*float derate = (1.0 - de*((float)(j-limit+i) / (float)(n-limit))); */ - /* elliptical + float derate = (1.0 - de*((float)(j-limit+i) / (float)(n-limit))); + /* elliptical */ if(reM[j]+reA[j]<0){ reM[j] = - (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate); }else{ reM[j] = (qeM[j] = (fabs(reM[j])+fabs(reA[j]))*derate*derate); - }*/ - + } +#else /* elliptical */ if(reM[j]+reA[j]<0){ reM[j] = - (qeM[j] = fabs(reM[j])+fabs(reA[j])); }else{ reM[j] = (qeM[j] = fabs(reM[j])+fabs(reA[j])); } - +#endif } reA[j]=qeA[j]=0.f; diff --git a/drivers/vorbis/res0.c b/drivers/vorbis/res0.c index fa0ad97561..ec11488c2f 100644 --- a/drivers/vorbis/res0.c +++ b/drivers/vorbis/res0.c @@ -11,7 +11,7 @@ ******************************************************************** function: residue backend 0, 1 and 2 implementation - last mod: $Id: res0.c 17556 2010-10-21 18:25:19Z tterribe $ + last mod: $Id: res0.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -152,15 +152,6 @@ void res0_free_look(vorbis_look_residue *i){ } } -static int ilog(unsigned int v){ - int ret=0; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - static int icount(unsigned int v){ int ret=0; while(v){ @@ -186,7 +177,7 @@ void res0_pack(vorbis_info_residue *vr,oggpack_buffer *opb){ bitmask of one indicates this partition class has bits to write this pass */ for(j=0;j<info->partitions;j++){ - if(ilog(info->secondstages[j])>3){ + if(ov_ilog(info->secondstages[j])>3){ /* yes, this is a minor hack due to not thinking ahead */ oggpack_write(opb,info->secondstages[j],3); oggpack_write(opb,1,1); @@ -284,7 +275,7 @@ vorbis_look_residue *res0_look(vorbis_dsp_state *vd, look->partbooks=_ogg_calloc(look->parts,sizeof(*look->partbooks)); for(j=0;j<look->parts;j++){ - int stages=ilog(info->secondstages[j]); + int stages=ov_ilog(info->secondstages[j]); if(stages){ if(stages>maxstage)maxstage=stages; look->partbooks[j]=_ogg_calloc(stages,sizeof(*look->partbooks[j])); @@ -390,8 +381,13 @@ static int local_book_besterror(codebook *book,int *a){ return(index); } +#ifdef TRAIN_RES static int _encodepart(oggpack_buffer *opb,int *vec, int n, codebook *book,long *acc){ +#else +static int _encodepart(oggpack_buffer *opb,int *vec, int n, + codebook *book){ +#endif int i,bits=0; int dim=book->dim; int step=n/dim; @@ -534,12 +530,18 @@ static long **_2class(vorbis_block *vb,vorbis_look_residue *vl,int **in, } static int _01forward(oggpack_buffer *opb, - vorbis_block *vb,vorbis_look_residue *vl, + vorbis_look_residue *vl, int **in,int ch, long **partword, +#ifdef TRAIN_RES int (*encode)(oggpack_buffer *,int *,int, codebook *,long *), - int submap){ + int submap +#else + int (*encode)(oggpack_buffer *,int *,int, + codebook *) +#endif +){ long i,j,k,s; vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl; vorbis_info_residue0 *info=look->info; @@ -609,9 +611,8 @@ static int _01forward(oggpack_buffer *opb, codebook *statebook=look->partbooks[partword[j][i]][s]; if(statebook){ int ret; - long *accumulator=NULL; - #ifdef TRAIN_RES + long *accumulator=NULL; accumulator=look->training_data[s][partword[j][i]]; { int l; @@ -623,10 +624,12 @@ static int _01forward(oggpack_buffer *opb, look->training_max[s][partword[j][i]]=samples[l]; } } -#endif - ret=encode(opb,in[j]+offset,samples_per_partition, statebook,accumulator); +#else + ret=encode(opb,in[j]+offset,samples_per_partition, + statebook); +#endif look->postbits+=ret; resbits[partword[j][i]]+=ret; @@ -637,19 +640,6 @@ static int _01forward(oggpack_buffer *opb, } } - /*{ - long total=0; - long totalbits=0; - fprintf(stderr,"%d :: ",vb->mode); - for(k=0;k<possible_partitions;k++){ - fprintf(stderr,"%ld/%1.2g, ",resvals[k],(float)resbits[k]/resvals[k]); - total+=resvals[k]; - totalbits+=resbits[k]; - } - - fprintf(stderr,":: %ld:%1.2g\n",total,(double)totalbits/total); - }*/ - return(0); } @@ -729,12 +719,18 @@ int res0_inverse(vorbis_block *vb,vorbis_look_residue *vl, int res1_forward(oggpack_buffer *opb,vorbis_block *vb,vorbis_look_residue *vl, int **in,int *nonzero,int ch, long **partword, int submap){ int i,used=0; + (void)vb; for(i=0;i<ch;i++) if(nonzero[i]) in[used++]=in[i]; if(used){ - return _01forward(opb,vb,vl,in,used,partword,_encodepart,submap); +#ifdef TRAIN_RES + return _01forward(opb,vl,in,used,partword,_encodepart,submap); +#else + (void)submap; + return _01forward(opb,vl,in,used,partword,_encodepart); +#endif }else{ return(0); } @@ -795,7 +791,12 @@ int res2_forward(oggpack_buffer *opb, } if(used){ - return _01forward(opb,vb,vl,&work,1,partword,_encodepart,submap); +#ifdef TRAIN_RES + return _01forward(opb,vl,&work,1,partword,_encodepart,submap); +#else + (void)submap; + return _01forward(opb,vl,&work,1,partword,_encodepart); +#endif }else{ return(0); } diff --git a/drivers/vorbis/sharedbook.c b/drivers/vorbis/sharedbook.c index 545e302f82..6bfdf7311e 100644 --- a/drivers/vorbis/sharedbook.c +++ b/drivers/vorbis/sharedbook.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: basic shared codebook operations - last mod: $Id: sharedbook.c 17030 2010-03-25 06:52:55Z xiphmont $ + last mod: $Id: sharedbook.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -26,13 +26,11 @@ #include "scales.h" /**** pack/unpack helpers ******************************************/ -int _ilog(unsigned int v){ - int ret=0; - while(v){ - ret++; - v>>=1; - } - return(ret); + +int ov_ilog(ogg_uint32_t v){ + int ret; + for(ret=0;v;ret++)v>>=1; + return ret; } /* 32 bit float (not IEEE; nonnormalized mantissa + @@ -70,7 +68,7 @@ float _float32_unpack(long val){ /* given a list of word lengths, generate a list of codewords. Works for length ordered or unordered, always assigns the lowest valued codewords first. Extended to handle unused entries (length 0) */ -ogg_uint32_t *_make_words(long *l,long n,long sparsecount){ +ogg_uint32_t *_make_words(char *l,long n,long sparsecount){ long i,j,count=0; ogg_uint32_t marker[33]; ogg_uint32_t *r=_ogg_malloc((sparsecount?sparsecount:n)*sizeof(*r)); @@ -125,16 +123,15 @@ ogg_uint32_t *_make_words(long *l,long n,long sparsecount){ if(sparsecount==0)count++; } - /* sanity check the huffman tree; an underpopulated tree must be - rejected. The only exception is the one-node pseudo-nil tree, - which appears to be underpopulated because the tree doesn't - really exist; there's only one possible 'codeword' or zero bits, - but the above tree-gen code doesn't mark that. */ - if(sparsecount != 1){ + /* any underpopulated tree must be rejected. */ + /* Single-entry codebooks are a retconned extension to the spec. + They have a single codeword '0' of length 1 that results in an + underpopulated tree. Shield that case from the underformed tree check. */ + if(!(count==1 && marker[2]==2)){ for(i=1;i<33;i++) if(marker[i] & (0xffffffffUL>>(32-i))){ - _ogg_free(r); - return(NULL); + _ogg_free(r); + return(NULL); } } @@ -313,9 +310,10 @@ static int sort32a(const void *a,const void *b){ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ int i,j,n=0,tabn; int *sortindex; + memset(c,0,sizeof(*c)); - /* count actually used entries */ + /* count actually used entries and find max length */ for(i=0;i<s->entries;i++) if(s->lengthlist[i]>0) n++; @@ -325,7 +323,6 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ c->dim=s->dim; if(n>0){ - /* two different remappings go on here. First, we collapse the likely sparse codebook down only to @@ -361,7 +358,6 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ c->codelist[sortindex[i]]=codes[i]; _ogg_free(codes); - c->valuelist=_book_unquantize(s,n,sortindex); c->dec_index=_ogg_malloc(n*sizeof(*c->dec_index)); @@ -370,51 +366,62 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){ c->dec_index[sortindex[n++]]=i; c->dec_codelengths=_ogg_malloc(n*sizeof(*c->dec_codelengths)); + c->dec_maxlength=0; for(n=0,i=0;i<s->entries;i++) - if(s->lengthlist[i]>0) + if(s->lengthlist[i]>0){ c->dec_codelengths[sortindex[n++]]=s->lengthlist[i]; + if(s->lengthlist[i]>c->dec_maxlength) + c->dec_maxlength=s->lengthlist[i]; + } - c->dec_firsttablen=_ilog(c->used_entries)-4; /* this is magic */ - if(c->dec_firsttablen<5)c->dec_firsttablen=5; - if(c->dec_firsttablen>8)c->dec_firsttablen=8; - - tabn=1<<c->dec_firsttablen; - c->dec_firsttable=_ogg_calloc(tabn,sizeof(*c->dec_firsttable)); - c->dec_maxlength=0; + if(n==1 && c->dec_maxlength==1){ + /* special case the 'single entry codebook' with a single bit + fastpath table (that always returns entry 0 )in order to use + unmodified decode paths. */ + c->dec_firsttablen=1; + c->dec_firsttable=_ogg_calloc(2,sizeof(*c->dec_firsttable)); + c->dec_firsttable[0]=c->dec_firsttable[1]=1; - for(i=0;i<n;i++){ - if(c->dec_maxlength<c->dec_codelengths[i]) - c->dec_maxlength=c->dec_codelengths[i]; - if(c->dec_codelengths[i]<=c->dec_firsttablen){ - ogg_uint32_t orig=bitreverse(c->codelist[i]); - for(j=0;j<(1<<(c->dec_firsttablen-c->dec_codelengths[i]));j++) - c->dec_firsttable[orig|(j<<c->dec_codelengths[i])]=i+1; + }else{ + c->dec_firsttablen=ov_ilog(c->used_entries)-4; /* this is magic */ + if(c->dec_firsttablen<5)c->dec_firsttablen=5; + if(c->dec_firsttablen>8)c->dec_firsttablen=8; + + tabn=1<<c->dec_firsttablen; + c->dec_firsttable=_ogg_calloc(tabn,sizeof(*c->dec_firsttable)); + + for(i=0;i<n;i++){ + if(c->dec_codelengths[i]<=c->dec_firsttablen){ + ogg_uint32_t orig=bitreverse(c->codelist[i]); + for(j=0;j<(1<<(c->dec_firsttablen-c->dec_codelengths[i]));j++) + c->dec_firsttable[orig|(j<<c->dec_codelengths[i])]=i+1; + } } - } - /* now fill in 'unused' entries in the firsttable with hi/lo search - hints for the non-direct-hits */ - { - ogg_uint32_t mask=0xfffffffeUL<<(31-c->dec_firsttablen); - long lo=0,hi=0; - - for(i=0;i<tabn;i++){ - ogg_uint32_t word=i<<(32-c->dec_firsttablen); - if(c->dec_firsttable[bitreverse(word)]==0){ - while((lo+1)<n && c->codelist[lo+1]<=word)lo++; - while( hi<n && word>=(c->codelist[hi]&mask))hi++; - - /* we only actually have 15 bits per hint to play with here. - In order to overflow gracefully (nothing breaks, efficiency - just drops), encode as the difference from the extremes. */ - { - unsigned long loval=lo; - unsigned long hival=n-hi; - - if(loval>0x7fff)loval=0x7fff; - if(hival>0x7fff)hival=0x7fff; - c->dec_firsttable[bitreverse(word)]= - 0x80000000UL | (loval<<15) | hival; + /* now fill in 'unused' entries in the firsttable with hi/lo search + hints for the non-direct-hits */ + { + ogg_uint32_t mask=0xfffffffeUL<<(31-c->dec_firsttablen); + long lo=0,hi=0; + + for(i=0;i<tabn;i++){ + ogg_uint32_t word=i<<(32-c->dec_firsttablen); + if(c->dec_firsttable[bitreverse(word)]==0){ + while((lo+1)<n && c->codelist[lo+1]<=word)lo++; + while( hi<n && word>=(c->codelist[hi]&mask))hi++; + + /* we only actually have 15 bits per hint to play with here. + In order to overflow gracefully (nothing breaks, efficiency + just drops), encode as the difference from the extremes. */ + { + unsigned long loval=lo; + unsigned long hival=n-hi; + + if(loval>0x7fff)loval=0x7fff; + if(hival>0x7fff)hival=0x7fff; + c->dec_firsttable[bitreverse(word)]= + 0x80000000UL | (loval<<15) | hival; + } } } } diff --git a/drivers/vorbis/synthesis.c b/drivers/vorbis/synthesis.c index 1af211d001..932d271a63 100644 --- a/drivers/vorbis/synthesis.c +++ b/drivers/vorbis/synthesis.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: single-block PCM synthesis - last mod: $Id: synthesis.c 17474 2010-09-30 03:41:41Z gmaxwell $ + last mod: $Id: synthesis.c 19441 2015-01-21 01:17:41Z xiphmont $ ********************************************************************/ @@ -145,6 +145,11 @@ long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){ oggpack_buffer opb; int mode; + if(ci==NULL || ci->modes<=0){ + /* codec setup not properly intialized */ + return(OV_EFAULT); + } + oggpack_readinit(&opb,op->packet,op->bytes); /* Check the packet type */ @@ -153,18 +158,9 @@ long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){ return(OV_ENOTAUDIO); } - { - int modebits=0; - int v=ci->modes; - while(v>1){ - modebits++; - v>>=1; - } - - /* read our mode and pre/post windowsize */ - mode=oggpack_read(&opb,modebits); - } - if(mode==-1)return(OV_EBADPACKET); + /* read our mode and pre/post windowsize */ + mode=oggpack_read(&opb,ov_ilog(ci->modes-1)); + if(mode==-1 || !ci->mode_param[mode])return(OV_EBADPACKET); return(ci->blocksizes[ci->mode_param[mode]->blockflag]); } diff --git a/drivers/vorbis/tone.c b/drivers/vorbis/tone.c index 5f1f43cf7b..73afc67d4c 100644 --- a/drivers/vorbis/tone.c +++ b/drivers/vorbis/tone.c @@ -3,10 +3,6 @@ #include <math.h> #include <string.h> -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - void usage(){ fprintf(stderr,"tone <frequency_Hz>,[<amplitude>] [<frequency_Hz>,[<amplitude>]...]\n"); exit(1); diff --git a/drivers/vorbis/vorbisenc.c b/drivers/vorbis/vorbisenc.c index f0f7c08558..b5d621e900 100644 --- a/drivers/vorbis/vorbisenc.c +++ b/drivers/vorbis/vorbisenc.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: simple programmatic interface for encoder mode setup - last mod: $Id: vorbisenc.c 17028 2010-03-25 05:22:15Z xiphmont $ + last mod: $Id: vorbisenc.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -903,8 +903,12 @@ int vorbis_encode_setup_vbr(vorbis_info *vi, long channels, long rate, float quality){ - codec_setup_info *ci=vi->codec_setup; - highlevel_encode_setup *hi=&ci->hi; + codec_setup_info *ci; + highlevel_encode_setup *hi; + if(rate<=0) return OV_EINVAL; + + ci=vi->codec_setup; + hi=&ci->hi; quality+=.0000001; if(quality>=1.)quality=.9999; @@ -948,9 +952,14 @@ int vorbis_encode_setup_managed(vorbis_info *vi, long nominal_bitrate, long min_bitrate){ - codec_setup_info *ci=vi->codec_setup; - highlevel_encode_setup *hi=&ci->hi; - double tnominal=nominal_bitrate; + codec_setup_info *ci; + highlevel_encode_setup *hi; + double tnominal; + if(rate<=0) return OV_EINVAL; + + ci=vi->codec_setup; + hi=&ci->hi; + tnominal=nominal_bitrate; if(nominal_bitrate<=0.){ if(max_bitrate>0.){ diff --git a/drivers/vorbis/vorbisfile.c b/drivers/vorbis/vorbisfile.c index 3afbd9d002..fc0c86ff11 100644 --- a/drivers/vorbis/vorbisfile.c +++ b/drivers/vorbis/vorbisfile.c @@ -5,13 +5,13 @@ * 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-2009 * + * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 * * by the Xiph.Org Foundation http://www.xiph.org/ * * * ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - last mod: $Id: vorbisfile.c 17573 2010-10-27 14:53:59Z xiphmont $ + last mod: $Id: vorbisfile.c 19457 2015-03-03 00:15:29Z giles $ ********************************************************************/ @@ -80,11 +80,14 @@ static long _get_data(OggVorbis_File *vf){ /* save a tiny smidge of verbosity to make the code more readable */ static int _seek_helper(OggVorbis_File *vf,ogg_int64_t offset){ if(vf->datasource){ - if(!(vf->callbacks.seek_func)|| - (vf->callbacks.seek_func)(vf->datasource, offset, SEEK_SET) == -1) - return OV_EREAD; - vf->offset=offset; - ogg_sync_reset(&vf->oy); + /* only seek if the file position isn't already there */ + if(vf->offset != offset){ + if(!(vf->callbacks.seek_func)|| + (vf->callbacks.seek_func)(vf->datasource, offset, SEEK_SET) == -1) + return OV_EREAD; + vf->offset=offset; + ogg_sync_reset(&vf->oy); + } }else{ /* shouldn't happen unless someone writes a broken callback */ return OV_EFAULT; @@ -138,14 +141,12 @@ static ogg_int64_t _get_next_page(OggVorbis_File *vf,ogg_page *og, } } -/* find the latest page beginning before the current stream cursor - position. Much dirtier than the above as Ogg doesn't have any - backward search linkage. no 'readp' as it will certainly have to - read. */ +/* find the latest page beginning before the passed in position. Much + dirtier than the above as Ogg doesn't have any backward search + linkage. no 'readp' as it will certainly have to read. */ /* returns offset or OV_EREAD, OV_FAULT */ -static ogg_int64_t _get_prev_page(OggVorbis_File *vf,ogg_page *og){ - ogg_int64_t begin=vf->offset; - ogg_int64_t end=begin; +static ogg_int64_t _get_prev_page(OggVorbis_File *vf,ogg_int64_t begin,ogg_page *og){ + ogg_int64_t end = begin; ogg_int64_t ret; ogg_int64_t offset=-1; @@ -220,11 +221,10 @@ static int _lookup_page_serialno(ogg_page *og, long *serialno_list, int n){ info of last page of the matching serial number instead of the very last page. If no page of the specified serialno is seen, it will return the info of last page and alter *serialno. */ -static ogg_int64_t _get_prev_page_serial(OggVorbis_File *vf, +static ogg_int64_t _get_prev_page_serial(OggVorbis_File *vf, ogg_int64_t begin, long *serial_list, int serial_n, int *serialno, ogg_int64_t *granpos){ ogg_page og; - ogg_int64_t begin=vf->offset; ogg_int64_t end=begin; ogg_int64_t ret; @@ -438,9 +438,11 @@ static ogg_int64_t _initial_pcmoffset(OggVorbis_File *vf, vorbis_info *vi){ while((result=ogg_stream_packetout(&vf->os,&op))){ if(result>0){ /* ignore holes */ long thisblock=vorbis_packet_blocksize(vi,&op); - if(lastblock!=-1) - accumulated+=(lastblock+thisblock)>>2; - lastblock=thisblock; + if(thisblock>=0){ + if(lastblock!=-1) + accumulated+=(lastblock+thisblock)>>2; + lastblock=thisblock; + } } } @@ -494,10 +496,10 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, down to (or just started with) a single link. Now we need to find the last vorbis page belonging to the first vorbis stream for this link. */ - + searched = end; while(endserial != serialno){ endserial = serialno; - vf->offset=_get_prev_page_serial(vf,currentno_list,currentnos,&endserial,&endgran); + searched=_get_prev_page_serial(vf,searched,currentno_list,currentnos,&endserial,&endgran); } vf->links=m+1; @@ -518,10 +520,15 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, }else{ + /* last page is not in the starting stream's serial number list, + so we have multiple links. Find where the stream that begins + our bisection ends. */ + long *next_serialno_list=NULL; int next_serialnos=0; vorbis_info vi; vorbis_comment vc; + int testserial = serialno+1; /* the below guards against garbage seperating the last and first pages of two links. */ @@ -534,10 +541,8 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, bisect=(searched+endsearched)/2; } - if(bisect != vf->offset){ - ret=_seek_helper(vf,bisect); - if(ret)return(ret); - } + ret=_seek_helper(vf,bisect); + if(ret)return(ret); last=_get_next_page(vf,&og,-1); if(last==OV_EREAD)return(OV_EREAD); @@ -550,28 +555,22 @@ static int _bisect_forward_serialno(OggVorbis_File *vf, } /* Bisection point found */ - /* for the time being, fetch end PCM offset the simple way */ - { - int testserial = serialno+1; - vf->offset = next; - while(testserial != serialno){ - testserial = serialno; - vf->offset=_get_prev_page_serial(vf,currentno_list,currentnos,&testserial,&searchgran); - } + searched = next; + while(testserial != serialno){ + testserial = serialno; + searched = _get_prev_page_serial(vf,searched,currentno_list,currentnos,&testserial,&searchgran); } - if(vf->offset!=next){ - ret=_seek_helper(vf,next); - if(ret)return(ret); - } + ret=_seek_helper(vf,next); + if(ret)return(ret); ret=_fetch_headers(vf,&vi,&vc,&next_serialno_list,&next_serialnos,NULL); if(ret)return(ret); serialno = vf->os.serialno; dataoffset = vf->offset; - /* this will consume a page, however the next bistection always + /* this will consume a page, however the next bisection always starts with a raw seek */ pcmoffset = _initial_pcmoffset(vf,&vi); @@ -638,11 +637,11 @@ static int _open_seekable2(OggVorbis_File *vf){ /* Get the offset of the last page of the physical bitstream, or, if we're lucky the last vorbis page of this link as most OggVorbis files will contain a single logical bitstream */ - end=_get_prev_page_serial(vf,vf->serialnos+2,vf->serialnos[1],&endserial,&endgran); + end=_get_prev_page_serial(vf,vf->end,vf->serialnos+2,vf->serialnos[1],&endserial,&endgran); if(end<0)return(end); /* now determine bitstream structure recursively */ - if(_bisect_forward_serialno(vf,0,dataoffset,vf->offset,endgran,endserial, + if(_bisect_forward_serialno(vf,0,dataoffset,end,endgran,endserial, vf->serialnos+2,vf->serialnos[1],0)<0)return(OV_EREAD); vf->offsets[0]=0; @@ -1055,7 +1054,11 @@ int ov_halfrate_p(OggVorbis_File *vf){ /* Only partially open the vorbis file; test for Vorbisness, and load the headers for the first chain. Do not seek (although test for seekability). Use ov_test_open to finish opening the file, else - ov_clear to close/free it. Same return codes as open. */ + ov_clear to close/free it. Same return codes as open. + + Note that vorbisfile does _not_ take ownership of the file if the + call fails; the calling applicaiton is responsible for closing the file + if this call returns an error. */ int ov_test_callbacks(void *f,OggVorbis_File *vf, const char *initial,long ibytes,ov_callbacks callbacks) @@ -1417,22 +1420,41 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ if(pos>=total)break; } - /* search within the logical bitstream for the page with the highest - pcm_pos preceding (or equal to) pos. There is a danger here; - missing pages or incorrect frame number information in the - bitstream could make our task impossible. Account for that (it - would be an error condition) */ + /* Search within the logical bitstream for the page with the highest + pcm_pos preceding pos. If we're looking for a position on the + first page, bisection will halt without finding our position as + it's before the first explicit granulepos fencepost. That case is + handled separately below. + + There is a danger here; missing pages or incorrect frame number + information in the bitstream could make our task impossible. + Account for that (it would be an error condition) */ + + /* new search algorithm originally by HB (Nicholas Vinen) */ - /* new search algorithm by HB (Nicholas Vinen) */ { ogg_int64_t end=vf->offsets[link+1]; - ogg_int64_t begin=vf->offsets[link]; + ogg_int64_t begin=vf->dataoffsets[link]; ogg_int64_t begintime = vf->pcmlengths[link*2]; ogg_int64_t endtime = vf->pcmlengths[link*2+1]+begintime; ogg_int64_t target=pos-total+begintime; - ogg_int64_t best=begin; + ogg_int64_t best=-1; + int got_page=0; ogg_page og; + + /* if we have only one page, there will be no bisection. Grab the page here */ + if(begin==end){ + result=_seek_helper(vf,begin); + if(result) goto seek_error; + + result=_get_next_page(vf,&og,1); + if(result<0) goto seek_error; + + got_page=1; + } + + /* bisection loop */ while(begin<end){ ogg_int64_t bisect; @@ -1447,51 +1469,80 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ bisect=begin; } - if(bisect!=vf->offset){ - result=_seek_helper(vf,bisect); - if(result) goto seek_error; - } + result=_seek_helper(vf,bisect); + if(result) goto seek_error; + /* read loop within the bisection loop */ while(begin<end){ result=_get_next_page(vf,&og,end-vf->offset); if(result==OV_EREAD) goto seek_error; if(result<0){ + /* there is no next page! */ if(bisect<=begin+1) - end=begin; /* found it */ + /* No bisection left to perform. We've either found the + best candidate already or failed. Exit loop. */ + end=begin; else{ + /* We tried to load a fraction of the last page; back up a + bit and try to get the whole last page */ if(bisect==0) goto seek_error; bisect-=CHUNKSIZE; + + /* don't repeat/loop on a read we've already performed */ if(bisect<=begin)bisect=begin+1; + + /* seek and cntinue bisection */ result=_seek_helper(vf,bisect); if(result) goto seek_error; } }else{ ogg_int64_t granulepos; + got_page=1; + /* got a page. analyze it */ + /* only consider pages from primary vorbis stream */ if(ogg_page_serialno(&og)!=vf->serialnos[link]) continue; + /* only consider pages with the granulepos set */ granulepos=ogg_page_granulepos(&og); if(granulepos==-1)continue; if(granulepos<target){ + /* this page is a successful candidate! Set state */ + best=result; /* raw offset of packet with granulepos */ begin=vf->offset; /* raw offset of next page */ begintime=granulepos; + /* if we're before our target but within a short distance, + don't bisect; read forward */ if(target-begintime>44100)break; - bisect=begin; /* *not* begin + 1 */ + + bisect=begin; /* *not* begin + 1 as above */ }else{ - if(bisect<=begin+1) - end=begin; /* found it */ - else{ - if(end==vf->offset){ /* we're pretty close - we'd be stuck in */ + + /* This is one of our pages, but the granpos is + post-target; it is not a bisection return + candidate. (The only way we'd use it is if it's the + first page in the stream; we handle that case later + outside the bisection) */ + if(bisect<=begin+1){ + /* No bisection left to perform. We've either found the + best candidate already or failed. Exit loop. */ + end=begin; + }else{ + if(end==vf->offset){ + /* bisection read to the end; use the known page + boundary (result) to update bisection, back up a + little bit, and try again */ end=result; - bisect-=CHUNKSIZE; /* an endless loop otherwise. */ + bisect-=CHUNKSIZE; if(bisect<=begin)bisect=begin+1; result=_seek_helper(vf,bisect); if(result) goto seek_error; }else{ + /* Normal bisection */ end=bisect; endtime=granulepos; break; @@ -1502,9 +1553,46 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ } } - /* found our page. seek to it, update pcm offset. Easier case than - raw_seek, don't keep packets preceding granulepos. */ - { + /* Out of bisection: did it 'fail?' */ + if(best == -1){ + + /* Check the 'looking for data in first page' special case; + bisection would 'fail' because our search target was before the + first PCM granule position fencepost. */ + + if(got_page && + begin == vf->dataoffsets[link] && + ogg_page_serialno(&og)==vf->serialnos[link]){ + + /* Yes, this is the beginning-of-stream case. We already have + our page, right at the beginning of PCM data. Set state + and return. */ + + vf->pcm_offset=total; + + if(link!=vf->current_link){ + /* Different link; dump entire decode machine */ + _decode_clear(vf); + + vf->current_link=link; + vf->current_serialno=vf->serialnos[link]; + vf->ready_state=STREAMSET; + + }else{ + vorbis_synthesis_restart(&vf->vd); + } + + ogg_stream_reset_serialno(&vf->os,vf->current_serialno); + ogg_stream_pagein(&vf->os,&og); + + }else + goto seek_error; + + }else{ + + /* Bisection found our page. seek to it, update pcm offset. Easier case than + raw_seek, don't keep packets preceding granulepos. */ + ogg_page og; ogg_packet op; @@ -1534,23 +1622,23 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ while(1){ result=ogg_stream_packetpeek(&vf->os,&op); if(result==0){ - /* !!! the packet finishing this page originated on a - preceding page. Keep fetching previous pages until we - get one with a granulepos or without the 'continued' flag - set. Then just use raw_seek for simplicity. */ - - result=_seek_helper(vf,best); - if(result<0) goto seek_error; - - while(1){ - result=_get_prev_page(vf,&og); + /* No packet returned; we exited the bisection with 'best' + pointing to a page with a granule position, so the packet + finishing this page ('best') originated on a preceding + page. Keep fetching previous pages until we get one with + a granulepos or without the 'continued' flag set. Then + just use raw_seek for simplicity. */ + /* Do not rewind past the beginning of link data; if we do, + it's either a bug or a broken stream */ + result=best; + while(result>vf->dataoffsets[link]){ + result=_get_prev_page(vf,result,&og); if(result<0) goto seek_error; if(ogg_page_serialno(&og)==vf->current_serialno && (ogg_page_granulepos(&og)>-1 || !ogg_page_continued(&og))){ return ov_raw_seek(vf,result); } - vf->offset=result; } } if(result<0){ @@ -2054,14 +2142,14 @@ long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int length, } } -extern float *vorbis_window(vorbis_dsp_state *v,int W); +extern const float *vorbis_window(vorbis_dsp_state *v,int W); static void _ov_splice(float **pcm,float **lappcm, int n1, int n2, int ch1, int ch2, - float *w1, float *w2){ + const float *w1, const float *w2){ int i,j; - float *w=w1; + const float *w=w1; int n=n1; if(n1>n2){ @@ -2169,7 +2257,7 @@ int ov_crosslap(OggVorbis_File *vf1, OggVorbis_File *vf2){ vorbis_info *vi1,*vi2; float **lappcm; float **pcm; - float *w1,*w2; + const float *w1,*w2; int n1,n2,i,ret,hs1,hs2; if(vf1==vf2)return(0); /* degenerate case */ @@ -2223,7 +2311,7 @@ static int _ov_64_seek_lap(OggVorbis_File *vf,ogg_int64_t pos, vorbis_info *vi; float **lappcm; float **pcm; - float *w1,*w2; + const float *w1,*w2; int n1,n2,ch1,ch2,hs; int i,ret; @@ -2284,7 +2372,7 @@ static int _ov_d_seek_lap(OggVorbis_File *vf,double pos, vorbis_info *vi; float **lappcm; float **pcm; - float *w1,*w2; + const float *w1,*w2; int n1,n2,ch1,ch2,hs; int i,ret; diff --git a/drivers/vorbis/window.c b/drivers/vorbis/window.c index efebbfa8a0..0305b79297 100644 --- a/drivers/vorbis/window.c +++ b/drivers/vorbis/window.c @@ -11,7 +11,7 @@ ******************************************************************** function: window functions - last mod: $Id: window.c 16227 2009-07-08 06:58:46Z xiphmont $ + last mod: $Id: window.c 19028 2013-12-02 23:23:39Z tterribe $ ********************************************************************/ @@ -19,6 +19,7 @@ #include <math.h> #include "os.h" #include "misc.h" +#include "window.h" static const float vwin64[32] = { 0.0009460463F, 0.0085006468F, 0.0235352254F, 0.0458950567F, diff --git a/drivers/vorbis/window.h b/drivers/vorbis/window.h index 192bd9cfe7..51f97599f5 100644 --- a/drivers/vorbis/window.h +++ b/drivers/vorbis/window.h @@ -11,14 +11,14 @@ ******************************************************************** function: window functions - last mod: $Id: window.h 13293 2007-07-24 00:09:47Z xiphmont $ + last mod: $Id: window.h 19028 2013-12-02 23:23:39Z tterribe $ ********************************************************************/ #ifndef _V_WINDOW_ #define _V_WINDOW_ -extern float *_vorbis_window_get(int n); +extern const float *_vorbis_window_get(int n); extern void _vorbis_apply_window(float *d,int *winno,long *blocksizes, int lW,int W,int nW); diff --git a/drivers/webp/image_loader_webp.cpp b/drivers/webp/image_loader_webp.cpp index 5fb14eaf7a..68bb857293 100644 --- a/drivers/webp/image_loader_webp.cpp +++ b/drivers/webp/image_loader_webp.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_webp.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* image_loader_webp.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "image_loader_webp.h" #include "print_string.h" diff --git a/drivers/webp/image_loader_webp.h b/drivers/webp/image_loader_webp.h index ea99a60676..24f79708db 100644 --- a/drivers/webp/image_loader_webp.h +++ b/drivers/webp/image_loader_webp.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_webp.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* image_loader_webp.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef IMAGE_LOADER_WEBP_H #define IMAGE_LOADER_WEBP_H diff --git a/drivers/webpold/image_loader_webp.cpp b/drivers/webpold/image_loader_webp.cpp index 5fb14eaf7a..68bb857293 100644 --- a/drivers/webpold/image_loader_webp.cpp +++ b/drivers/webpold/image_loader_webp.cpp @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_webp.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* image_loader_webp.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "image_loader_webp.h" #include "print_string.h" diff --git a/drivers/webpold/image_loader_webp.h b/drivers/webpold/image_loader_webp.h index ea99a60676..24f79708db 100644 --- a/drivers/webpold/image_loader_webp.h +++ b/drivers/webpold/image_loader_webp.h @@ -1,14 +1,31 @@ -/*************************************************/ -/* image_loader_webp.h */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2016 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ - +/*************************************************************************/ +/* image_loader_webp.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef IMAGE_LOADER_WEBP_H #define IMAGE_LOADER_WEBP_H diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 913ba1eb2b..fa18f7c1f5 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -191,23 +191,21 @@ Error DirAccessWindows::make_dir(String p_dir) { #else - p_dir=fix_path(p_dir); - - //p_dir.replace("/","\\"); + if (p_dir.is_rel_path()) + p_dir=get_current_dir().plus_file(p_dir); + else + p_dir=fix_path(p_dir); + p_dir = p_dir.replace("/","\\"); bool success; int err; - wchar_t real_current_dir_name[2048]; - GetCurrentDirectoryW(2048,real_current_dir_name); - - SetCurrentDirectoryW(current_dir.c_str()); + p_dir="\\\\?\\"+p_dir; //done according to +// https://msdn.microsoft.com/en-us/library/windows/desktop/aa363855(v=vs.85).aspx success=CreateDirectoryW(p_dir.c_str(), NULL); err = GetLastError(); - SetCurrentDirectoryW(real_current_dir_name); - if (success) { return OK; }; @@ -315,6 +313,7 @@ Error DirAccessWindows::remove(String p_path) { else p_path=fix_path(p_path); + printf("erasing %s\n",p_path.utf8().get_data()); //WIN32_FILE_ATTRIBUTE_DATA fileInfo; //DWORD fileAttr = GetFileAttributesExW(p_path.c_str(), GetFileExInfoStandard, &fileInfo); @@ -360,7 +359,8 @@ FileType DirAccessWindows::get_file_type(const String& p_file) const { size_t DirAccessWindows::get_space_left() { uint64_t bytes = 0; - GetDiskFreeSpaceEx(NULL,(PULARGE_INTEGER)&bytes,NULL,NULL); + if (!GetDiskFreeSpaceEx(NULL,(PULARGE_INTEGER)&bytes,NULL,NULL)) + return 0; //this is either 0 or a value in bytes. return (size_t)bytes; |