summaryrefslogtreecommitdiffstats
path: root/libavcodec/svq3.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-151-12/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: remove misplaced comment. ffmpeg: fix streaming to ffserver. swscale: split out RGB48 output functions from yuv2packed[12X]_c(). build: move vpath directives to main Makefile swscale: fix JPEG-range YUV scaling artifacts. build: move ALLFFLIBS to a more logical place ARM: factor some repetitive code into macros Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support ac3enc: fix allocation of floating point samples. Conflicts: ffmpeg.c libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/snow.c libswscale/swscale.c libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix SVQ3 after adding 4:4:4 H.264 supportJason Garrett-Glaser2011-06-131-12/+16
| |
| * Roll back 4:4:4 H.264 for nowJason Garrett-Glaser2011-06-131-16/+12
| | | | | | | | Needs some ARM/PPC asm modifications.
| * Fix SVQ3 after adding 4:4:4 H.264 supportJason Garrett-Glaser2011-06-131-12/+16
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-041-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq3: Check negative mb_type to fix potential crash.Baptiste Coudurier2011-06-031-1/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * svq3: Move svq3-specific fields to their own context.Baptiste Coudurier2011-06-031-35/+62
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-221-9/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq3: Do initialization after parsing the extradataRonald S. Bultje2011-05-211-9/+10
| | | | | | | | | | | | | | | | If done before, some parameters aren't known yet. With svq3/rtp, initializing before some parameters are known can lead to calling av_malloc(0), which on OS X currently returns broken pointers.
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-21/+21
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().Stefano Sabatini2011-05-021-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Use av_fast_malloc instead of av_fast_realloc.Reimar Döffinger2011-05-071-2/+2
| | | | | | | | Avoids a memleak, is less code and might be faster.
* | In svq3 decoder, check negative mb_type, fix potential crash.Baptiste Coudurier2011-05-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SVQ3: do not modify const input bufferBaptiste Coudurier2011-05-051-3/+19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SVQ3: Check that things match up after a frame.Baptiste Coudurier2011-05-051-1/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SVQ3: Move svq3 specific fields to their own context.Baptiste Coudurier2011-05-051-35/+62
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-21/+21
| |
* | replace deprecated av_get_pict_type_char() with av_get_picture_type_char()Stefano Sabatini2011-05-021-1/+1
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-8/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove FF_API_HURRY_UP cruftAnton Khirnov2011-04-261-8/+0
| |
| * Replace mplayerhq.hu URLs by libav.org.Diego Biurrun2011-04-181-1/+1
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-031-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: mark hurry_up for removal on next major bumpAnton Khirnov2011-04-021-1/+3
| | | | | | | | | | It has been deprecated for about five years, skip_idct/skip_frame should be used instead.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-5/+5
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move ff_emulated_edge_mc() into DSPContext.Ronald S. Bultje2011-01-281-2/+2
| |
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Revert 2a1f431d38ea9c05abb215d70c7dc09cdb6888ab, it broke H264 lossless.Ronald S. Bultje2011-01-201-5/+4
| |
* | Move ff_emulated_edge_mc() into DSPContext.Ronald S. Bultje2011-01-301-2/+2
| | | | | | | | (cherry picked from commit 2e279598793133ee9c57fd0026d672f076fde4bf)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
| | | | | | | | | | | | | | | | 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 d36beb3f6902b1217beda576aa18abf7eb72b03c)
* | Revert 2a1f431d38ea9c05abb215d70c7dc09cdb6888ab, it broke H264 lossless.Ronald S. Bultje2011-01-211-5/+4
|/ | | | (cherry picked from commit 66c6b5e2a5e6376c4a5c65b1d96fd7a1580bdfcf)
* H.264/SVQ3: make chroma DC work the same way as luma DCJason Garrett-Glaser2011-01-151-4/+5
| | | | | | | No speed improvement, but necessary for some future stuff. Also opens up the possibility of asm chroma dc idct/dequant. Originally committed as revision 26349 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Port SVQ3 to use the new mb_luma_dc method of storing luma DC coefficients.Jason Garrett-Glaser2011-01-151-23/+21
| | | | | | | Doesn't help speed as there isn't an asm implementation yet, but consistency is a good thing. Originally committed as revision 26348 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix SVQ3Jason Garrett-Glaser2011-01-141-9/+11
| | | | | | Regression in r26336-7. Originally committed as revision 26341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* H.264: split luma dc idct out and implement MMX/SSE2 versionsJason Garrett-Glaser2011-01-141-11/+9
| | | | | | | | | | About 2.5x the speed. NOTE: the way that the asm code handles large qmuls is a bit suboptimal. If x264-style dequant was used (separate shift and qmul values), it might be possible to get some extra speed. Originally committed as revision 26336 to svn://svn.ffmpeg.org/ffmpeg/trunk
* SVQ3: Allow decoding if thread_count is > 1Alexander Strange2010-12-151-5/+0
| | | | | | | svq3 still doesn't support multithreading, but it's simpler for clients if they can enable threading for all codecs by default. Originally committed as revision 26015 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix svq3 watermark log uncompress on 64bit, probably fixes issue 1263Baptiste Coudurier2010-06-151-2/+2
| | | | Originally committed as revision 23620 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* svq3 now in working condition, at least vissually, ill let fate tell usMichael Niedermayer2010-02-251-15/+15
| | | | | | if the checksums match Originally committed as revision 22061 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix compilation, sorry ive not checked cvslog for a while :(((Michael Niedermayer2010-02-251-15/+15
| | | | | | | svq3 decoder does not work yet though but i didnt want to keep compilation broken longer Originally committed as revision 22060 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix svq3_* function declarations.Rafaël Carré2010-01-271-2/+2
| | | | | | Patch by Rafaël Carré, rafael D carre A gmail Originally committed as revision 21489 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Apply changes made in r21308 to svq3.c.Jai Menon2010-01-191-4/+0
| | | | | | Fixes compilation with gcc and -O0. Originally committed as revision 21316 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split motion vector prediction off h264.c/h.Michael Niedermayer2010-01-121-0/+1
| | | | Originally committed as revision 21174 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is justMichael Niedermayer2010-01-121-1/+1
| | | | | | | | called once per MB in worst case and doesnt seem to benefit from static inline. Actually the code might be a hair faster now (0.1% according to my benchmark but this could be random noise) Originally committed as revision 21173 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of #include "svq3.c"Michael Niedermayer2010-01-121-10/+25
| | | | | | | | | | | functions called more than per mb are moved into the header, scan8 is also as it must be known at compiletime. The code after this patch duplicates h264data.h, this has been done to minimize the changes in this step and allow more fine grained benchmarking. Speedwise this is 1% faster on my pentium dual core with diegos cursed cathedral sample. Originally committed as revision 21157 to svn://svn.ffmpeg.org/ffmpeg/trunk
* SVQ3 : Set avctx->pix_fmt correctly during decoder initialisation.Jai Menon2009-12-121-0/+1
| | | | | | Fixes issue 1591. Originally committed as revision 20810 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add additional long names for the Sorenson Vector Quantizer 3 decoder.Stefano Sabatini2009-10-191-1/+1
| | | | Originally committed as revision 20316 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check thread count as multithreaded decoding is not supported.Michael Niedermayer2009-09-091-0/+5
| | | | | | Fixes issue1292 Originally committed as revision 19801 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark all pix_fmts and supported_framerates compound literals as const.Reimar Döffinger2009-09-061-1/+1
| | | | | | Makes no difference for gcc but at least icc can put them in .rodata then. Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Parse frame size code, see "svq3.c: parse frame size" thread on ML.Ronald S. Bultje2009-08-041-3/+14
| | | | Originally committed as revision 19583 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud