summaryrefslogtreecommitdiff
path: root/libavcodec/svq3.c
Commit message (Collapse)AuthorAge
...
* | Merge commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c'Derek Buitenhuis2016-05-03
|\| | | | | | | | | | | | | * commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c': svq3: move mb strides/sizes to the SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: move mb strides/sizes to the SVQ3ContextAnton Khirnov2016-03-28
| |
* | Merge commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba'Derek Buitenhuis2016-05-03
|\| | | | | | | | | | | | | * commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba': svq3: move the dequant buffer to SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: move the dequant buffer to SVQ3ContextAnton Khirnov2016-03-28
| | | | | | | | Remove now unnecesary call to ff_h264_alloc_tables()
* | Merge commit '549fc77273636d0d02175362af5dcd60c79f7633'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit '549fc77273636d0d02175362af5dcd60c79f7633': svq3: move mb2br_xy to the SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: move mb2br_xy to the SVQ3ContextAnton Khirnov2016-03-28
| |
* | Merge commit '99dde60391cade40ae026b9e385a5280be6b9882'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit '99dde60391cade40ae026b9e385a5280be6b9882': svq3: move {ref,mv}_cache to the SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: move {ref,mv}_cache to the SVQ3ContextAnton Khirnov2016-03-28
| |
* | Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit '89a13998a1b5074411dff5a461dce3837057b0b8': svq3: rip out the svq3-relevant parts of pred_motion() out of h264 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: rip out the svq3-relevant parts of pred_motion() out of h264Anton Khirnov2016-03-28
| |
* | Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit '8eecae77ff6e2923de57dd883421d24fd53ca61f': svq3: move edge_emu_buffer to the SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: move edge_emu_buffer to the SVQ3ContextAnton Khirnov2016-03-28
| |
* | Merge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit '527bf5f7c6890664b0f1dccd42397f4d204659fe': svq3: move the pred mode variables to SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: move the pred mode variables to SVQ3ContextAnton Khirnov2016-03-28
| | | | | | | | This will allow removing the H264Context dependency in the future.
* | Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad': h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parseAnton Khirnov2016-03-28
| | | | | | | | It is shared with svq3.
* | Merge commit '1877712c586df2261f2806f45388c77592b89d1e'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit '1877712c586df2261f2806f45388c77592b89d1e': svq3: move mb_{x,y,xy} to SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: move mb_{x,y,xy} to SVQ3ContextAnton Khirnov2016-03-28
| | | | | | | | This will allow removing the H264Context dependency in the future.
* | Merge commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600': svq3: eliminate write_back_intra_pred_mode() usage Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: eliminate write_back_intra_pred_mode() usageAnton Khirnov2016-03-28
| | | | | | | | | | This function depends on the h264 internals and is so tiny that just copying the code out is the simplest replacement.
* | Merge commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3': svq3: add all the required dsp contexts into SVQ3Context Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: add all the required dsp contexts into SVQ3ContextAnton Khirnov2016-03-28
| | | | | | | | | | Stop using the H264Context ones, to allow removing the H264Context dependency.
* | Merge commit '15b0517da986b312fc2fcb364a92db328380b15b'Derek Buitenhuis2016-04-27
|\| | | | | | | | | | | | | * commit '15b0517da986b312fc2fcb364a92db328380b15b': svq3: make the dsp functions static Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: make the dsp functions staticAnton Khirnov2016-03-28
| | | | | | | | There is no need for them to be extern anymore.
* | avcodec/svq3: fix assert type (was av_assert2 in h264 from where this was ↵Michael Niedermayer2016-04-26
| | | | | | | | | | | | | | | | copied) Type was lost in f8d1bb2f2ce9031940019e1cda4d30bc409ee349 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c'Derek Buitenhuis2016-04-26
|\| | | | | | | | | | | | | * commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c': svq3: rip out the mb decoding code shared with h264 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: rip out the mb decoding code shared with h264Anton Khirnov2016-03-28
| | | | | | | | | | The ~100 lines of shared code is not worth the pain of svq3 messing with h264 internals.
* | Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'Derek Buitenhuis2016-04-24
|\| | | | | | | | | | | | | * commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923': h264data: Move all data tables from a header to a .c file Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * h264data: Move all data tables from a header to a .c fileDiego Biurrun2016-03-25
| |
* | Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'Derek Buitenhuis2016-04-24
|\| | | | | | | | | | | | | * commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef': lavc: Deduplicate zigzag_scan table Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Deduplicate zigzag_scan tableDiego Biurrun2016-03-25
| |
* | Merge commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5'Derek Buitenhuis2016-04-14
|\| | | | | | | | | | | | | * commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5': svq3: Use a separate buffer for decoding the slices Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * svq3: Use a separate buffer for decoding the slicesLuca Barbato2016-03-16
| | | | | | | | The AVPacket.data should be considered read-only.
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-27
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-27
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | libavcodec/svq3: clarify unknown_flag by renaming to has_watermarkMichael Niedermayer2015-05-02
| | | | | | | | | | | | | | The name is based on how the field is used in the code Reviewed-by: compn <tempn@mi.rr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/svq3: Print unknown fields at debug levelMichael Niedermayer2015-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/svq3: Fix memleak of last_pic_for_ecMichael Niedermayer2015-05-01
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'Michael Niedermayer2015-04-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6': h264: use properly allocated AVFrames Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_refs.c libavcodec/h264_slice.c libavcodec/svq3.c libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: use properly allocated AVFramesAnton Khirnov2015-04-29
| |
* | Merge commit '249796e2560c2cce1add722c3e873de96b17be74'Michael Niedermayer2015-04-06
|\| | | | | | | | | | | | | | | | | * commit '249796e2560c2cce1add722c3e873de96b17be74': svq3: initialize some required H264Context fields. See: e6c710600e1d474b53e52398969140f79052bfde See: aa000ddab2352b82b9ef7ec0974080065b7cc409 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq3: initialize some required H264Context fields.Anton Khirnov2015-04-05
| | | | | | | | | | | | | | They are no longer initialized in ff_h264_decode_init() since 43fd3dd, so svq3 needs to initialize the manually. Fixes svq3 decoding, broken since 43fd3dd.
* | avcodec/svq3: add scaling matrix init that was removed from h264 initMichael Niedermayer2015-04-05
| | | | | | | | | | | | This is needed for svq3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/svq3: add initialization which was removed from h264 initMichael Niedermayer2015-04-05
| | | | | | | | | | | | This is needed for the svq3 code to work Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c28ed1d743443e783537d279ae721be3bbdf7646': h264: move [uv]linesize to the per-slice context Conflicts: libavcodec/h264_mb.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move [uv]linesize to the per-slice contextAnton Khirnov2015-03-21
| | | | | | | | | | | | While it is a per-frame variable, it is only really used in the low-level decoding code, so it is more efficient to store it in the slice context.
* | Merge commit '36d04801ba9d8622c2d759c172aea18561bac74d'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '36d04801ba9d8622c2d759c172aea18561bac74d': h264: move the scratch buffers into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_slice.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move the scratch buffers into the per-slice contextAnton Khirnov2015-03-21
| | | | | | | | | | | | | | Also change the method for allocating them. Instead of two possible alloc calls from different places, just ensure they are allocated at the start of each slice. This should be simpler and less bug-prone than the previous method.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 16:41:53 +0000