generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  float-dsp-test: do not use C99's predefined  __func__

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-20 12:53:20 +01:00
commit 3d04b1aab1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavutil/float_dsp.c
View File

@ -221,7 +221,7 @@ static int test_vector_fmul(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp,
fdsp->vector_fmul(odst, v1, v2, LEN); fdsp->vector_fmul(odst, v1, v2, LEN);
if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "vector_fmul failed\n");
return ret; return ret;
} }
@ -241,7 +241,7 @@ static int test_vector_fmac_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c
fdsp->vector_fmac_scalar(odst, src0, scale, LEN); fdsp->vector_fmac_scalar(odst, src0, scale, LEN);
if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMAC_SCALAR_CONST)) if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMAC_SCALAR_CONST))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "vector_fmac_scalar failed\n");
return ret; return ret;
} }
@ -257,7 +257,7 @@ static int test_vector_fmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c
fdsp->vector_fmul_scalar(odst, v1, scale, LEN); fdsp->vector_fmul_scalar(odst, v1, scale, LEN);
if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "vector_fmul_scalar failed\n");
return ret; return ret;
} }
@ -273,7 +273,7 @@ static int test_vector_dmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c
fdsp->vector_dmul_scalar(odst, v1, scale, LEN); fdsp->vector_dmul_scalar(odst, v1, scale, LEN);
if (ret = compare_doubles(cdst, odst, LEN, DBL_EPSILON)) if (ret = compare_doubles(cdst, odst, LEN, DBL_EPSILON))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "vector_dmul_scalar failed\n");
return ret; return ret;
} }
@ -290,7 +290,7 @@ static int test_vector_fmul_window(AVFloatDSPContext *fdsp, AVFloatDSPContext *c
fdsp->vector_fmul_window(odst, v1, v2, v3, LEN / 2); fdsp->vector_fmul_window(odst, v1, v2, v3, LEN / 2);
if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_WINDOW_CONST)) if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_WINDOW_CONST))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "vector_fmul_window failed\n");
return ret; return ret;
} }
@ -307,7 +307,7 @@ static int test_vector_fmul_add(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp
fdsp->vector_fmul_add(odst, v1, v2, v3, LEN); fdsp->vector_fmul_add(odst, v1, v2, v3, LEN);
if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_ADD_CONST)) if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_ADD_CONST))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "vector_fmul_add failed\n");
return ret; return ret;
} }
@ -323,7 +323,7 @@ static int test_vector_fmul_reverse(AVFloatDSPContext *fdsp, AVFloatDSPContext *
fdsp->vector_fmul_reverse(odst, v1, v2, LEN); fdsp->vector_fmul_reverse(odst, v1, v2, LEN);
if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "vector_fmul_reverse failed\n");
return ret; return ret;
} }
@ -347,7 +347,7 @@ static int test_butterflies_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *cd
if ((ret = compare_floats(cv1, ov1, LEN, FLT_EPSILON)) || if ((ret = compare_floats(cv1, ov1, LEN, FLT_EPSILON)) ||
(ret = compare_floats(cv2, ov2, LEN, FLT_EPSILON))) (ret = compare_floats(cv2, ov2, LEN, FLT_EPSILON)))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "butterflies_float failed\n");
return ret; return ret;
} }
@ -363,7 +363,7 @@ static int test_scalarproduct_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *
oprod = fdsp->scalarproduct_float(v1, v2, LEN); oprod = fdsp->scalarproduct_float(v1, v2, LEN);
if (ret = compare_floats(&cprod, &oprod, 1, ARBITRARY_SCALARPRODUCT_CONST)) if (ret = compare_floats(&cprod, &oprod, 1, ARBITRARY_SCALARPRODUCT_CONST))
av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); av_log(NULL, AV_LOG_ERROR, "scalarproduct_float failed\n");
return ret; return ret;
} }