generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,740 Commits 24 Branches 241 Tags 173 MiB
24006f59cb
Commit Graph

121 Commits

Author SHA1 Message Date
Michael Niedermayer
2dc380ca8e Store sub_mb_type in direct_cache/direct_table. 
This is equal complexity but could be more usefull.

Originally committed as revision 21821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 14:41:27 +00:00
Michael Niedermayer
3d2c3ef4b4 Remove slice_table checks from decode_cabac_mb_cbp_luma() and set left/top_cbp so 
these checks arent needed.

Originally committed as revision 21819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 02:08:48 +00:00
Michael Niedermayer
056c502155 Revert r21814 
Log:
	h264: Fix pointer warnings by removing redundant [0]

	Fixes:
	h264.h:1222:38: warning: initialization from incompatible pointer type
	h264.h:1299:38: warning: initialization from incompatible pointer type
	h264.h:1314:42: warning: initialization from incompatible pointer type

Reason: breaks h264 decoding & fate

Originally committed as revision 21818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 02:04:41 +00:00
Michael Niedermayer
e916764675 Direct temporal skiped MBs dont need fill_decode_caches() at all so dont call it 
for them.

Originally committed as revision 21816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 22:53:44 +00:00
Alexander Strange
78998bf217 h264: Remove unused variables. 
Originally committed as revision 21815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 21:09:38 +00:00
Alexander Strange
677dab59cb h264: Fix pointer warnings by removing redundant [0] 
Fixes:
h264.h:1222:38: warning: initialization from incompatible pointer type
h264.h:1299:38: warning: initialization from incompatible pointer type
h264.h:1314:42: warning: initialization from incompatible pointer type

Originally committed as revision 21814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 21:08:17 +00:00
Alexander Strange
cd12c37729 Fix integer overflow warnings in h264.h 
Fixes:
h264.h: In function 'fill_filter_caches':
h264.h:1216:73: warning: integer overflow in expression
h264.h:1307:81: warning: integer overflow in expression

Originally committed as revision 21813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 20:57:13 +00:00
Michael Niedermayer
bb770c5b52 Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type) 
Originally committed as revision 21812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 20:13:54 +00:00
Michael Niedermayer
2e4362af14 Skiped MBs dont need the cbp stuff so skip initing that. 
Originally committed as revision 21811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 20:13:10 +00:00
Michael Niedermayer
e2b28acf89 Also skip direct/mvd_cache init for skiped blocks. 
Odd thing is i thought ive tryed this already and it failed previously.

Originally committed as revision 21809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 19:39:18 +00:00
Michael Niedermayer
cb9285a246 Move more code under if(!IS_DIRECT(mb_type)). 
Originally committed as revision 21806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 19:00:51 +00:00
Michael Niedermayer
f2b3763736 Skip some more code that isnt needed for direct MBs. 
Originally committed as revision 21798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:23:46 +00:00
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
 2010-02-13 15:57:49 +00:00
Michael Niedermayer
da452acac6 Dont calculate any surrounding MVs for temporal MBs 
Originally committed as revision 21793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 15:30:27 +00:00
Michael Niedermayer
8a3b90686d Remove an apparently unneeded && !FRAME_MBAFF. 
This should speed the affected cases (MBAFF temporal direct MBs) up.

Originally committed as revision 21686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 04:24:50 +00:00
Michael Niedermayer
3a06e8647f Ooops, 10l forgot to commit h264.h. 
Originally committed as revision 21680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-07 23:15:53 +00:00
Rafaël Carré
881b5b80da Fix svq3_* function declarations. 
Patch by Rafaël Carré, rafael D carre A gmail

Originally committed as revision 21489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 22:22:01 +00:00
Michael Niedermayer
8652e44acd Simplify left_xy init 
Originally committed as revision 21470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-27 00:15:55 +00:00
Michael Niedermayer
599fe45b8d Split fill_caches() between loopfilter & decode, the 2 no longer where common 
enough to justify the messy interleaving.

Originally committed as revision 21469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 23:54:11 +00:00
Michael Niedermayer
dfe4dc154b use left_xy[1] in mbaff QP loop filter check, this improves the amount that can 
be skiped.

Originally committed as revision 21465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 20:28:58 +00:00
Michael Niedermayer
aebf31236e Optimize mv/ref cache init for left MB. 
Originally committed as revision 21464 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 20:25:14 +00:00
Michael Niedermayer
a715af8ff4 Simplify left_xy content for the loop filter, this also makes it closer to 
what is needed and its faster too.

Originally committed as revision 21458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 14:55:19 +00:00
Michael Niedermayer
99344d4372 Set top & left types for deblock in fill_caches(). 
Originally committed as revision 21456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 13:38:18 +00:00
Michael Niedermayer
66472bcde0 cosmetic 
Originally committed as revision 21454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 13:28:55 +00:00
Michael Niedermayer
3046c25ec5 Fix qp_thres loop filter check for MBAFF. 
Originally committed as revision 21453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 13:27:22 +00:00
Michael Niedermayer
806ac67b51 Optimize mb neighbor initialization for MBAFF in fill_caches(). 
~10 cpu cycles speedup.

