Diego Biurrun
2a61592573
avcodec: Remove some commented-out debug cruft
12 years ago
Michael Niedermayer
3d68f5e032
h264_direct: assert the validity of the spatial ref
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
7bece9b22f
h264: add a parameter to the FRAME_MBAFF macro.
...
This way it does not look like a constant.
12 years ago
Anton Khirnov
759001c534
lavc decoders: work with refcounted frames.
12 years ago
Diego Biurrun
c242bbd8b6
Remove unnecessary dsputil.h #includes
12 years ago
Anton Khirnov
2c54155407
h264: deMpegEncContextize
...
Most of the changes are just trivial are just trivial replacements of
fields from MpegEncContext with equivalent fields in H264Context.
Everything in h264* other than h264.c are those trivial changes.
The nontrivial parts are:
1) extracting a simplified version of the frame management code from
mpegvideo.c. We don't need last/next_picture anymore, since h264 uses
its own more complex system already and those were set only to appease
the mpegvideo parts.
2) some tables that need to be allocated/freed in appropriate places.
3) hwaccels -- mostly trivial replacements.
for dxva, the draw_horiz_band() call is moved from
ff_dxva2_common_end_frame() to per-codec end_frame() callbacks,
because it's now different for h264 and MpegEncContext-based
decoders.
4) svq3 -- it does not use h264 complex reference system, so I just
added some very simplistic frame management instead and dropped the
use of ff_h264_frame_start(). Because of this I also had to move some
initialization code to svq3.
Additional fixes for chroma format and bit depth changes by
Janne Grunau <janne-libav@jannau.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Michael Niedermayer
4f927542fb
h264_direct: silence several warning: assignment from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
511cf612ac
miscellaneous typo fixes
12 years ago
Michael Niedermayer
ed2d7d5868
ff_h264_direct_ref_list_init: fix B slice check.
...
Fixes null pointer dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
12 years ago
Janne Grunau
73ad2c2fa7
h264: increase dist_scale_factor for up to 32 references
...
Compute dist_scale_factor_field only for MBAFF since that is the only
case in which it is used.
12 years ago
Michael Niedermayer
c9aab8a123
h264: use mbaff ref indices in fill_colmap() only for mbaff references
...
Prevents writing beyond array bounds.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
12 years ago
Michael Niedermayer
36cf247e43
ff_h264_direct_ref_list_init: fix B slice check.
...
Fixes null pointer dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
758ec11153
h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years ago
Diego Biurrun
324deaa268
Replace AVFrame pointer type punning by proper struct member assignments.
13 years ago
Diego Biurrun
47c0ac96aa
Replace AVFrame pointer casts by proper struct member accesses.
13 years ago
Michael Niedermayer
833a195905
h264: Fix invalid interlaced progressive MB combinations for direct mode prediction.
...
Fixes Ticket312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Steven Walters
27237d524e
w32threads: support for frame multithreading
...
Replace our incomplete w32threads implementation with x264's pthreads
w32threads wrapper.
Relicensed to LGPL with kind permission by Pegasys Inc.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
13 years ago
Michael Niedermayer
a3ba542af3
h264: fix fill_colmap() to not store entries mbaff style when the reference is not mbaff at all
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Diego Biurrun
95a06eb4d5
Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination.
...
This fixes build failures with -DDEBUG in CPPFLAGS.
13 years ago
Diego Biurrun
657ccb5ac7
Eliminate FF_COMMON_FRAME macro.
...
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture. Replace by an embedded AVFrame structure in struct Picture.
14 years ago
Alexander Strange
6a9c859444
H264/MPEG frame-level multi-threading.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Stefano Sabatini
ce5e49b0c2
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
14 years ago
Stefano Sabatini
975a1447f7
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Michael Niedermayer
d375c10400
Fake-Merge remote-tracking branch 'ffmpeg-mt/master'
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
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
15 years ago
Michael Niedermayer
358b5b1a59
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
...
ones based on mb_stride in h264.
about 20 cpu cycles faster overall per MB
Originally committed as revision 22065 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Måns Rullgård
19769ece3b
H264: use alias-safe macros
...
This eliminates all aliasing violation warnings in h264 code.
No measurable speed difference with gcc-4.4.3 on i7.
Originally committed as revision 21881 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
24006f59cb
10l ;; gcc 2.95 compilation fix by mike
...
Originally committed as revision 21830 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
cbfcde9f52
10l use pack16to32(), should fix big endian h264 failures.
...
Originally committed as revision 21829 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
6e7c397b5c
Cosmetics, vertical align.
...
Originally committed as revision 21817 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
5ca43c25f6
Move setting MB_TYPE_L0L1 for direct MBs up, this is simpler.
...
Originally committed as revision 21794 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
5134ad53ed
Simplify if()
...
Originally committed as revision 21791 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
752cc0dcb2
Init sub_mb_type cleanly.
...
Originally committed as revision 21790 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
923bcb4048
100l Forgoten hunk.unbreak compile before someone notices.
...
Originally committed as revision 21789 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
af0d6581e1
Restructure spatial direct MV generation so that the zero predictior shortcut
...
is closer at the top.
50-130 cpu cycles faster depending on which kind of direct MBs are meassured.
Originally committed as revision 21788 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
edb4df436f
Split spatial and temporal direct MV generation.
...
A little faster and needed for future optimizations.
This sadly leads to some code duplication (which i hope i can factor out
again after the optimizations on the direcr mv code are done)
Originally committed as revision 21787 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
812bfd7b44
Special case for spatial direct MV predictor being 0.
...
a little less than 200 cpu cycles faster with the cathedral sample.
Originally committed as revision 21785 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
828cfff63d
Pack MVs together from the begin for spatial direct, this simplifies the code
...
and is a bit faster (5-10 cpu cycles depending on what is meassured).
Originally committed as revision 21784 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
daaf6e3e9e
Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler.
...
Originally committed as revision 21694 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
1be49ce54b
Set partitioning to 16x16 for spatial direct MBs with mixed interlacing.
...
11cylcles slower MV generation
98cycles faster MC
Originally committed as revision 21691 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
3babc711d8
Detect spatial direct MBs partitioned smaller than 16x16 that can be partitioned
...
as 16x16 (except ones changing interlacing relative to the colocated MB).
20 cycles slower during MV generation
175 cycles faster during MC
Originally committed as revision 21690 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
8b9eb2dfec
Detect equal 4x4 blocks in spatial direct MBs.
...
19 cycles slower MV generation
575 cycles faster MC
Originally committed as revision 21689 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
542d4a756a
Branchless calculation of ref_offset.
...
7 cpu cycles faster.
Originally committed as revision 21685 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
fb70c63f70
Remove incorrect fixme, i see no case that is missing.
...
Originally committed as revision 21684 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
35c8b9c094
Replace call to pred_motion() in direct spatial mv pred by code
...
and simplify cases that cannot happen away.
8 cpu cycles faster
Originally committed as revision 21683 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
055a6aa76a
Set x264_build so that checks are simpler.
...
Originally committed as revision 21681 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
3b9e61e45f
Zero a/b only in the branch where they need to be zeroed.
...
Originally committed as revision 21679 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
f28a2656c3
Merge mv&ref related code for spatial direct MV code.
...
a bit more than 10 cpu cycles faster.
Originally committed as revision 21678 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
0a8dca8765
Precalculate a few variables for direct mv prediction for interlaced MBs.
...
Originally committed as revision 21677 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago