virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
95,575 Commits 37 Branches 400 Tags 460 MiB
991cf95fde
Commit Graph

324 Commits

Author SHA1 Message Date
Justin Ruggles
ba5d2890d7 adpcm: simplify reading of Funcom ISS frame header. 2011-09-29 16:54:01 -04:00
Justin Ruggles
5c9eb4fabb adpcm: check buffer size in IMA DK4 decoder before reading header. 
Also use the post-header data size to control termination of the main
decoding loop.
 2011-09-29 16:54:01 -04:00
Justin Ruggles
a57ea1a87e adpcm: simplify reading of IMA DK4 frame header. 2011-09-29 16:54:01 -04:00
Justin Ruggles
8114f94ac9 adpcm_ms: clean up reading of predictor coefficients 2011-09-29 16:54:01 -04:00
Justin Ruggles
943f4db552 adpcm_4xm: process planar packets sequentially rather than simultaneously. 
Also properly clip the right channel step_index.
 2011-09-29 16:54:00 -04:00
Justin Ruggles
119974b164 adpcm_ima_wav: process channel-interleaved blocks sequentially rather than simultaneously. 
Speeds up the ADPCM IMA WAV decoder by 15-20% overall.
 2011-09-29 16:54:00 -04:00
Justin Ruggles
7c287b18a0 adpcm: update reference links 
Add Multimedia Wiki link.
Mark dead links with [dead]. Some can still be accessed through archive.org.
Update URLs for pages which have moved.
Replace duplicated links in adpcmenc.c with a note to see the ADPCM decoder
reference documents.
 2011-09-29 16:54:00 -04:00
Justin Ruggles
ac94b8bcc6 adpcm: simplify packet size bounds checking in the ADPCM IMA QT decoder. 
This is easier to understand. It also avoids returning existing samples mixed
with new samples when the packet is too small.
 2011-09-29 16:54:00 -04:00
Justin Ruggles
de0b586a87 adpcm: simplify and speed up several ADPCM decoders. 2011-09-29 16:54:00 -04:00
Justin Ruggles
5a9ed7c110 adpcm: pretty-print tables 2011-09-29 16:54:00 -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
Baptiste Coudurier
bf334535b4 adpcmdec: Fix QT IMA ADPCM decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-23 20:54:28 -04:00
Peter Ross
3a549eb82b permit decoding of multichannel ADPCM_EA_XAS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-23 20:54:28 -04:00
Reimar Döffinger
ffe92ff9f0 Fix input buffer size check in adpcm_ea decoder. 
Unfortunately the output buffer size check assumes that the
input buffer is never over-consumed, thus this actually
also allowed to write outside the output buffer if "lucky".

Based on:
git.videolan.org/ffmpeg.git
commit 701d0eb185
 2011-09-23 20:54:28 -04:00
Michael Niedermayer
9765caec1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:01:12 +02:00
Justin Ruggles
826c56d16e adpcm: split ADPCM encoders and decoders into separate files. 
Move shared tables to a separate file as well.
 2011-09-12 11:26:11 -04:00
Carl Eugen Hoyos
eb29649cad Set bits_per_coded_sample when encoding ADPCM. 2011-08-03 11:45:33 +02:00
Michael Niedermayer
af3c8f8230 adpcmenc:Optimize adpcm_ima_qt_compress_sample() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-08 13:21:51 +02:00
Baptiste Coudurier
35d3d44a84 adpcmenc: fix QT IMA ADPCM encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-08 13:15:48 +02:00
Baptiste Coudurier
b3d5a4b06e adpcmdec: Fix QT IMA ADPCM decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-08 13:13:17 +02:00
Peter Ross
b678d6db95 permit decoding of multichannel ADPCM_EA_XAS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-24 03:51:52 +02:00
Reimar Döffinger
701d0eb185 Fix input buffer size check in adpcm_ea decoder. 
Unfortunately the output buffer size check assumes that the
input buffer is never over-consumed, thus this actually
also allowed to write outside the output buffer if "lucky".
 2011-04-10 11:40:47 +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
