generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
69,256 Commits 24 Branches 241 Tags 173 MiB
449b21bfab
Commit Graph

160 Commits

Author SHA1 Message Date
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Michael Niedermayer
87f40364d1 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (21 commits)
  build: simplify commands for clean target
  swscale: split swscale.c in unscaled and generic conversion routines.
  swscale: cosmetics.
  swscale: integrate (literally) swscale_template.c in swscale.c.
  swscale: split out x86/swscale_template.c from swscale.c.
  swscale: enable hScale_altivec_real.
  swscale: split out ppc _template.c files from main swscale.c.
  swscale: remove indirections in ppc/swscale_template.c.
  swscale: split out unscaled altivec YUV converters in their own file.
  mpegvideoenc: fix multislice fate tests with threading disabled.
  mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
  build: Simplify texi2html invocation through the --output option.
  Mark some variables with av_unused
  Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().
  svq3: Check negative mb_type to fix potential crash.
  svq3: Move svq3-specific fields to their own context.
  rawdec: initialize return value to 0.
  Remove unused get_psnr() prototype
  rawdec: don't leak option strings.
  bktr: get default framerate from video standard.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-04 06:35:17 +02:00
Mans Rullgard
5e1166b31b Mark some variables with av_unused 
Most of these variables are only used in av_dlog statements, some
are required but not used by other macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-03 12:59:05 +01:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Vitor Sessak
9d35fa520e Add AVX FFT implementation. 
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-04-26 18:25:24 +02:00
Michael Niedermayer
d4a50a2100 Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-21 03:33:28 +01:00
Mans Rullgard
4538729afe Move sine windows to a separate file 
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-20 13:25:19 +00:00
Mans Rullgard
26f548bb59 fft: remove inline wrappers for function pointers 
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 19:49:18 +00: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
Justin Ruggles
a8ae4e0e7b Remove unneeded add bias from 3 functions. 
DSPContext.vector_fmul_window()
DCADSPContext.lfe_fir()
SynthFilterContext.synth_filter_float()

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 80ba1ddb58)
 2011-02-02 03:40:48 +01:00
Justin Ruggles
80ba1ddb58 Remove unneeded add bias from 3 functions. 
DSPContext.vector_fmul_window()
DCADSPContext.lfe_fir()
SynthFilterContext.synth_filter_float()

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-31 20:28:42 +00:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Sascha Sommer
f62be777ee support decoding of files that contain the number 
of vector coded coefficients in their bitstream
fixes issue 2536

Originally committed as revision 26388 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-16 16:39:53 +00:00
Sascha Sommer
f734671925 do not read over the end of the packet 
fixes issue 2543

Originally committed as revision 26367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 16:39:52 +00:00
Sascha Sommer
3cdf69eefa also support decoding of AVPackets with multiple wma packets 
fixes issue 2539

Originally committed as revision 26346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 23:58:55 +00:00
Sascha Sommer
75e4efd2a7 add support for blocksize 64 
fixes issue 2537 and 2538

Originally committed as revision 26328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 16:36:57 +00:00
Sascha Sommer
15a8bef0b6 skip unsupported postproc information 
Originally committed as revision 26268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-08 15:49:29 +00:00
Sascha Sommer
b86dd1bf6d add support for files that do not allow more than 4 subframes 
Originally committed as revision 26267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-08 15:38:14 +00:00
Sascha Sommer
d7fa58c049 fix indentation 
Originally committed as revision 26266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-08 15:35:56 +00:00
Sascha Sommer
8b5a780e73 add support for files where the frames do not have a length prefix 
Originally committed as revision 26265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-08 15:32:31 +00:00
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Benoit Fouet
497d7991b5 Change a doxy comment to a normal one. 
Originally committed as revision 24662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-02 07:26:27 +00:00
Michael Niedermayer
a20df85886 Fix doxy that refers to the wrong variable. 
Originally committed as revision 24549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-27 15:54:26 +00:00
Ronald S. Bultje
b1078e9fe6 Move clipping of audio samples (for those codecs outputting float) from decoder 
to the audio conversion routines.

Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 17:57:48 +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
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Ronald S. Bultje
8ff5d1f319 Simplify interleaving code. 
Originally committed as revision 22719 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-29 17:37:03 +00:00
Stefano Sabatini
c5c20ae436 Make wmaprodec.c:decode_init() return AVERROR_INVALIDDATA / 
AVERROR_PATCHWELCOME in case of invalid / unsupported number of
channels specified, rather than return AVERROR_NOTSUPP.

