RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
37,512 Commits 36 Branches 392 Tags 305 MiB
Commit Graph

226 Commits

Author SHA1 Message Date
Luca Barbato b845f5e97b riff: Factor out WAVEFORMATEX parsing 
Makes the code simpler to follow.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Peter Ross 516089d5d8 riff: Add ACTRAC3+ guid 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Peter Ross a3bf80a5ae riff: Perform full lookup on WAVEFORMATEXTENSIBLE subformat guid 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Peter Ross e544782623 riff: Move guid structs and helper functions into riff 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Luca Barbato 8e329dba37 riff: check for eof if chunk size and code are 0 
Prevent an infinite loop.

Inspired by a patch from Michael Niedermayer

CC: libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Luca Barbato 1c88617b94 riff: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:12 +02:00
Luca Barbato 80ac87c13d lavc: support ZenoXVID custom tag 
Looks like this kind of samples are produced by certain Russian
equipment.
 2013-01-17 21:41:18 +01:00
Diego Biurrun a0c5917f86 Drop Snow codec 
Snow is a toy codec with no real-world use and horrible code.
 2013-01-06 16:30:02 +01:00
Justin Ruggles 5c7bf2ddde lavf: move nuv fourcc audio tags from riff to nuv 2012-11-28 11:18:50 -05:00
Justin Ruggles 261e9348ef lavf: add a common function for selecting a pcm codec from parameters 2012-11-28 11:18:50 -05:00
Justin Ruggles cdaa1f84fb lavf: move "MP3 " fourcc from riff to nut 
Original commit, 7b24f9b, says it was added because it is used in libnut.
 2012-11-28 11:18:49 -05:00
Justin Ruggles 259d8c5647 riff: do not add empty metadata tags in INFO chunk 2012-11-26 19:08:51 -05:00
Justin Ruggles 3c370f5abc riff: only warn on a bad INFO chunk code size instead of failing 
fixes Bug 392
 2012-11-26 19:08:51 -05:00
Diego Biurrun ddb009425c riff: Make ff_riff_tags static and move under appropriate #ifdef 
The table is not used outside the file.
 2012-11-25 13:32:10 +01:00
Anton Khirnov 6173a8fe5d riff: remove a write-only variable 2012-10-22 08:49:58 +02:00
Diego Biurrun 7b2121e7e2 riff: Move functions around to be covered by appropriate #ifdefs 
This fixes compilation with --disable-muxers.
 2012-10-18 16:12:45 +02:00
Victor Vasiliev 0bca0283cc riff: do not write empty INFO tags 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:51:16 +02:00
Victor Vasiliev 71e92414bf lavf: move RIFF INFO tag writing from avienc to riff 
It will be useful in the wav muxer.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:50:36 +02:00
Derek Buitenhuis 1c56cdad33 riff: Add SVQ3 fourcc 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-14 14:12:52 -04:00
Alberto Delmás ee769c6a7c MSS2 decoder 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-08-31 07:37:16 +02:00
Anton Khirnov 36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Derek Buitenhuis 45eaac02cb Canopus Lossless decoder 
At the moment it only does BGR24, but I plan to add the rest after.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-08-01 22:06:16 -04:00
Kostya Shishkov 5b7e3a195d MS Expression Encoder Screen decoder 2012-07-13 06:59:48 +02:00
Kostya Shishkov 781888da89 TechSmith Screen Codec 2 decoder 2012-07-11 07:29:05 +02:00
Kostya Shishkov edf35d8342 MS ATC Screen (aka MSS3) decoder 2012-07-02 07:14:44 +02:00
Kostya Shishkov 005c80b645 MS Screen 1 decoder 2012-06-20 19:08:10 +02:00
Kostya Shishkov c6061443f7 Indeo Audio decoder 2012-06-05 18:30:54 +02:00
Justin Ruggles 8099fc763b riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header 
This matches the value for the plain WAVEFORMATEX header.
Also fixes stream copy to WAVE for non-16-bit raw pcm.
 2012-04-17 00:09:19 -04:00
