summaryrefslogtreecommitdiff
path: root/libavcodec/imcdata.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-05 22:43:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-06 01:08:33 +0200
commitad60b3b1811f6fce23baf8cf081f469244004aae (patch)
tree940b8fe92e81801860c5d010d3031e51cd02511a /libavcodec/imcdata.h
parent647e2e070f0dbb7055c3a1443de0f5ed3292e0cc (diff)
parentecf79c4d3e8baaf2f303278ef81db6f8407656bc (diff)
downloadffmpeg-ad60b3b1811f6fce23baf8cf081f469244004aae.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imcdata.h')
-rw-r--r--libavcodec/imcdata.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h
index 64e7c7185e..7d61a197a6 100644
--- a/libavcodec/imcdata.h
+++ b/libavcodec/imcdata.h
@@ -44,6 +44,25 @@ static const int8_t cyclTab2[32] = {
12, 13, 14, 15, 16, 17, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29};
+static const float iac_weights1[31] = {
+ 0.0538585, 0.0576251, 0.0645592, 0.0494032, 0.0428915, 0.0592188,
+ 0.0604145, 0.0673549, 0.0797351, 0.0972911, 0.119376, 0.144777,
+ 0.17181, 0.198625, 0.242918, 0.262113, 0.278434, 0.310752,
+ 0.319978, 0.328482, 0.354631, 0.380212, 0.388783, 0.400428,
+ 0.43096, 0.462397, 0.479469, 0.499329, 0.534526, 0.568631,
+ 0.589218
+};
+
+static const float iac_weights2[31] = {
+ 0.000375307, 0.000450455, 0.000612191, 0.000297262, 0.000202956,
+ 0.000484887, 0.000511777, 0.000686431, 0.00108256, 0.00185267,
+ 0.00321869, 0.00541861, 0.00860266, 0.012726, 0.0219151,
+ 0.0269104, 0.0316774, 0.0426107, 0.046113, 0.0494974,
+ 0.0608692, 0.0734633, 0.0780208, 0.0844921, 0.103034,
+ 0.124606, 0.137421, 0.153336, 0.184296, 0.217792,
+ 0.239742
+};
+
static const float imc_weights1[31] = {
0.119595, 0.123124, 0.129192, 9.97377e-2, 8.1923e-2, 9.61153e-2, 8.77885e-2, 8.61174e-2,
9.00882e-2, 9.91658e-2, 0.112991, 0.131126, 0.152886, 0.177292, 0.221782, 0.244917, 0.267386,