Statistics
| Branch: | Revision:

ffmpeg / libavcodec / vmdav.c @ 1e898e7d

History | View | Annotate | Download (16.8 KB)

# Date Author Comment
1e898e7d 02/26/2011 02:16 AM Justin Ruggles

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 <>
(cherry picked from commit 1108f8998c6536bb44d6ecbe5adfa18e0c1478e8)

f3618b01 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 2ec7862db8b782020cc220dae827c3438d108b3a)

5e7c422d 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 1e86d685e0935077766c645e49b8533d41ca11cb)

504dff8e 02/26/2011 02:16 AM Justin Ruggles

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 <>
(cherry picked from commit 1574eff3d23ad799d25454a449b01f94795495ea)

83e94d50 02/26/2011 02:16 AM Justin Ruggles

cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5)

fb0e3c2b 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: move all silence chunk handling to vmdaudio_loadsound().

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 762b386e4aafc7bbdbec367bc652cf1199e81f51)

6f3c837f 02/26/2011 02:16 AM Justin Ruggles

cosmetics: remove debugging cruft

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 8e9027d266ef39ab9f88b4bbad5cf9e425d0696c)

684512e1 02/26/2011 02:16 AM Justin Ruggles

cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 868f2f4d90e07edd9a65bd9b917bb5940643ec75)

aa236250 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: simplify buffer pointer and header size handling.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 2d213695fce86e740800ddcf43d8d0864d2ecea5)

b4b5e922 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: set *data_size to zero when skipping small packets and add a warning log message.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 7a4fb3fd9357dfdd27431a0a8d7250dab54a9938)

ebed7b68 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: validate block type

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 22f893e1c9f9387f0a021f775757130fa48e0180)

149d3687 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: use macros and a local variable for block type.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit dd1af5136fe7767f2f18ac943efe994946864640)

2be17a71 02/26/2011 02:16 AM Justin Ruggles

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 <>
(cherry picked from commit 6989cb2dae85ea455ffcc8a36a763134fb311e29)

c11c7922 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: output audio samples for standalone silent blocks.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 9b73f786005f31429d7c88092edfeef6696a5f69)

2ac19b75 02/26/2011 02:16 AM Justin Ruggles

vmdaudio: remove duplicated code by merging mono and stereo decoding.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 1328d433137c055df06f99772b243ceec2bbf36e)

994e445a 02/26/2011 02:15 AM Justin Ruggles

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 <>
(cherry picked from commit a58bcb40b164b92957db73e702465808a9180126)

e7e2df27 01/28/2011 02:15 AM Diego Elio Pettenò

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 <>
(cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)

5d6e4c16 11/12/2010 11:04 AM Stefano Sabatini

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

ba87f080 04/20/2010 02:45 PM Diego Biurrun

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

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

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

3aab27b4 07/22/2009 11:37 PM Måns Rullgård

Remove useless #include <unistd.h> from many files

Originally committed as revision 19499 to svn://svn.ffmpeg.org/ffmpeg/trunk

1c86db80 04/24/2009 02:09 PM Kostya Shishkov

Remove useless assignment during initialization for some decoders

Originally committed as revision 18680 to svn://svn.ffmpeg.org/ffmpeg/trunk

7a00bbad 04/07/2009 03:59 PM Thilo Borgmann

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....

bad5537e 02/01/2009 02:00 AM Diego Biurrun

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

99ed41a8 01/26/2009 10:51 PM Diego Biurrun

Fix filenames in Doxygen comments.

Originally committed as revision 16811 to svn://svn.ffmpeg.org/ffmpeg/trunk

716ba2d0 01/21/2009 01:24 PM Kostya Shishkov

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

6a5d31ac 01/11/2009 10:19 PM Diego Biurrun

Fix build: Add intreadwrite.h and bswap.h #includes where necessary.

Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk

dd1c8f3e 09/08/2008 02:24 PM Luca Abeni

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...

fd76c37f 07/31/2008 10:47 AM Peter Ross

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

cf2baeb3 06/24/2008 08:01 PM Stefan Gehrer

mark read-only data as const

Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk

fe4bf374 06/12/2008 09:50 PM Stefano Sabatini

Make AVCodec long_names definition conditional depending on CONFIG_SMALL.

Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk

ccd425e7 05/06/2008 09:16 AM Diego Biurrun

Remove unnecessary parentheses from return calls.

Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk

162d4fc9 04/27/2008 10:39 PM Stefano Sabatini

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

98a6fff9 03/21/2008 03:11 AM Zuxy Meng