Derek Buitenhuis 0e714f889e ZeroCodec Decoder 
An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-03-19 19:02:23 +01:00
Justin Ruggles c019070fda riffenc: use av_get_audio_frame_duration() 
For encoding, frame_size is not a reliable indicator of packet duration.
Also, we don't want to have to force the demuxer to find frame_size for
stream copy to work.
 2012-03-05 13:08:15 -05:00
Janne Grunau 15cea3695d riff: fix invalid av_freep() calls on EOF in ff_read_riff_info 2012-01-22 19:32:44 +01:00
Anton Khirnov 0fd88d3988 riff: remove references to sonic codec ids 
They are deprecated and will be purged on next major bump.
 2012-01-12 18:18:22 +01:00
Carl Eugen Hoyos 835af79b05 Detect 'yuv2' as rawvideo also in avi. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-01 22:27:04 +01:00
Derek Buitenhuis 80f6c0bb95 v410 encoder and decoder 
v410 is a packed 10-bit 4:4:4 YCbCr format used in
QuickTime.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-13 23:34:24 +01:00
Kostya Shishkov 19341c58e0 Dxtory capture format decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-10 11:58:03 +01:00
Paul B Mahol e93947b7d8 cljr: add encoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-08 09:47:53 +01:00
Victor Vasiliev 12bc20502a Generalize RIFF INFO tag support; support reading INFO tag in wav 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-11-26 17:14:13 -08:00
Derek Buitenhuis c433a3f9a5 VBLE Decoder 
Add a decoder for the VBLE Lossless Codec, which
still has a cult following. Used to be popular
several years ago on doom9.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-11 22:46:47 +02:00
Justin Ruggles 6ac34eed54 g726: use bits_per_coded_sample instead of bitrate to determine mode 
This requires some workarounds in the WAV muxer and demuxer. We need to write
the correct bits_per_coded_sample and block_align in the muxer. In the
demuxer, we cannot rely on the bits_per_coded_sample value, so we use the bit
rate and sample rate to determine the value.

This avoids having the decoder rely on AVCodecContext.bit_rate, which is not
required to be set by the user for decoding according to our API.
 2011-11-01 21:23:03 -04:00
Kostya Shishkov 0d8506b8c5 Ut Video decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-10-19 08:24:19 +02:00
John Brooks 2c4e08d893 riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 
The cbSize field should be included in all cases, even with PCM where
its value is ignored.

Fixes encoding PCM audio in Matroska for some players which insist on
a full WAVEFORMATEX structure for A_MS/ACM audio.

Since fate uses wav files for the audio test a larger number of tests
has changed checksums or shifted positions due to the 2 byte longer
wave header.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-14 13:28:58 +02:00
Diego Biurrun 12bd8532cf Synchronize various 4CCs and codec tags from FFmpeg. 2011-10-04 11:58:53 +02:00
Alberto Delmás 45ecda8554 Windows Media Image decoder (WMVP/WVP2) 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-23 11:18:35 +02:00
Alex Converse 505345ed5d riff: Add mpgv MPEG-2 fourcc 
Supported by mplayer and seen in the wild.
 2011-07-22 10:39:13 -07:00
Mans Rullgard 0ebcdf5cda Do not include mathematics.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Kamil Nowosad a304a83362 riff/img2: Add JPEG 2000 codec IDs. 2011-06-21 21:38:59 +02:00
ami_stuff 2ea1ca1714 riff: Add DAVC fourcc. 
This fourcc is used by the "mpegable AVC" codec and files encoded with
this codec decode correctly with our H.264 decoder.
 2011-06-21 21:38:58 +02:00
Carl Eugen Hoyos 682a20114e riff: Add M263, XVIX, MMJP, CDV5 fourccs. 2011-06-21 21:38:53 +02:00
ami_stuff d352df0931 rawvideo: Support auv2 fourcc. 2011-06-21 21:33:58 +02:00
Alex Converse ed8a50068c riff: Fix potential memleak. 
Make ff_get_wav_header() free existing extradata before allocing a new
buffer.
 2011-06-09 10:12:50 -07:00