virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avdevice/timefilter: 2nd try at avoiding rounding issues

Browse Source 
This hopefully fixes fate-timefilter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-03 16:13:03 +02:00
parent d6fd1242f3
commit bc4e798562
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/timefilter.c
View File

@ -101,7 +101,7 @@ int main(void)
for (n0 = 0; n0 < 40; n0 = 2 * n0 + 1) { for (n0 = 0; n0 < 40; n0 = 2 * n0 + 1) {
for (n1 = 0; n1 < 10; n1 = 2 * n1 + 1) { for (n1 = 0; n1 < 10; n1 = 2 * n1 + 1) {
double best_error = 1000000000; double best_error = 1000000000;
double bestpar0 = 1; double bestpar0 = n0 ? 1 : 100000;
double bestpar1 = 1; double bestpar1 = 1;
int better, i; int better, i;
@ -118,8 +118,7 @@ int main(void)
double par0, par1; double par0, par1;
better = 0; better = 0;
for (par0 = bestpar0 * 0.8; par0 <= bestpar0 * 1.21; par0 += bestpar0 * 0.05) { for (par0 = bestpar0 * 0.8; par0 <= bestpar0 * 1.21; par0 += bestpar0 * 0.05) {
double range = n0 ? 0.8 : 1.0; for (par1 = bestpar1 * 0.8; par1 <= bestpar1 * 1.21; par1 += bestpar1 * 0.05) {
for (par1 = bestpar1 * range; par1 <= bestpar1 * (2.01 - range); par1 += bestpar1 * 0.05) {
double error = 0; double error = 0;
TimeFilter *tf = ff_timefilter_new(1, par0, par1); TimeFilter *tf = ff_timefilter_new(1, par0, par1);
for (i = 0; i < SAMPLES; i++) { for (i = 0; i < SAMPLES; i++) {

2
tests/ref/fate/timefilter
View File

@ -1,4 +1,4 @@
[ 0.800000 1.000000 0.000000] [ 1689.810931 1.000000 0.000000] [ 2480.175715 1.000000 0.000000] [ 3323.672664 1.000000 0.000000] [80000.000000 0.800000 0.000000] [80000.000000 0.800000 0.000000] [80000.000000 0.800000 0.000000] [80000.000000 0.800000 0.000000]
[ 1688.672234 0.000000 0.018551] [ 21.026792 0.000401 0.068856] [ 1.162481 0.008576 0.121287] [ 0.803356 0.016078 0.153518] [ 1688.672234 0.000000 0.018551] [ 21.026792 0.000401 0.068856] [ 1.162481 0.008576 0.121287] [ 0.803356 0.016078 0.153518]
[ 1218.378235 0.000000 0.167011] [ 12.908626 0.000281 0.296858] [ 21.026792 0.000401 0.619608] [ 2.064064 0.004760 1.020336] [ 1218.378235 0.000000 0.167011] [ 12.908626 0.000281 0.296858] [ 21.026792 0.000401 0.619608] [ 2.064064 0.004760 1.020336]
[ 1218.378235 0.000000 0.909282] [ 10.047626 0.000191 0.873495] [ 14.909464 0.000297 1.935407] [ 21.026792 0.000401 3.373312] [ 1218.378235 0.000000 0.909282] [ 10.047626 0.000191 0.873495] [ 14.909464 0.000297 1.935407] [ 21.026792 0.000401 3.373312]