Originally committed as revision 22674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-25 21:01:35 +00:00
Måns Rullgård
84dc2d8afa Remove DECLARE_ALIGNED_{8,16} macros 
These macros are redundant.  All uses are replaced with the generic
DECLARE_ALIGNED macro instead.

Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 14:24:59 +00:00
Måns Rullgård
c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Reimar Döffinger
14b8607065 Add support for hard-coded MDCT-related ff_sine_windows tables. 
Originally committed as revision 21108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 13:28:04 +00:00
Måns Rullgård
4df254f1f1 WMAPRO: use some type punning in decode_coeffs() 
Originally committed as revision 20284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 18:51:54 +00:00
Sascha Sommer
aac4b0a47e increase maximum compressed frame size 
fixes playback of piece.wmv

Originally committed as revision 20155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 10:01:23 +00:00
Sascha Sommer
037396d099 return AVERROR_INVALIDDATA when the bitstream could not be decoded 
Originally committed as revision 20154 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 09:44:05 +00:00
Måns Rullgård
076a9dea1e WMA: store level_table as floats, use type punning for sign flip in decode 
Originally committed as revision 20078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 10:38:34 +00:00
Måns Rullgård
d975e5e9b7 WMAPRO: use vector_fmul_scalar from dsputil where possible 
Originally committed as revision 20056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 08:16:50 +00:00
Måns Rullgård
01b2214758 Merge FFTContext and MDCTContext 
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-20 17:30:20 +00:00
Sascha Sommer
d859bb1db0 Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframes 
per AVPacket
No longer print "Multiple frames in a packet" error message
when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack)

Originally committed as revision 19881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 15:08:26 +00:00
Vitor Sessak
6776061b04 Add two more sizes to ff_sine_windows[] and also pad it with NULLs so 
that FF_ELEMS(ff_sine_windows[x]) == 1 << x.

Fix issue 1384.

Originally committed as revision 19862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 16:18:16 +00:00
Sascha Sommer
bc7f96b184 reinit get_bits for every decode_packet call 
Originally committed as revision 19822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-11 15:59:27 +00:00
Sascha Sommer
5f28b5e750 do not decode more than one audio frame in a decode packet call 
Originally committed as revision 19778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 08:16:26 +00:00
Sascha Sommer
7dca334da2 avoid extra memcpy during scale factor decoding 
Originally committed as revision 19777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 06:56:25 +00:00
Sascha Sommer
bbb0bdd533 fix handling of packet loss when the output buffer is full 
Originally committed as revision 19766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 10:59:09 +00:00
Sascha Sommer
9244370a7c reindent 
Originally committed as revision 19765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 10:18:23 +00:00
Sascha Sommer
42ea968188 remove no longer needed debug output 
Originally committed as revision 19764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 10:11:04 +00:00
Sascha Sommer
7551a55948 reduce output buffer needs 
(fixes playback of some multichannel files)

Originally committed as revision 19763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 10:07:55 +00:00
Sascha Sommer
2016932472 store packet GetBitContext in the decoder context 
Originally committed as revision 19762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-05 09:56:06 +00:00
Diego Biurrun
e0b1d6605b cosmetics: indentation and other prettyprinting fixes 
Originally committed as revision 19753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-02 18:03:13 +00:00
Sascha Sommer
c1061cc7f7 add missing wmapro decoder parts 
Originally committed as revision 19752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-02 16:41:49 +00:00
Diego Biurrun
ae9253151f whitespace cosmetics 
Originally committed as revision 19725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 23:12:41 +00:00
Sascha Sommer
85fecafe49 add decode_coeffs() 
Originally committed as revision 19719 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 21:23:21 +00:00
Sascha Sommer
f53e96ed41 merge 2-channel M/S stereo decoding code with the multichannel version 
Originally committed as revision 19718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-26 21:18:54 +00:00
Diego Biurrun
b979e4a289 whitespace cosmetics 
Originally committed as revision 19703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-25 20:02:30 +00:00
Sascha Sommer
31c57185c5 Add some more wmapro decoder hunks 
Originally committed as revision 19678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-21 16:54:42 +00:00
Diego Biurrun
b25a881851 cosmetics: K&R coding style, prettyprinting 
Originally committed as revision 19564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-02 13:35:42 +00:00
Sascha Sommer
da136c7e05 add approved hunks of the wmapro decoder 
Originally committed as revision 19563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-02 12:57:07 +00:00