Commit Graph

128 Commits

Author SHA1 Message Date
Michael Niedermayer
41f55277fa Merge remote-tracking branch 'qatar/master'
* qatar/master: (34 commits)
  h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
  error_resilience: fix the check for missing references in ff_er_frame_end() for H264
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  AVOptions: refactor set_number/write_number
  AVOptions: cosmetics, rename static av_set_number2() to write_number().
  AVOptions: cosmetics, move and rename static av_set_number().
  AVOptions: split av_set_string3 into opt type-specific functions
  avidec: fix signed overflow in avi_sync()
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  ...

Conflicts:
	Changelog
	configure
	libavcodec/ptx.c
	libavcodec/ra144.c
	libavcodec/vaapi_vc1.c
	libavcodec/vc1.c
	libavcodec/version.h
	libavformat/4xm.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-11 03:42:43 +02:00
Justin Ruggles
8f8f5ae991 ra288: log an error message when output buffer is too small.
also return AVERROR(EINVAL) instead of -1.
2011-10-10 11:38:58 -04:00
Justin Ruggles
fa6be04bf7 ra288: use a more descriptive calculation for output data size 2011-10-10 11:38:58 -04:00
Michael Niedermayer
eae3cf06a5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  flvdec: Fix invalid pointer deferences when parsing index
  configure: disable hardware capabilities ELF section with suncc on Solaris x86
  Use explicit struct initializers for AVCodec declarations.
  Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
  adpcmenc: Set bits_per_coded_sample
  adpcmenc: fix QT IMA ADPCM encoder
  adpcmdec: Fix QT IMA ADPCM decoder
  permit decoding of multichannel ADPCM_EA_XAS
  Fix input buffer size check in adpcm_ea decoder.
  fft: avoid a signed overflow
  mpegps: Handle buffer exhaustion when reading packets.

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavdevice/alsa-audio-enc.c
	libavformat/flvdec.c
	libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 22:39:52 +02:00
Diego Biurrun
8671488799 Use explicit struct initializers for AVCodec declarations. 2011-09-24 12:11:19 +02:00
Michael Niedermayer
aae1c247b1 ra288: avoid one multiply
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-09 15:08:20 +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 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
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
Måns Rullgård
0b37cccaab ra288: convert VLAs to fixed size
Originally committed as revision 23832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 19:30:31 +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
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
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Vitor Sessak
66d4c62806 Do not reimplement ff_celp_lp_synthesis_filterf().
Originally committed as revision 17562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 18:11:42 +00:00
Vitor Sessak
08c433972e Use ff_dot_productf() in ra288.c
Originally committed as revision 15757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-30 22:24:40 +00:00
Vitor Sessak
d552d04dc9 Simplify: avoid duplication backward_filter()
Originally committed as revision 15428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 18:42:06 +00:00
Vitor Sessak
64e4af2ac1 Do instead of divising a float by a constant, multiply by its inverse
Originally committed as revision 15417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-25 20:03:57 +00:00
Vitor Sessak
b6c7758168 Move constant multiplication out of the loop
Originally committed as revision 15404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 20:31:24 +00:00
Vitor Sessak
e60daa340b Cosmetics: move convolve() together with the other DSP functions
Originally committed as revision 15403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 20:05:22 +00:00
Vitor Sessak
a987a126fd Simplify: move division by constant off the loop
Originally committed as revision 15402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 20:03:58 +00:00
Michael Niedermayer
645a6be1e7 Merge the 2 lpc loops.
This changes the output by (stddev:    0.21 PSNR:109.51, file:ddinterview28.ra),
the changes are due to float rounding inaccuracies and do not happen if doubles
are used.

Originally committed as revision 15394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-23 23:16:48 +00:00
Michael Niedermayer
571bbaf814 Factorize lpc code slightly.
Originally committed as revision 15393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-23 22:49:22 +00:00
Vitor Sessak
faf6d6964b Use SAMPLE_FMT_FLT instead of doing the float->int conversion in the
decoder. This changes the output very little and any difference should
be inaudible.

