Michael Niedermayer
3a2d1465c8
Merge commit '2d60444331fca1910510038dd3817bea885c2367'
...
* commit '2d60444331fca1910510038dd3817bea885c2367':
dsputil: Split motion estimation compare bits off into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/dvenc.c
libavcodec/error_resilience.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/me_cmp.c
libavcodec/me_cmp.h
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 23:27:40 +02:00
James Almer
3ab4f96a91
motion-test: force C functions for the reference C context
...
It was instead using the highest available asm functions, which completely
kills the point of being a reference C context.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-04 00:48:28 +02:00
Olivier Langlois
b052bccbe4
lavc: Use av_gettime_relative()
...
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-17 15:51:49 +02:00
Michael Niedermayer
5bcb379ffe
motion-test: fix warning: dsp_mask is deprecated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26 02:49:05 +01:00
Michael Niedermayer
bfcc21a472
libavcodec/motion-test: set the bitexact flag
...
this is needed for testing mmx2 functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26 02:48:18 +01:00
Michael Niedermayer
e576105d84
motion-test: zero dsp context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 01:44:35 +02:00
Michael Niedermayer
f9b0694cc8
motion-test: fix height parameter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-07 23:31:27 +02:00
Michael Niedermayer
c868219c9a
lavc: put motion test back.
...
While not that usefull, we can as well keep it until it breaks.
When it breaks for whatever reason ill likely remove it
Sorry for the revert spam, i had not realized this code compiles
and works fine.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-03 23:23:40 +02:00
Diego Biurrun
13b6b7e0e2
Delete motion-test tool; it is of doubtful utility.
2012-09-03 10:43:21 +02:00
Martin Storsjö
3ad9eac5a0
testprogs: Remove unused includes
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-29 00:23:51 +03:00
Martin Storsjö
1d9c2dc89a
Don't include common.h from avutil.h
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-15 22:32:06 +03:00
Diego Biurrun
239fdf1b4a
x86: build: replace mmx2 by mmxext
...
Refactoring mmx2/mmxext YASM code with cpuflags will force renames.
So switching to a consistent naming scheme beforehand is sensible.
The name "mmxext" is more official and widespread and also the name
of the CPU flag, as reported e.g. by the Linux kernel.
2012-08-03 22:51:05 +02:00
Anton Khirnov
82f82ccfc8
motion-test: do not use getopt()
...
It is not available on all systems and using argc/argv directly actually
makes the code simpler.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-07-09 17:20:52 +02:00
Mans Rullgard
980f81d961
Use av_gettime() in various places
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-20 17:09:03 +01:00
Diego Biurrun
5aad8e80a7
motion-test: remove disabled code
2012-05-14 15:38:43 +02:00
Martin Storsjö
9cf0841ef3
dsputil: Add ff_ prefix to the dsputil*_init* functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-02-15 22:06:34 +02:00
Diego Biurrun
4dccfff9dd
tests/examples: Mark some variables only used within their files as static.
2011-12-08 01:01:00 +01:00
Diego Biurrun
9a5d6c23c5
tests/tools/examples: Replace direct exit() calls by return.
2011-12-08 01:00:58 +01:00
Diego Biurrun
f36b390275
Replace some forgotten FFmpeg references by Libav.
2011-11-02 10:42:55 +01:00
Anton Khirnov
71a861cf40
lavc: make avcodec_alloc_context3 officially public.
...
Deprecate avcodec_alloc_context/2.
2011-07-10 17:09:28 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Stefano Sabatini
7160bb716b
Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_
...
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.
Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-04 09:59:08 +00:00
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Diego Biurrun
64bde1974b
cosmetics: Rename prn variable to prng (Pseudo Random Number Generator).
...
Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 17:23:38 +00:00
Diego Biurrun
e4732ba98b
Fix sigill on non-MMX2 CPUs.
...
Originally committed as revision 18410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 11:29:51 +00:00
Stefano Sabatini
6b4343616c
Rename FF_MM_MMXEXT to FF_MM_MMX2, for both clarity and consistency
...
with libswscale.
Originally committed as revision 18330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-04 13:20:53 +00:00
Diego Biurrun
504ffed19f
Mark non-exported functions in test and example programs as static.
...
Originally committed as revision 18259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-31 09:32:59 +00:00
Diego Biurrun
294eaa2643
Replace random() usage in test programs by av_lfg_*().
...
Originally committed as revision 18070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 11:48:27 +00:00
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Diego Biurrun
99ed41a808
Fix filenames in Doxygen comments.
...
Originally committed as revision 16811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 22:51:16 +00:00
Baptiste Coudurier
70a61f8cf7
remove useless mmx.h include
...
Originally committed as revision 15820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 02:49:23 +00:00
Vitor Sessak
52b541ad79
spelling
...
Originally committed as revision 11122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 22:21:04 +00:00
Panagiotis Issaris
cc61f96f8a
Fix the compilation of dct-test, fft-test and motion-test which are using
...
random().
Originally committed as revision 9754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 08:46:28 +00:00
Ronald S. Bultje
097e1da470
Adapt to API changes, fix compilation.
...
patch by Ronald S. Bultje, rbultje ronald.bitfreak net
Originally committed as revision 9266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 13:54:11 +00:00
Ronald S. Bultje
bcbd6603dd
emms --> emms_c, taken from a patch by Ronald Bultje
...
Originally committed as revision 9253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 21:31:26 +00:00
Diego Biurrun
86c33b29d2
Rename motion_test.c to motion-test.c, which is the naming scheme used by all
...
other test programs. As a positive sideeffect, this makes the build system try
to actually create the executable file.
Originally committed as revision 9086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 07:11:27 +00:00