Mans Rullgard
98ec828775 Remove final semicolon from some macros 
This avoids double semicolons after macro expansion.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44adbebe17)
 2011-02-11 02:54:10 +01:00
Mans Rullgard
44adbebe17 Remove final semicolon from some macros 
This avoids double semicolons after macro expansion.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-10 21:45:17 +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
Martin Storsjö
cfff297d98 adpcm: Skip samples whose ssd calculation has wrapped around 
Wraparound in ssd is mainly avoided by subtracting the ssd of the
best node from all the others once it has grown large enough.

If using very large trellis sizes (e.g. -trellis 15), the frontier
is so large that the difference between the best and the worst is
large enough to cause wraparound, even if the ssd of the best one
is subtracted regularly.

When using -trellis 10 on a 30 second sample, this causes only a slight
slowdown, from 61 to 64 seconds.

Originally committed as revision 25858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-01 08:57:45 +00:00
Martin Storsjö
1a68e7ed15 adpcm: Fix a comment in the trellis heap code 
This makes the wording consistent with how people usually talk about heaps.

Originally committed as revision 25775 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-20 11:24:19 +00:00
Martin Storsjö
78f9d35c9a adpcm: Only increment heap_pos after finding a good enough sample 
This increases the PSNR slightly (about 0.1 dB) for trellis sizes
below 8, and gives equal PSNR for sizes above that.

Originally committed as revision 25769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-19 17:36:29 +00:00
Martin Storsjö
d764e3ece9 adpcm: Use a hash table to improve checking for duplicate samples 
This lowers the run time from 158 to 21 seconds, for -trellis 8
with a 30 second sample on my machine.

This requires 64 KB additional memory.

Originally committed as revision 25768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-19 17:35:52 +00:00
Martin Storsjö
86abf868ec adpcm: Fix a comment 
Originally committed as revision 25751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-14 10:23:58 +00:00
Martin Storsjö
38b3bda18f adpcm: Replace any of the leaf nodes in the heap 
By not looking for the exactly largest node, we avoid an O(n) seek through
the leaf nodes. Just pick one (not the same one every time) and try replacing
that node with the new one.

For -trellis 8, this lowers the run time from 190 to 158 seconds,
for a 30 second 44 kHz mono sample, on my machine.

Originally committed as revision 25733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 12:30:27 +00:00
Martin Storsjö
4106b7f1cd Reindent 
Originally committed as revision 25732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 12:28:02 +00:00
Martin Storsjö
f82e8f3482 adpcm: Store the trellis nodes in a heap instead of a sorted array 
This avoids having to memmove the large parts of the array when inserting into
it.

For -trellis 8, this lowers the run time from 245 seconds to 190 seconds,
for a 30 second 44 kHz mono sample, on my machine.

Originally committed as revision 25731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 12:27:27 +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
Martin Storsjö
e0ae6c17fe Flush the PutBitsContext at the end of each block when encoding ADPCM IMA QT 
Originally committed as revision 24938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 07:39:34 +00:00
Carl Eugen Hoyos
b9542223a3 Only 4-bit ADPCM IMA WAV files are supported. 
Originally committed as revision 24493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-25 14:33:16 +00:00
Måns Rullgård
07ece20c69 adpcm: convert VLAs to malloc/free 
Originally committed as revision 23819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-27 09:44:10 +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
Michael Niedermayer
9f72b23c5c Revert Revision: 21362 
Log:
	Set CODEC_CAP_SUBFRAMES for adpcm decoders

	This makes ffmpeg stop printing millions of
	  Multiple frames in a packet from stream 0
	when decoding adpcm.
Reason: adpcm has no subframes, the flag does not belong there

Originally committed as revision 21481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 13:30:05 +00:00
Måns Rullgård
2a58e45724 Set CODEC_CAP_SUBFRAMES for adpcm decoders 
This makes ffmpeg stop printing millions of
  Multiple frames in a packet from stream 0
when decoding adpcm.

Originally committed as revision 21362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-21 12:57:24 +00:00
Daniel Verkamp
b74d42ee33 Build extradata in adpcm_ms encoder. 
This fixes issue #1244.

