1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

28 Commits

Author SHA1 Message Date
Michael Niedermayer
55c49afc42 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  yuv4mpeg: return proper error codes.
  Give all anonymously typedeffed structs in headers a name
  fate: Add parseutils test
  parseutils-test: Drop random colors from parsing test
  vf_pad/scale: use double precision for aspect ratios.
  build: error on variable-length arrays
  ppc: swscale: rework yuv2planeX_altivec()
  ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
  x86: dsputil: kill VLA in gmc_mmx()
  libspeexenc: Updated commentary to reflect recent changes
  libspeexenc: Add an option for enabling DTX
  doc/APIchanges: fill in missing dates and hashes.
  lavr: bump major to 1 and declare it stable.
  lavr: change the type of the data buffers to uint8_t**.
  lavc: deprecate the audio resampling API.

Conflicts:
	cmdutils.h
	configure
	doc/APIchanges
	ffplay.c
	libavcodec/dwt.h
	libavcodec/libspeexenc.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavformat/asf.h
	tests/fate/libavutil.mak
	tests/ref/fate/parseutils

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06 13:45:08 +02:00
Diego Biurrun
e4cbf7529b Give all anonymously typedeffed structs in headers a name
Anonymous structs cannot be forward declared and have no benefit.
2012-10-06 09:27:11 +02:00
Nedeljko Babic
3827a86eac Optimization of AMR NB and WB decoders for MIPS
AMR NB and WB decoders are optimized for MIPS architecture.
Appropriate Makefiles are changed accordingly.

Cnfigure script is changed in order to support optimizations.
 Optimizations are enabled by default when compiling is done for
  mips architecture.
 Appropriate cflags are automatically set.
 Support for several mips CPUs is added in configure script.

New ffmpeg options are added for disabling optimizations.

The FFMPEG option --disable-mipsfpu disables MIPS floating point
 optimizations.
The FFMPEG option --disable-mips32r2 disables MIPS32R2
 optimizations.
The FFMPEG option --disable-mipsdspr1 disables MIPS DSP ASE R1
 optimizations.
The FFMPEG option --disable-mipsdspr2 disables MIPS DSP ASE R2
 optimizations.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-11 21:12:39 +02:00
Michael Niedermayer
0b61af7382 Restore WIP g729 code that has been remvoed by diego biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 19:39:18 +02:00
Michael Niedermayer
f93f6963ba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rv30: return AVERROR(EINVAL) instead of EINVAL
  build: add -L flags before existing LDFLAGS
  simple_idct: whitespace cosmetics
  simple_idct: make repeated code a macro
  dsputil: remove huge #if 0 block
  simple_idct: change 10-bit add/put stride from pixels to bytes
  dsputil: allow 9/10-bit functions for non-h264 codecs
  dnxhd: rename some data tables
  dnxhdenc: remove inline from function only called through pointer
  dnxhdenc: whitespace cosmetics
  swscale: mark YUV422P10(LE,BE) as supported for output
  configure: add -xc99 to LDFLAGS for Sun CC
  Remove unused and non-compiling vestigial g729 decoder
  Remove unused code under G729_BITEXACT #ifdef.
  mpegvideo: fix invalid picture unreferencing.
  dsputil: Remove extra blank line at end.
  dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
  simple_idct: add 10-bit version

Conflicts:
	Makefile
	libavcodec/g729data.h
	libavcodec/g729dec.c
	libavcodec/rv30.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-21 16:28:53 +02:00
Diego Biurrun
79a9aab56f Remove unused and non-compiling vestigial g729 decoder 2011-07-20 20:47:07 +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
Diego Biurrun
0c733da8e2 Fix Doxygen @param command attribute syntax.
The [in] and [out] attributes have to be appended to the @param command.

Originally committed as revision 24283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 10:43:42 +00:00
Diego Biurrun
fd566520c7 Fix printing of '@' symbols in Doxygen comments; the correct syntax is '@@'.
Originally committed as revision 23973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:05:47 +00:00
Ronald S. Bultje
bb2dd9efd8 Split the input/output data arguments to ff_adaptive_gain_control().
Originally committed as revision 22932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 17:43:52 +00:00
Ronald S. Bultje
95c6b5ebc8 Fix spelling.
Originally committed as revision 22470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 17:42:53 +00:00
Ronald S. Bultje
5e4e9042c4 Add no_repeat_mask option, so that single-pulse vectors can also be
expressed in a AMRFixed structure and handled by ff_set_fixed_vector().

Originally committed as revision 21528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-29 16:49:06 +00:00
Diego Biurrun
43a6ca2c3d cosmetics: Reformat some function declarations.
Originally committed as revision 20918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-24 12:13:03 +00:00
Vitor Sessak
a8eb8de461 Add tables used by both AMR-NB and SIPR
Originally committed as revision 20897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-19 14:05:31 +00:00
Vitor Sessak
92f99a33b8 Commit functions used by both AMRNB and SIPR
Originally committed as revision 20805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 13:58:07 +00:00
Reynaldo H. Verdejo Pinochet
0c50f8e6cc Implement ff_scale_vector_to_given_sum_of_squares()
to aid generic gain control routines. Changes
for qcelp are included. Patch Collin McQuillan.

Originally committed as revision 20450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-04 19:29:29 +00:00
Vitor Sessak
504eee37de Commit some functions that are used by both SIPR and AMR.
Based on AMR SoC code by Robert Swain and Colin McQuillan.

Originally committed as revision 20392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-27 23:53:18 +00:00
Reynaldo H. Verdejo Pinochet
95e8325771 Functional part Kenan Gillet's 'extract and share weighted_vector_sumf'
patchset. Idea is to share this common code between the AMR and QCELP
decoders.

Originally committed as revision 17916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 21:55:24 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
Michael Niedermayer
474efc1889 Make equation in doxy of ff_acelp_weighted_vector_sum() more readable by
adding spaces.

Originally committed as revision 14902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:52:48 +00:00
Michael Niedermayer
27b71e4b24 doxygen consistency
Originally committed as revision 14901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:51:25 +00:00
Michael Niedermayer
6caabab8cd Make comments doxygen compatible.
Originally committed as revision 14900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:49:58 +00:00
Robert Swain
848eab4e0a Correct a couple of typos
Originally committed as revision 14176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 09:48:19 +00:00
Diego Biurrun
b11829a9d9 Add missing #includes to fix 'make checkheaders'.
Originally committed as revision 13776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 08:25:48 +00:00
Diego Biurrun
1384e27054 consistency cosmetics: indices --> indexes in variable names
Originally committed as revision 13446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:36:05 +00:00
Diego Biurrun
f4433de9ef consistency cosmetics: indices --> indexes
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:14:25 +00:00
Diego Biurrun
756a01f522 cosmetics: Use C-style comments in #endif directives.
Originally committed as revision 13442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:09:46 +00:00
Vladimir Voroshilov
5b2729cd0b adaptive and fixed codebook vector operations for ACELP-based codecs
Originally committed as revision 13244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 03:10:27 +00:00