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
d303e0affd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  simple_idct: simplify some ifdeffery
  simple_idct: remove code for DCTELEM != int16
  Remove VLAs in ff_amrwb_lsp2lpc()
  fate: make vsynth tests depend on only the relevant vref
  rtsp: remove disabled code
  dsputil: restore mistakenly removed hunk of disabled code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-19 18:46:04 +02:00
Mans Rullgard
3f5dcde7e6 Remove VLAs in ff_amrwb_lsp2lpc()
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-18 18:48:13 +01:00
Michael Niedermayer
686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
Diego Biurrun
adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-24 00:37:49 +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
Marcelo Galvăo Póvoa
48ac225db2 Move lsp2lpc_sipr() function to common code so it can be reused in a
AMRWB decoder.

Patch by Marcelo Galvăo Póvoa.

Originally committed as revision 25062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 20:46:29 +00:00
Marcelo Galvăo Póvoa
1d96cc0865 Move AMRNB lsf2lsp() function to common code for using in future AMRWB decoder.
Patch by Marcelo Galvăo Póvoa

Originally committed as revision 25061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 20:44:41 +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
4563de772c Restore mistakenly removed [in]/[out] Doxygen parameter attributes.
Originally committed as revision 24241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 21:22:06 +00:00
Diego Biurrun
8d84a909c3 Fix the signature of ff_set_min_dist_lsf() to match the implementation
and add doxy for the size parameter.

Originally committed as revision 23986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 12:26:22 +00:00
Diego Biurrun
3fa7626863 Avoid square brackets in Doxygen comments; Doxygen chokes on them.
Originally committed as revision 23979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:44:58 +00:00
Diego Biurrun
09f6a45dc2 Remove non-existing stray arguments from Doxygen function documentation.
Originally committed as revision 23976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:19:29 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Måns Rullgård
164d166e85 lsp: convert variable-length arrays to fixed size
Max LP order is defined to be 16, fixed-size buffers are OK.

Originally committed as revision 23795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 14:34:12 +00:00
Vitor Sessak
691a4232ee Make lsp2polyf() function non-static for upcoming usage in SIPR
Originally committed as revision 20602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-24 16:58:50 +00:00
Vitor Sessak
419b2be813 Make sorting function used in TwinVQ a shared function
Originally committed as revision 20584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 22:25:58 +00:00
Vitor Sessak
f2b7ce8ae6 Use doubles in ff_set_min_dist_lsf(). After this patch, AMR can use this
function with no change in output.

Originally committed as revision 20511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 11:00:50 +00:00
Vitor Sessak
00fa73f052 Avoid variable-length array use in ff_acelp_lspd2lpc()
Originally committed as revision 20496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-10 04:17:18 +00:00
Vitor Sessak
e26d131845 Do not hardcode filter order in ff_acelp_lspd2lpc()
Originally committed as revision 20485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-09 12:06:19 +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
Colin McQuillan
33ae681f5c Expose QCELP's floating-point LSP-to-LPC function
qcelp_lsp exported a single function, ff_acelp_lspd2lpc, which was not
specific to qcelp. It can be kept with its fixed-point version
ff_acelp_lsp2lpc in lpc.c.

Patch by Colin McQuillan ( m.niloc googlemail com )

Originally committed as revision 19571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-03 08:37:02 +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
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
Vladimir Voroshilov
3f3865d30b Replace hardcoded LP filter order with parameter.
This will allow to reuse the code in the SIPR decoder.

Originally committed as revision 13108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 03:18:18 +00:00
Måns Rullgård
7c43009358 add necessary #includes in headers
Originally committed as revision 13043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 13:29:39 +00:00
Diego Biurrun
3ddf7fe945 Use filename as multiple inclusion guard.
Originally committed as revision 13004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:01:07 +00:00
Robert Swain
80b1e6cc1f Grammar fixes and improvements for the new ACELP code
Originally committed as revision 13000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 15:20:06 +00:00
Vladimir Voroshilov
8726882993 Fixed-point LSP and LPC decoding routines for ACELP-based codecs
Originally committed as revision 12978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 11:52:33 +00:00