Originally committed as revision 20349 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-22 20:43:55 +00:00
Daniel Verkamp
bb7d0e87ae Indicate that AdaptCoeff1 and 2 are functions of the actual coefficients. 
Originally committed as revision 20345 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-22 15:57:04 +00:00
Reimar Döffinger
b5f09d31c2 Make sample_fmts and channel_layouts compound literals const to reduce size of 
.data section.

Originally committed as revision 19787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 09:15:07 +00:00
Måns Rullgård
6816f8b8e4 ADPCM: remove unreachable break statement after return 
Originally committed as revision 19312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-01 00:55:17 +00:00
Carl Eugen Hoyos
1efe9fd5c0 Fix indentation after last commit. 
Originally committed as revision 19238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 13:10:17 +00:00
Yoshihisa Uchida
d8b2d83473 Fix yamaha adpcm stereo (issue 1117). 
Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail

Originally committed as revision 19237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 13:07:21 +00:00
Vitor Sessak
6cf92f6d26 Check if there is enough bytes before reading the buffer in the EA ADPCM 
decoder. Fix issue 990.

Originally committed as revision 18707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-27 16:06:01 +00:00
Vitor Sessak
8a06cb14f9 Skip 0x0000 frame footer in EA ADPCM decoder. 
Originally committed as revision 18706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-27 16:04:43 +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
Stefano Sabatini
b275500706 Split bitstream.h, put the bitstream writer stuff in the new file 
put_bits.h.

Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 08:35: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
Diego Biurrun
fd75cedd15 cosmetics: Reformat long_names so that "ADPCM" comes first. 
Originally committed as revision 17720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 05:55:03 +00:00
Diego Biurrun
0ffbc258aa Change a bunch of codec long_names to be more consistent and descriptive. 
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 05:18:33 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions. 
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 13:48:55 +00:00
Stefan Gehrer
cc55c46498 check validity of pointer srcC 
Originally committed as revision 16973 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 17:56:24 +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
Stefan Gehrer
8915009813 remove duplicate tables 
Originally committed as revision 16866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 20:39:39 +00:00
Stefan Gehrer
2ed421134e avoid indeterminate order of accessing src 
Originally committed as revision 16855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 06:38:46 +00:00
Stefan Gehrer
055dc116fc added demuxer for FunCom ISS audio files, 
extended ADPCM decoder by ISS specific IMA variant

Originally committed as revision 16658 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 20:08:43 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +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
Ramiro Polla
6647ab80e3 bitstream: move put_sbits() from flacenc.c to bitstream.h and use it 
throughout libavcodec.

Originally committed as revision 14204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 14:27:48 +00:00
Reimar Döffinger
f9bd305694 clip MS ADPCM predictor range to correct [0..6] range, not [0..7] 
Originally committed as revision 14203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 14:25:31 +00:00
Reimar Döffinger
962fe7e1c4 Use bytestream and AV_RL* functions in ADPCM code where possible 
Originally committed as revision 14202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 14:12:51 +00:00
Reimar Döffinger
ae8afab998 Fix MS ADPCM de- and encoding: first and second sample are swapped. 
Noticeable better decoding of e.g. http://samples.mplayerhq.hu/A-codecs/msadpcm-stereo/dance-b5th.asf

Originally committed as revision 14201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 14:08:28 +00:00
Reimar Döffinger
8884b91898 100l, fix MS ADPCM decoding for e.g. http://samples.mplayerhq.hu/mov/qtaudio/surge-2-16-L-ms02.mov 
First coefficient array must be unsigned to fit in 8 bits

Originally committed as revision 14175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-12 09:23:37 +00:00
Reimar Döffinger
ff2271267e 10l, forgot to replace a / 256 for r14173. 
Fixes MS ADPCM regression test.

Originally committed as revision 14174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-12 07:28:45 +00:00
Reimar Döffinger
ddcf031f3b Change MS ADPCM table so they fit into int8_t and change array type. 
Originally committed as revision 14173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-11 21:38:42 +00:00
Diego Biurrun
bbdfa06d43 Add a note to remind people that new PCM/ADPCM formats need to be added to 
the Makefile as well to allow proper selective compilation.