Originally committed as revision 15343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-17 19:26:37 +00:00
Vitor Sessak
9547cadb8d Cosmetics: line breaks
Originally committed as revision 15308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-13 16:56:58 +00:00
Vitor Sessak
111734de09 Simplify: use a single history buffer for gain and a single one for
speech instead of having two for each in the context.

Originally committed as revision 15307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-13 16:49:05 +00:00
Vitor Sessak
9c10ab6cd1 Cosmetics: align spec references
Originally committed as revision 15300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 19:10:26 +00:00
Vitor Sessak
5381a00a2b Rename function: s/colmult/apply_window/
Originally committed as revision 15299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 19:06:54 +00:00
Diego Biurrun
36b3e36e00 misc spelling/wording/grammar fixes
Originally committed as revision 15296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 08:13:23 +00:00
Vitor Sessak
fd8897e803 Convert table to integer.
Originally committed as revision 15292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-10 19:00:02 +00:00
Vitor Sessak
1be0fc2909 Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
Originally committed as revision 15193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 11:03:14 +00:00
Vitor Sessak
8089c652a7 Check *data_size in decode_frame()
Originally committed as revision 14636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 03:00:15 +00:00
Vitor Sessak
5991704634 Cosmetics: alignment
Originally committed as revision 14635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 02:49:22 +00:00
Vitor Sessak
e3751aa6ec Flip (by making buf[i] -> buf[size-i-1]) two buffers: {sp,gain}_block. This
needs duplicating a few loops, but now the code is clearer.

Originally committed as revision 14634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 02:44:59 +00:00
Vitor Sessak
6888b4fcec Rename prodsum() function to convolve()
Originally committed as revision 14615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 04:52:33 +00:00
Peter Ross
fd76c37fd9 Modify all codecs to report their supported input and output sample format(s).
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +00:00
Vitor Sessak
4ca7e74c1f Do not declare a counter as unsigned when it is not needed
Originally committed as revision 14469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 18:22:31 +00:00
Vitor Sessak
4e33ed368a Cosmetics: rename loop counter vars to i,j
Originally committed as revision 14468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 18:20:49 +00:00
Vitor Sessak
045e21cc19 Cosmetics: new line
Originally committed as revision 14457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 10:49:44 +00:00
Vitor Sessak
e7e4f476c0 Remove the now useless phase variable from context
Originally committed as revision 14456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 10:49:14 +00:00
Vitor Sessak
c749f3db98 Cosmetics: make comment match var name
Originally committed as revision 14454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 05:18:39 +00:00
Vitor Sessak
6509507fad Cosmetics: align comments
Originally committed as revision 14453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 05:16:51 +00:00
Vitor Sessak
f285e6dd31 Rename two context vars: s/sb/sp_block/, s/lhist/gain_block/
Originally committed as revision 14452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:53:05 +00:00
Vitor Sessak
36826ee0df Declare temporary buffers to be only of the necessary size
Originally committed as revision 14451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:37:58 +00:00
Vitor Sessak
5e707c5905 Remove redundant comments
Originally committed as revision 14450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:25:51 +00:00
Vitor Sessak
c6ad13044a Cosmetics: do not align with now removed next instruction
Originally committed as revision 14449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:24:08 +00:00
Vitor Sessak
2c46367163 Cosmetics: remove braces and useless newline
Originally committed as revision 14448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:07:18 +00:00
Vitor Sessak
2b356efec2 Change the way the input is passed to do_hybrid_filter(). Before, in[0] was
the oldest input sample passed and in[n-1] was the latest. Now it is the
contrary. This allows making backward_filter() somewhat simpler.

Originally committed as revision 14447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 02:55:47 +00:00
Vitor Sessak
aed39f6c02 Remove RA288Context.output buffer. This buffer is just RA288Context.sb
backwards (output[i] == sb[N-i], where N is the buffer length).

This makes the code slower, this will be fixed in my next commit.

Originally committed as revision 14446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 02:53:07 +00:00