virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
29,649 Commits 37 Branches 400 Tags 463 MiB
7d62475656
Commit Graph

60 Commits

Author SHA1 Message Date
Justin Ruggles
1e898e7d35 vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8. 
There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1108f8998c)
 2011-02-26 03:16:04 +01:00
Justin Ruggles
f3618b014b vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2ec7862db8)
 2011-02-26 03:16:04 +01:00
Justin Ruggles
5e7c422dda vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1e86d685e0)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
504dff8e4e vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound(). 
This also adds output buffer size checks for AUDIO and SILENCE block types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1574eff3d2)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
83e94d50cb cosmetics: reindent after previous commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ba9516cca8)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
fb0e3c2b96 vmdaudio: move all silence chunk handling to vmdaudio_loadsound(). 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 762b386e4a)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
6f3c837f40 cosmetics: remove debugging cruft 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8e9027d266)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
684512e16d cosmetics: reindent after previous commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 868f2f4d90)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
aa23625037 vmdaudio: simplify buffer pointer and header size handling. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2d213695fc)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
b4b5e92286 vmdaudio: set *data_size to zero when skipping small packets and add a warning log message. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7a4fb3fd93)
 2011-02-26 03:16:03 +01:00
Justin Ruggles
ebed7b6865 vmdaudio: validate block type 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22f893e1c9)
 2011-02-26 03:16:02 +01:00
Justin Ruggles
149d36877a vmdaudio: use macros and a local variable for block type. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit dd1af5136f)
 2011-02-26 03:16:02 +01:00
Justin Ruggles
2be17a71ae vmdaudio: correct the silent chunk count in the first block. 
This fixes A/V sync with several samples, notably:
http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6989cb2dae)
 2011-02-26 03:16:02 +01:00
Justin Ruggles
c11c79222e vmdaudio: output audio samples for standalone silent blocks. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 9b73f78600)
 2011-02-26 03:16:02 +01:00
Justin Ruggles
2ac19b75c0 vmdaudio: remove duplicated code by merging mono and stereo decoding. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1328d43313)
 2011-02-26 03:16:02 +01:00
Justin Ruggles
994e445a17 vmdaudio: fix raw_block_size calculation. 
The size should depend on the output sample size, not the internal bit depth.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a58bcb40b1)
 2011-02-26 03:15:59 +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
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
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
Måns Rullgård
3aab27b459 Remove useless #include <unistd.h> from many files 
Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 23:37:53 +00:00
Kostya Shishkov
1c86db80a9 Remove useless assignment during initialization for some decoders 
Originally committed as revision 18680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-24 14:09:24 +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
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
Diego Biurrun
99ed41a808 Fix filenames in Doxygen comments. 
Originally committed as revision 16811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 22:51:16 +00:00
Kostya Shishkov
716ba2d01c VMD first chunk of audio is not coded as many separate chunks of block_align 
size. Thus, make demuxer and decoder handle it as a whole.

Originally committed as revision 16708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-21 13:24:35 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +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
Stefan Gehrer
cf2baeb338 mark read-only data as const 
Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 20:01:31 +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
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls. 
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-06 09:16:36 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 22:39:51 +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
Mike Melanson
32c3047cac These video decoders do not need to include and initialize the DSP 
support functions.

Originally committed as revision 12406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 03:07:44 +00:00
Michael Niedermayer
e37e53350e const 
Originally committed as revision 11785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 16:06:40 +00:00
Kostya Shishkov
ac14047927 Fix decoding of VMDs representing sprites (Last Dynasty, Woodruff). 
Fixes issue 101

Originally committed as revision 10552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-23 16:11:07 +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
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Kostya Shishkov
3dba31aa0d Do proper frame swapping so VMD video decoder works again 
Originally committed as revision 9151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-29 16:43:25 +00:00
Diego Biurrun
2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it. 
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 09:00:44 +00:00
Nicholas Tung
e4141433ea Get rid of unnecessary pointer casts. 
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 20:24:16 +00:00
Nicholas Tung
587d07227e Remove superfluous setting of has_b_frames in codecs without B-frames. 
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 17:37:30 +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
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
Kostya Shishkov
c8f9f9b91a Divide first audio buffer chunk into atomary bufffers. 
This slightly simplifies decoder and removes potential
audio buffer overrun.

Originally committed as revision 7121 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-19 05:30:43 +00:00
Kostya Shishkov
a47d3c0442 Output proper 16-bit sound (fixes decoding on PPC) 
Originally committed as revision 7000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 05:15:55 +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
Panagiotis Issaris
e38f34fd7f Correct wrong memset invocation. 
patch by Panagiotis Issaris, takis%%.%%issaris%%@%%uhasselt%%.%%be

Originally committed as revision 5966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-09 07:52:28 +00:00
Kostya Shishkov
79d15fd4db 16-bit DPCM and stereo support for Sierra VMD 
Originally committed as revision 5147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-11 04:26:55 +00:00