Originally committed as revision 14072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-05 07:30:59 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Michael Niedermayer
909a9ad08d Prevent 128*1<<trellis from becoming 0 and creating 0 sized arrays. 
fixes CID84 RUN2
      CID85 RUN2
      CID86 RUN2
      CID87 RUN2
      CID88 RUN2
      CID89 RUN2
      CID90 RUN2
      CID91 RUN2
      CID92 RUN2
      CID93 RUN2
      CID94 RUN2
      CID95 RUN2
      CID96 RUN2
      CID97 RUN2
      CID98 RUN2
      CID99 RUN2
      CID100 RUN2
      CID101 RUN2
      CID102 RUN2
      CID103 RUN2
      CID104 RUN2
      CID105 RUN2
      CID106 RUN2

Originally committed as revision 13495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 11:59:41 +00:00
Diego Biurrun
bcdab7e547 cosmetics: Fix typos in ADPCM codec long names. 
Originally committed as revision 13173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-15 23:02:43 +00:00
Diego Biurrun
d349334abc ADPCM codec long names by Stefano Sabatini, stefano.sabatini-lala poste it 
Originally committed as revision 13157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-15 11:35:19 +00:00
Baptiste Coudurier
3b4eccabae identation 
Originally committed as revision 12969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 15:15:56 +00:00
Baptiste Coudurier
e67fe90c40 remove no more needed field 
Originally committed as revision 12968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 15:11:39 +00:00
Baptiste Coudurier
62377fec30 remove unused var 
Originally committed as revision 12967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 15:10:33 +00:00
Baptiste Coudurier
9ff8976dad remove ima qt decoding hack, decode whole frame at once 
Originally committed as revision 12966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 15:09:26 +00:00
Baptiste Coudurier
d29ee34ce3 fix adpcm ima qt decoding, channel at init is 0, correct stereo out since samples += avctx->channels 
Originally committed as revision 12965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 15:06:07 +00:00
Diego Biurrun
0ddfbc73cc cosmetics: Sort some lists alphabetically. 
Originally committed as revision 12886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-17 22:04:34 +00:00
Robert Marston
861c63a216 Maxis XA demuxer and decoder. 
Patch by Robert Marston rmarston (\at/) gmail point com
Original thread: [FFmpeg-soc] [Patch] Maxis EA XA decoder - GSoC Task
Date: 04/08/2008 01:36 AM

Originally committed as revision 12817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-14 14:31:43 +00:00
Michael Niedermayer
8c2a4ddca3 ILP64 fixes (untested) 
Originally committed as revision 12807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-13 16:11:36 +00:00
Michael Niedermayer
05adf49c7c Remove redundant &. 
Originally committed as revision 12795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-13 00:05:38 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Kostya Shishkov
9dc92a38a0 IMA ADPCM encoder - QT variant 
Originally committed as revision 12348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 07:30:41 +00:00
Michael Niedermayer
81ef51e669 const 
Originally committed as revision 11750 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 14:36:33 +00:00
Alexander Strange
d479d58cb6 Fix clicking sound in xa-adpcm. 
patch by Alexander Strange, astrange ithinksw com
Subject: Re: [FFmpeg-devel] [PATCH] fix clicking sound in xa-adpcm
Date: Thu, 27 Dec 2007 03:20:24 -0500

Originally committed as revision 11329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-27 11:55:53 +00:00
Timofei V. Bondarenko
62b3415258 fix predictor initialization for adpcm-ima encoder not to lose first sample 
in block in adpcm-ima decoder
Patch by Timofei V. Bondarenko: tim £ ipi, ac, ru
Original thread: [FFmpeg-devel] [PATCH] adpcm-ima-wav header and codec
Date: 10/15/2007 05:55 PM

Originally committed as revision 10933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-06 13:08:04 +00:00
Aurelien Jacobs
271b4095ad add Electronic Arts XAS ADPCM decoder 
based on a patch from Peter Ross

