Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/vmdav.c
AgeCommit message (Collapse)Author
2012-04-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec_asf: Set the no_resync_search option for the chained asf demuxer asfdec: Add an option for not searching for the packet markers cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others cosmetics: Align codec declarations cosmetics: Convert mimic.c to utf-8 avconv: remove an unused function parameter. avconv: remove now pointless variables. avconv: drop support for building without libavfilter. nellymoserenc: fix crash due to memsetting the wrong area. libavformat: Only require first packet to be known for audio/video streams avplay: Don't try to scale timestamps if the tb isn't set Conflicts: Changelog configure ffmpeg.c libavcodec/aacenc.c libavcodec/bmpenc.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/ffv1.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/libopenjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/pamenc.c libavcodec/pgssubdec.c libavcodec/pngenc.c libavcodec/qtrleenc.c libavcodec/rawdec.c libavcodec/sgienc.c libavcodec/tiffenc.c libavcodec/v210dec.c libavcodec/wmv2dec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-06cosmetics: Align codec declarationsMartin Storsjö
Also break some long lines, remove codec function placeholder comments and add spaces in sample/pixel format lists. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-03-23vmdvideo: remove superfluous strings from av_log messagesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-25vmdav: check that theres enough space for a chunk remaining.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aac_latm: reconfigure decoder on audio specific config changes latmdec: fix audio specific config parsing Add avcodec_decode_audio4(). avcodec: change number of plane pointers from 4 to 8 at next major bump. Update developers documentation with coding conventions. svq1dec: avoid undefined get_bits(0) call ARM: h264dsp_neon cosmetics ARM: make some NEON macros reusable Do not memcpy raw video frames when using null muxer fate: update asf seektest vp8: flush buffers on size changes. doc: improve general documentation for MacOSX asf: use packet dts as approximation of pts asf: do not call av_read_frame rtsp: Initialize the media_type_mask in the rtp guessing demuxer Cleaned up alacenc.c Conflicts: doc/APIchanges doc/developer.texi libavcodec/8svx.c libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/nellymoserdec.c libavcodec/tta.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavformat/asfdec.c tests/ref/seek/lavf_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03Add avcodec_decode_audio4().Justin Ruggles
Deprecate avcodec_decode_audio3(). Implement audio support in avcodec_default_get_buffer(). Implement the new audio decoder API in all audio decoders.
2011-11-13Increase Sierra VMD palette dynamics.Carl Eugen Hoyos
2011-11-12Set Sierra VMD palette opaque.Carl Eugen Hoyos
2011-11-06Try to set AVFrame.reference to correct values.Reimar Döffinger
I am not sure these new values are correct, not am I sure the semantics are a good idea since we do not seem to make any use of them but they caused a lot of confusion, but this seems to make things closer to matching the documentation. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-07vmd: fix segfaults on corruped streamsLaurent Aimar
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2011-09-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ppc: fix some pointer to integer casts ppc: fix 32-bit PIC build vmdaudio: fix decoding of 16-bit audio format. lavf: do not set codec_tag for rawvideo h264: check for out of bounds reads in ff_h264_decode_extradata(). flvdec: Check for overflow before allocating arrays avconv: use correct output stream index when checking max_frames avconv: remove fake coded_frame on streamcopy hack Conflicts: avconv.c libavcodec/h264.c libavcodec/ppc/asm.S libavcodec/vmdav.c libavformat/flvdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25vmdaudio: fix decoding of 16-bit audio format.Justin Ruggles
The initial sample of each block is raw 16-bit PCM, not DPCM. Fixes decoding of all samples in: http://streams.videolan.org/samples/game-formats/sierra-vmd/Lighthouse/
2011-09-25Fix potential pointer arithmetic overflows in rle_unpack() of vmd video decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Fix out of bound reads in rle_unpack() of vmd video decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Check for out of bound reads in vmd_decode() of vmd video decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Fix potential pointer arithmetic overflows in lz_unpack of vmd video decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Prevent out of bound read in lz_unpack in vmd video decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Prevent NULL dereferences when the previous frame is missing in vmd video ↵Laurent Aimar
decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Check for invalid update parameters in vmd video decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-25Fix potential overread in vmd audio decoder.Laurent Aimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-29lavc: use designated initialisers for all codecs.Anton Khirnov
It's more readable and less prone to breakage.
2011-06-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-21Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles
av_get_bits_per_sample_fmt() is deprecated.
2011-06-02Remove unused variablesMans Rullgard
2011-05-30Fix various unused variable warningsClément Bœsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-07lavc: set defaults in internal codec framesStefano Sabatini
This is required specifically for setting frame->format to -1, otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading the format from the output decoded frame will get misled. In particular fix regressions occurring with the pending vsrc_buffer patch.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-26vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.Justin Ruggles
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 1108f8998c6536bb44d6ecbe5adfa18e0c1478e8)
2011-02-26vmdaudio: remove unnecessary fields from VmdAudioContext and use the ↵Justin Ruggles
corresponding AVCodecContext fields instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 2ec7862db8b782020cc220dae827c3438d108b3a)
2011-02-26vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded ↵Justin Ruggles
sample size. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 1e86d685e0935077766c645e49b8533d41ca11cb)
2011-02-26vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, ↵Justin Ruggles
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 1574eff3d23ad799d25454a449b01f94795495ea)
2011-02-26cosmetics: reindent after previous commitJustin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5)
2011-02-26vmdaudio: move all silence chunk handling to vmdaudio_loadsound().Justin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 762b386e4aafc7bbdbec367bc652cf1199e81f51)
2011-02-26cosmetics: remove debugging cruftJustin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 8e9027d266ef39ab9f88b4bbad5cf9e425d0696c)
2011-02-26cosmetics: reindent after previous commitJustin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 868f2f4d90e07edd9a65bd9b917bb5940643ec75)
2011-02-26vmdaudio: simplify buffer pointer and header size handling.Justin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 2d213695fce86e740800ddcf43d8d0864d2ecea5)
2011-02-26vmdaudio: set *data_size to zero when skipping small packets and add a ↵Justin Ruggles
warning log message. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 7a4fb3fd9357dfdd27431a0a8d7250dab54a9938)
2011-02-26vmdaudio: validate block typeJustin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22f893e1c9f9387f0a021f775757130fa48e0180)
2011-02-26vmdaudio: use macros and a local variable for block type.Justin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit dd1af5136fe7767f2f18ac943efe994946864640)
2011-02-26vmdaudio: correct the silent chunk count in the first block.Justin Ruggles
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 6989cb2dae85ea455ffcc8a36a763134fb311e29)
2011-02-26vmdaudio: output audio samples for standalone silent blocks.Justin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 9b73f786005f31429d7c88092edfeef6696a5f69)
2011-02-26vmdaudio: remove duplicated code by merging mono and stereo decoding.Justin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 1328d433137c055df06f99772b243ceec2bbf36e)
2011-02-26vmdaudio: fix raw_block_size calculation.Justin Ruggles
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 a58bcb40b164b92957db73e702465808a9180126)
2011-02-24vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.Justin Ruggles
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>
2011-02-24vmdaudio: remove unnecessary fields from VmdAudioContext and use the ↵Justin Ruggles
corresponding AVCodecContext fields instead. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-24vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded ↵Justin Ruggles
sample size. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-24vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, ↵Justin Ruggles
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>
2011-02-24cosmetics: reindent after previous commitJustin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-24vmdaudio: move all silence chunk handling to vmdaudio_loadsound().Justin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-29 14:57:27 +0300