summaryrefslogtreecommitdiff
path: root/libavcodec/h264_mb_template.c
Commit message (Collapse)AuthorAge
* 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>
* | 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 '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 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191': h264: move mb_field_decoding_flag into the per-slice context Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_field_decoding_flag into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719': h264_mb: constify all uses of H264Context Conflicts: libavcodec/h264.h libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_mb: constify all uses of H264ContextAnton Khirnov2015-03-21
| | | | | | | | | | All the variables modified by this code are either per-MB arrays or have been moved to the per-slice context
* | Merge commit '51822879e7732ee8175dad98dde1a135f6e5c1a4'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '51822879e7732ee8175dad98dde1a135f6e5c1a4': h264_mb: constify block_offset Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_mb: constify block_offsetAnton Khirnov2015-03-21
| | | | | | | | It is read-only in this code.
* | Merge commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4d9068cdf8f4b2b87ae87a2ef880d243f77b977': h264: move mb_{x,y} into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cavlc.c libavcodec/h264_mb.c libavcodec/h264_slice.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_{x,y} into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0edbe6faa7ef80daf0e84353cbe733389bf1a522': h264: move mb_xy into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cabac.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_xy into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'e6c90ce94f1b07f50cea2babf7471af455cca0ff': h264: move loopfilter parameters into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move loopfilter parameters into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'e7226984ac13aacb84eae77a372df8ff7685848f'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit 'e7226984ac13aacb84eae77a372df8ff7685848f': h264: move [{top,left}_]cbp into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move [{top,left}_]cbp into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bf03a878a76dea29b36f368759e9f66102b39a5f': h264: move mb[_{padding,luma_dc}] into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_cavlc.c libavcodec/h264_mb.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb[_{padding,luma_dc}] into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | * commit 'b063582e0c4f775a8ba377488bd085595e0e7fae': h264: move intra_pcm_ptr into the per-slice context Conflicts: libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move intra_pcm_ptr into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '95eb35f30513e335990ad0d5dca6ddc318477291'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95eb35f30513e335990ad0d5dca6ddc318477291': h264: move the ref lists variables into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_direct.c libavcodec/h264_mb.c libavcodec/h264_picture.c libavcodec/h264_refs.c libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move the ref lists variables into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '5f390eef8ee2b8adab00c5d2923a52aa261eb999': h264: move mb_[uv]linesize into the per-slice context Conflicts: libavcodec/h264.h libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move mb_[uv]linesize into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b': h264: move {mv,ref}_cache into the per-slice context Conflicts: libavcodec/h264_cabac.c libavcodec/h264_mb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move {mv,ref}_cache into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d': h264: move non_zero_count_cache into the per-slice context Conflicts: libavcodec/h264.c libavcodec/h264_cabac.c libavcodec/h264_cavlc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move non_zero_count_cache into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052': h264: move some neighbour information into the per-slice context Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move some neighbour information into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | * commit '4bd5ac200d15b4f458a50f66006549825f9fc865': h264: move {chroma,intra16x16}_pred_mode into the per-slice context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move {chroma,intra16x16}_pred_mode into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd231e84b06a9964c840cff4e228509f706165fb6': h264: move the quantizers into the per-slice context Conflicts: libavcodec/dxva2_h264.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: move the quantizers into the per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'Michael Niedermayer2015-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87': h264: split weighted pred-related vars into per-slice context Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_mb.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: split weighted pred-related vars into per-slice contextAnton Khirnov2015-03-21
| |
* | Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'Michael Niedermayer2014-03-26
|\| | | | | | | | | | | | | * commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f': Add missing headers to make template files compile (more) standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing headers to make template files compile (more) standaloneDiego Biurrun2014-03-26
| |
* | Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | * commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d': h264: Remove MotionEstContext and move the relevant fields to H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Remove MotionEstContext and move the relevant fields to H264ContextVittorio Giovara2014-03-16
| | | | | | | | Unused buffers scratchpad and temp have been dropped too.
| * h264: Integrate clear_blocks calls with IDCTRonald S. Bultje2013-04-10
| | | | | | | | | | | | | | | | | | The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700 to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb (in the decode_slice loop) goes from 1759 to 1733 cycles on the clip tested (cathedral), i.e. almost 30 cycles per mb faster. Signed-off-by: Martin Storsjö <martin@martin.st>
* | h264: reduce whitespace differences to libavMichael Niedermayer2013-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'Michael Niedermayer2013-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23e85be58fc64b2e804e68b0034a08a6d257e523': h264: add a parameter to the CHROMA444 macro. h264: add a parameter to the CHROMA422 macro. Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: add a parameter to the CHROMA422 macro.Anton Khirnov2013-03-21
| | | | | | | | This way it does not look like a constant.
* | Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'Michael Niedermayer2013-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4': h264: add a parameter to the FIELD_PICTURE macro. h264: add a parameter to the FRAME_MBAFF macro. Conflicts: libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: add a parameter to the FRAME_MBAFF macro.Anton Khirnov2013-03-21
| | | | | | | | This way it does not look like a constant.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 23:51:27 +0000