Originally committed as revision 10913 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-03 22:37:18 +00:00
Aurelien Jacobs
e916de2c8d remove useless #undef 
Originally committed as revision 10897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 15:55:50 +00:00
Aurelien Jacobs
c33ed2aaf9 remove unreachable code 
Originally committed as revision 10896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 15:54:28 +00:00
Aurelien Jacobs
0137034996 cosmetics: alignment 
Originally committed as revision 10895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 15:52:37 +00:00
Aurelien Jacobs
f6e2300fe7 don't register adpcm encoders which are not implemented 
Originally committed as revision 10894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 15:51:51 +00:00
Aurelien Jacobs
7c032a369a cosmetics: sort 
Originally committed as revision 10890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-01 00:17:18 +00:00
Peter Ross
fac84d3c18 EA IMA EACS decoder 
original patch by Peter Ross

Originally committed as revision 10880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-30 23:20:26 +00:00
Peter Ross
7bb65d8964 EA IMA SEAD decoder 
original patch by Peter Ross

Originally committed as revision 10879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-30 23:12:18 +00:00
Peter Ross
e758396268 EA ADPCM R1, R2 and R3 decoder 
original patch by Peter Ross

Originally committed as revision 10856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-24 20:49:42 +00:00
Aurelien Jacobs
a70a3f0b4d remove some useless initializations (the whole context is initialized to 0) 
Originally committed as revision 10831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-21 22:44:05 +00:00
Aurelien Jacobs
c6e2f0831c remove unused context var 
Originally committed as revision 10828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-21 22:16:28 +00:00
Timofei V. Bondarenko
880de6b0be Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample(). 
patch by Timofei, tim ipi.ac ru
Date: Mon, 15 Oct 2007 19:55:29 +0400
Subject: [FFmpeg-devel] [PATCH] adpcm-ima-wav header and codec

Originally committed as revision 10773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 23:02:35 +00:00
Vladimir Voroshilov
94d9633a32 Replace "signed short" typecast with "int16_t" as suggested by 
Mans Rullgard. Value at the right side is 16 bit length signed.
We can not know for sure that short is in fact 16 bits, even if
this virtually always is the case.

Originally committed as revision 10666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-04 15:13:42 +00:00
Vladimir Voroshilov
330194b9ce Fix audio clicks in ADPCM IMA AMV by casting predictor as "signed short" 
Initialize step_index as int16_t (as multimedia wiki says).

Originally committed as revision 10657 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-03 19:32:57 +00:00
Vitor Sessak
3a7f5d072a AMV audio decoder 
Originally committed as revision 10598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-27 06:21:57 +00:00
Diego Biurrun
1218a7e33d cosmetics: Sort CODEC_ID list. 
Originally committed as revision 10570 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-24 21:18:45 +00:00
Benjamin Larsson
622d633260 Cosmetics, indentation. 
Originally committed as revision 10145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-19 20:34:27 +00:00
Benjamin Larsson
1cbe9d6a78 Trellis quantization support for adpcm_swf. 
Originally committed as revision 10144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-19 20:31:53 +00:00
Aurelien Jacobs
88e2d5882b more usage of av_clip() 
Originally committed as revision 10082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 23:29:21 +00:00
Aurelien Jacobs
e4a50e6d2e one more simplification 
Originally committed as revision 10081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 23:23:20 +00:00
Aurelien Jacobs
295f373792 various simplifications around recent av_clip_int16() usage 
Originally committed as revision 10080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 23:17:03 +00:00
Aurelien Jacobs
aee481cebe use av_clip_int16() where it makes sense 
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 22:48:55 +00:00
Benjamin Larsson
00a254b7fe Don't encode the first sample twice. 
Originally committed as revision 9962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-06 19:49:18 +00:00
Baptiste Coudurier
d0fa156fc5 cosmetic, indentation 
Originally committed as revision 9960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-06 08:42:05 +00:00
Baptiste Coudurier
fe4ff07aa0 fix decoding of adpcm swf big frames, fix RamboMJPEGAVP6_1Mbps.swf 
Originally committed as revision 9946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 13:41:44 +00:00
Baptiste Coudurier
ac0691071e Set the step index correctly for flash adpcm. Patch by Baptiste 
Coudurier.

Originally committed as revision 9743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-18 18:40:03 +00:00
Baptiste Coudurier
9fff16bcbb Calculate the correct blocksize for flash adpcm. Patch by Baptiste 
Coudurier.

