[FFmpeg-cvslog] cos_tablegen: Don't use lrint
Derek Buitenhuis
git at videolan.org
Wed Oct 16 11:04:38 CEST 2013
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Jan 15 16:09:00 2013 -0500| [479a52795526a5ad6628e37d9614dee5e32dc773] | committer: Derek Buitenhuis
cos_tablegen: Don't use lrint
You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=479a52795526a5ad6628e37d9614dee5e32dc773
---
libavcodec/cos_tablegen.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/libavcodec/cos_tablegen.c b/libavcodec/cos_tablegen.c
index 8a90857..9cf9cef 100644
--- a/libavcodec/cos_tablegen.c
+++ b/libavcodec/cos_tablegen.c
@@ -37,11 +37,16 @@ static int clip_f15(int v)
static void printval(double val, int fixed)
{
- if (fixed)
- printf(" "FIXEDFMT",", clip_f15(lrint(val * (double)(1<<15))));
- else
- printf(" "FLOATFMT",", val);
+ if (fixed) {
+ /* lrint() isn't always available, so round and cast manually. */
+ double new_val = val * (double) (1 << 15);
+
+ new_val = new_val >= 0 ? floor(new_val + 0.5) : ceil(new_val - 0.5);
+ printf(" "FIXEDFMT",", clip_f15((long int) new_val));
+ } else {
+ printf(" "FLOATFMT",", val);
+ }
}
int main(int argc, char *argv[])
More information about the ffmpeg-cvslog
mailing list