Apply 'cold' attribute to init/uninit functions in libavcodec

Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk

32c3047c 03/10/2008 03:07 AM Mike Melanson

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

e37e5335 02/01/2008 04:06 PM Michael Niedermayer

const

Originally committed as revision 11785 to svn://svn.ffmpeg.org/ffmpeg/trunk

ac140479 09/23/2007 04:11 PM Kostya Shishkov

Fix decoding of VMDs representing sprites (Last Dynasty, Woodruff).

Fixes issue 101

Originally committed as revision 10552 to svn://svn.ffmpeg.org/ffmpeg/trunk

aee481ce 08/11/2007 10:48 PM Aurelien Jacobs

use av_clip_int16() where it makes sense

Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk

e5a389a1 07/05/2007 10:40 AM Diego Biurrun

license header consistency cosmetics

Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk

3dba31aa 05/29/2007 04:43 PM Kostya Shishkov

Do proper frame swapping so VMD video decoder works again

Originally committed as revision 9151 to svn://svn.ffmpeg.org/ffmpeg/trunk

2029f312 05/10/2007 09:00 AM Diego Biurrun

Remove redundant #inclusion of common.h, avcodec.h already #includes it.

Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk

e4141433 04/08/2007 08:24 PM Nicholas Tung

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

587d0722 04/07/2007 05:37 PM Nicholas Tung

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

f66e4f5f 02/25/2007 10:27 AM Reimar Döffinger

Add av_ prefix to clip functions

Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk

fead30d4 01/19/2007 10:12 PM Alex Beregszaszi

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

c8f9f9b9 11/19/2006 05:30 AM Kostya Shishkov

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

a47d3c04 11/13/2006 05:15 AM Kostya Shishkov

Output proper 16-bit sound (fixes decoding on PPC)

Originally committed as revision 7000 to svn://svn.ffmpeg.org/ffmpeg/trunk

b78e7197 10/07/2006 03:30 PM Diego Biurrun

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

e38f34fd 08/09/2006 07:52 AM Panagiotis Issaris

Correct wrong memset invocation.
patch by Panagiotis Issaris, takis%%.%%issaris%%@%%uhasselt%%.%%be

Originally committed as revision 5966 to svn://svn.ffmpeg.org/ffmpeg/trunk

79d15fd4 03/11/2006 04:26 AM Kostya Shishkov

16-bit DPCM and stereo support for Sierra VMD

Originally committed as revision 5147 to svn://svn.ffmpeg.org/ffmpeg/trunk

5509bffa 01/12/2006 10:43 PM Diego Biurrun

Update licensing information: The FSF changed postal address.

Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk

bb270c08 12/22/2005 01:10 AM Diego Biurrun

COSMETICS: tabs --> spaces, some prettyprinting

Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk

115329f1 12/17/2005 06:14 PM Diego Biurrun

COSMETICS: Remove all trailing whitespace.

Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk

8458dab1 08/13/2005 06:39 PM Mike Melanson

tinfoil patch: be more diligent about checking array boundaries before
writing to them

Originally committed as revision 4515 to svn://svn.ffmpeg.org/ffmpeg/trunk

98772cbf 09/28/2004 03:04 AM Mike Melanson

if audio is PCM, push it through (sync is not perfect yet)

Originally committed as revision 3528 to svn://svn.ffmpeg.org/ffmpeg/trunk

53db1cae 05/21/2004 02:37 PM Michael Niedermayer

data_size = 0 cleanup

Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk

fd146758 04/07/2004 01:26 PM Alex Beregszaszi

conversion to av_log

Originally committed as revision 2975 to svn://svn.ffmpeg.org/ffmpeg/trunk

23fe14bb 03/14/2004 04:08 AM Mike Melanson

minor VMD system update; still not perfect, but should not crash either

Originally committed as revision 2887 to svn://svn.ffmpeg.org/ffmpeg/trunk

d705e4a6 02/22/2004 12:31 AM Michael Niedermayer

(f)printf() is disallowed in libavcodec, compilation will fail now if its used, except that codecs which where added after the printf->av_log change which did ignore av_log() and used prinf are now silent and wont print anything, they should be changed to use av_log, i could do that, but its better if the orginal developer decides which AV_LOG level each message should get...

fafa0b75 01/02/2004 04:45 AM Mike Melanson

first pass at Sierra VMD A/V decoders; video looks great, audio is not
yet complete

Originally committed as revision 2652 to svn://svn.ffmpeg.org/ffmpeg/trunk