Originally committed as revision 9742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-18 18:35:03 +00:00
Diego Biurrun
90b5b51eab misc typo fixes 
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 18:50:50 +00:00
Ramiro Polla
2c124cb65c Use AV_xx throughout libavcodec 
Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 01:41:07 +00:00
Benjamin Larsson
d64b88d440 Per reference swf/flv adpcm encoder. 
Originally committed as revision 8713 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-11 13:10:13 +00:00
Marco Gerards
e457023a95 Fix an underflow/overflow that was causing some crackles when playing 
certain THP files.
patch by Marco Gerards, mgerards xs4all nl

Originally committed as revision 8703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-10 08:18:04 +00:00
Marco Gerards
90f2a1a03c cosmetics: indentation fix 
patch by Marco Gerards, mgerards xs4all nl

Originally committed as revision 8680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 12:05:02 +00:00
Michael Niedermayer
949ed6bb30 use bytestream reader instead of bitstream for THP 
5% smaller adpcm.o
20% faster

Originally committed as revision 8657 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 22:04:33 +00:00
Anssi Hannula
8e952e4d23 CRYO APC demuxer 
patch by Anssi Hannula, anssi.hannula gmail com

Originally committed as revision 8656 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 21:34:18 +00:00
Michael Niedermayer
204424a4c7 simplify 
Originally committed as revision 8655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 21:30:19 +00:00
Michael Niedermayer
b736a365be prev1/2 -> prev[2] 
Originally committed as revision 8654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 21:27:58 +00:00
Michael Niedermayer
11d662666d simplify 
Originally committed as revision 8653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 21:22:50 +00:00
Michael Niedermayer
d9ddac2579 general purpose vars should be int 
Originally committed as revision 8652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 21:19:36 +00:00
Michael Niedermayer
20f757076e table[index][ch] -> table[ch][index] (might be faster ...) 
Originally committed as revision 8651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 21:15:52 +00:00
Marco Gerards
d1e0d21f94 THP PCM decoder, used on the Nintendo GameCube. 
patch by Marco Gerards, mgerards xs4all nl

Originally committed as revision 8646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 16:03:23 +00:00
Baptiste Coudurier
387afa9d01 fix adpcm swf decoding 
Originally committed as revision 8186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 10:08:05 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions 
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 10:27:12 +00:00
Michael Niedermayer
3d7232ff00 add FIXME 
Originally committed as revision 7804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-02 10:25:30 +00:00
Michael Niedermayer
14c49573d8 some (probably exploitable) out of array write fixes 
Originally committed as revision 7802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-02 02:58:01 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32 
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-19 22:12:59 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Måns Rullgård
7239fb5738 make the adx adpcm codec available 
Originally committed as revision 5679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-08 22:31:14 +00:00
Loren Merritt
696d6889d2 ADPCM: trellis quantization 
Originally committed as revision 5451 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-03 19:04:56 +00:00
Loren Merritt
7e5370516b adpcm_ima & adpcm_yamaha: improved quantization 
Originally committed as revision 5449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-03 04:38:11 +00:00
Michael Niedermayer
8d359bbabe cleanup IMA-ADPCM WAV decoder 
Originally committed as revision 5095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-02 13:55:49 +00:00
Aurelien Jacobs
2433f24f60 add Creative 8 bits ADPCM schemes support 
Originally committed as revision 5024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-16 00:09:23 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Michael Niedermayer
b194c327fc yamaha adpcm nibbles in the wrong order fix by (Vidar Madsen: vidarino, gmail com) 
Originally committed as revision 4446 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-16 11:18:42 +00:00
Vidar Madsen
2ff4524e72 Add Yamaha ADPCM encoding/decoding patch by (Vidar Madsen: vidarino, gmail com) 
Originally committed as revision 4442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-15 06:51:36 +00:00
Michael Niedermayer
c26ae41db2 adding a few const 
Originally committed as revision 4337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-01 21:19:00 +00:00
Alex Beregszaszi
659c369256 macromedia flavour adpcm decoding (used in flv and swf) 
Originally committed as revision 3969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-21 19:27:32 +00:00
Mike Melanson
b3bfb29980 Creative ADPCM decoder, format 0x200, courtesy of Konstantin Shishkov 
Originally committed as revision 3589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-12 12:47:49 +00:00
Michael Niedermayer
53db1cae1c data_size = 0 cleanup 
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 14:37:16 +00:00
Mike Melanson
3a278992bd remove numerous definitions of BE_*/LE_* macros; convert FOURCC_TAG -> 
MKTAG/MKBETAG