Originally committed as revision 21452 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 10:35:36 +00:00
Alexander Strange
0b69d6254f H.264: Use 64-/128-bit write-combining macros for copies 
2-3% faster decode on x86-32 core2.

Originally committed as revision 21440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-25 00:30:44 +00:00
Laurent Aimar
0dc343d4cb Added a missing const to ff_h264_get_slice_type(). 
Originally committed as revision 21421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-24 16:37:12 +00:00
Michael Niedermayer
b2b7ab32aa Prefer cbp over cbp_table. 
Originally committed as revision 21418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-24 13:43:26 +00:00
Michael Niedermayer
2c0ee01866 Remove unneeded reset of non_zero_count_cache for deblock. 
Originally committed as revision 21414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 22:11:46 +00:00
Michael Niedermayer
01c511683f Remove useless things from the deblock side of fill_caches(). 
Originally committed as revision 21413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 21:57:36 +00:00
Michael Niedermayer
ea3b456dd6 make mv_cache init 64bit where possible. 
Originally committed as revision 21412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-23 21:45:12 +00:00
Måns Rullgård
c67278098d Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-22 03:25:11 +00:00
Michael Niedermayer
c2894fbf1c Dont waste time initializing stuff for deblocking intra mbs, none of 
it is used.

Originally committed as revision 21315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-19 03:14:45 +00:00
Michael Niedermayer
7a93858a6d Fix accumulated indention errors. 
Originally committed as revision 21307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:34:37 +00:00
Michael Niedermayer
70bd7a3d48 Optimize top non_zero_count_cache init. 
Originally committed as revision 21306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:31:14 +00:00
Michael Niedermayer
5e07aa7721 Dont init chroma elements of non_zero_count_cache for deblock. 
Originally committed as revision 21305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:30:21 +00:00
Michael Niedermayer
5cc5d9bf29 Remove unneeded for_deblock check, this code was alraedy under for_deblock. 
Originally committed as revision 21304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 23:27:53 +00:00
Michael Niedermayer
a7d7cdaac7 Set h->cbp for ff_h264_filter_mb_fast(). 
Originally committed as revision 21287 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 16:11:13 +00:00
Michael Niedermayer
b6ef858ec7 Move CAVLC 8x8 DCT special case from ff_h264_filter_mb() to fill_caches 
that way it is also available for ff_h264_filter_mb_fast().

Originally committed as revision 21283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 13:09:53 +00:00
Michael Niedermayer
6d7e6b2657 Perform reference remapping at fill_cache() time instead of in the 
loop filter. This removes one obstacle of getting ff_h264_filter_mb_fast()
bitexact. code is maybe 0.1% faster

Originally committed as revision 21280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 05:15:31 +00:00
Michael Niedermayer
7da0d82104 Make qp check for loop filter skiping also work with MBAFF. 
Originally committed as revision 21276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 00:34:28 +00:00
Michael Niedermayer
12be38ec18 Comment about a cornercase we ignore currently 
Originally committed as revision 21275 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 00:21:58 +00:00
Michael Niedermayer
44a5e7b64c Move the qp check to skip the loop filter up. 
Originally committed as revision 21274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-18 00:20:44 +00:00
Michael Niedermayer
b6303e6d2a Reorganize how values are stored in h->non_zero_count. 
~1% faster

Originally committed as revision 21273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 23:44:23 +00:00
Michael Niedermayer
2911e13224 Disable a few things in fill_filter_caches() that arent needed. 
0.1% speedup

Originally committed as revision 21272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 22:05:36 +00:00
Michael Niedermayer
f432b43b08 Split fill_caches() between filter and decoder. 
Originally committed as revision 21271 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 21:43:08 +00:00
Michael Niedermayer
c988f97566 Rearchitecturing the stiched up goose part 1 
Run loop filter per row instead of per MB, this also should make it
much easier to switch to per frame filtering and also doing so in a
seperate thread in the future if some volunteer wants to try.
Overall decoding speedup of 1.7% (single thread on pentium dual / cathedral sample)
This change also allows some optimizations to be tried that would not have
been possible before.

Originally committed as revision 21270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-17 20:35:55 +00:00
Michael Niedermayer
2e36c931f0 Avoid wasting 4 cpu cycles per MB in redundantly calculating qp_thresh. 
Originally committed as revision 21243 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-16 11:55:35 +00:00
Michael Niedermayer
ddd60f28d8 Replace cabac checks in inline functions from h264.h with constants. 
No benchmark because its just replacing variables with litteral constants
(so no risk for slowdown outside gcc silliness) and i need sleep.

Originally committed as revision 21237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-16 05:41:33 +00:00