Originally committed as revision 2886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-14 04:04:08 +00:00
Michael Niedermayer
6cf9d5ebd3 M$ ADPCM encoding & some simplifications 
Originally committed as revision 2765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-08 02:16:48 +00:00
Mike Melanson
7d8379f2b7 added support for EA ADPCM and SMJPEG IMA ADPCM 
Originally committed as revision 2744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-03 04:27:17 +00:00
Mike Melanson
df72754d03 handle 0-length buffers 
Originally committed as revision 2732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-31 17:40:28 +00:00
Michael Niedermayer
d94728c377 cleanup 
Originally committed as revision 2684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-10 01:58:00 +00:00
Mike Melanson
ac3d5cac7b initial predictors are not sent to the output in QT IMA; fix stereo QT 
IMA decoding

Originally committed as revision 2618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-12-16 01:17:58 +00:00
Fabrice Bellard
8dbcc9f226 comment fix 
Originally committed as revision 2490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-10 15:19:05 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>) 
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-03 13:26:22 +00:00
Michael Niedermayer
5c69a4fd68 fixing the remaning block-align checks 
Originally committed as revision 2438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-26 09:56:21 +00:00
Assaf Yaari
ca1d62f45d block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>) 
Originally committed as revision 2437 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-26 09:49:45 +00:00
Alex Beregszaszi
1ffb0091aa 100l 
Originally committed as revision 2417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-22 22:10:22 +00:00
Mike Melanson
fc38477715 activate the XA and ADX ADPCM codecs 
Originally committed as revision 2385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-15 03:20:40 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO 
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-14 04:15:53 +00:00
Mike Melanson
2fdf638b0c New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE & 
Video-1, Apple RPZA, Cinepak, Westwood IMA ADPCM

Originally committed as revision 2324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-01 04:39:38 +00:00
Mike Melanson
9937e686fe New fringe codecs: WC3/Xan video, Xan DPCM, DK3 & DK4 ADPCM 
Originally committed as revision 2217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-08 04:10:59 +00:00
Michael Niedermayer
4b465299f3 4xm adpcm 
Originally committed as revision 1928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-03 13:58:44 +00:00
Michael Niedermayer
983e3246b7 per file doxy 
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-06 11:32:04 +00:00
Zdenek Kabelac
6b9b85c165 * minor optimalization 
Originally committed as revision 1618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-03 17:13:26 +00:00
Zdenek Kabelac
135ee03aae * fixed IMA WAV decoding (though still might not be fully correct) 
* const arrays

Originally committed as revision 1601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-24 13:26:41 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t 
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-11 16:35:48 +00:00
Michael Niedermayer
492cd3a920 AVVideoFrame -> AVFrame 
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-09 12:03:43 +00:00
François Revol
889c522492 adpcm encoding patch by François Revol <revol at free dot fr> 
Originally committed as revision 785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-22 01:44:08 +00:00
François Revol
0147f19856 beos/mov/adpcm patch by François Revol <revol at free dot fr> 
* Some BeOS fixes:
- errno stuff
- nanosleep() replacement
- added a doc/README.beos

* mov reader still has problems with most videos (skips many chunks),
- It should now read .mov files with zlib-compressed moov headers (aka cmov)
- added SVQ1 support.
- removed mapping 'raw ' and 'yuv2' to h263, was my mistake.
- added IMA4 support. (tested)
- fixed frame rate (it reported 0 fps or something before)
- extended file probing ('wide' and 'free' atoms)
- improved .mov/.mp4 detection (or so I think)

* adpcm
* added zlib support, with header file and lib check

Originally committed as revision 780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-20 20:05:50 +00:00