generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
64,359 Commits 24 Branches 241 Tags 173 MiB
79d3eeb2b7
Commit Graph

356 Commits

Author SHA1 Message Date
Michael Niedermayer
38768cb70a Port Optimizations about *_type init from decode to filter code. 
1 cpu cycle faster

Originally committed as revision 22193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 02:00:05 +00:00
Michael Niedermayer
b46b5ac9f8 Optimize *_type init, 1.5 cpu cycles faster. 
Originally committed as revision 22192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-04 01:03:15 +00:00
Michael Niedermayer
3d9137c883 Reorder indexes in weight tables. 
5 cpu cycles faster.

Originally committed as revision 22183 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 21:10:08 +00:00
Michael Niedermayer
bd8868e092 Move all context fields that are not used in the mb and block layers 
to the end of the structure.
4 cpu cycles faster in 3k cpu cycles

Originally committed as revision 22181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 20:36:56 +00:00
Michael Niedermayer
65f3c029b9 remove unused left_border field from context. 
Originally committed as revision 22179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 19:44:27 +00:00
Michael Niedermayer
af2b0df40f Note about luma/chroma_weight tables and their datatype. 
Originally committed as revision 22177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 19:31:58 +00:00
Michael Niedermayer
d7f5e520bf move svq3 specific fields to the end of the context 
Originally committed as revision 22171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 16:47:40 +00:00
Michael Niedermayer
70118abd68 Merge weight & offset tables, 15 cpu cycles faster. 
Originally committed as revision 22169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 14:41:43 +00:00
Michael Niedermayer
f57880d244 Another 3 useless zeroing instructions. 
Originally committed as revision 22162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 02:20:48 +00:00
Michael Niedermayer
16b802fe93 Load the whole left side of mv&ref only when needed. 
30 cpu cycles faster

Originally committed as revision 22161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 01:38:27 +00:00
Michael Niedermayer
ce9c691616 Merge h->slice_table[left_xy[0/1] ] checks, 4 cpu cycles speedup 
Originally committed as revision 22086 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-27 04:09:48 +00:00
Michael Niedermayer
82fb5bb2ee Split *_type setting up, 4 cpu cycles faster. 
Originally committed as revision 22085 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-27 03:46:16 +00:00
Michael Niedermayer
cf41a02b1b Only load the topleft mv/ref when the topright is unavailable. 
8 cpu cycles faster.

Originally committed as revision 22079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 15:26:11 +00:00
Michael Niedermayer
cf7b67bc40 Remove some useless operations from the code setting left_cbp. 
maybe 0.5 cpu cycles faster

Originally committed as revision 22078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 15:03:00 +00:00
Michael Niedermayer
59b5370f02 Simplify code to set cbp_* 
this seems 1 cpu cycle slower even though we practically just remove code.
Speed loss seems caused by the merge of if(left_type), iam commiting this
anyway as i cant imagine this to be anything but compiler messup.

Originally committed as revision 22073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 09:13:40 +00:00
Michael Niedermayer
747db4e31a Move init of right side of ref_cache from fill_caches() to init_the_darn_decoder(). 
Originally committed as revision 22071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 03:27:52 +00:00
Michael Niedermayer
77c6edb846 Remove 3 mv_cache zeroing instructions that zeroed the right side. 
This seems unneeded as nothing seems to ever set it to non zero values.

Originally committed as revision 22070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 02:54:03 +00:00
Michael Niedermayer
8f8497ae78 Remove useless check of the 2 left MBs of a pair being in the same slice. 
Originally committed as revision 22069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 01:38:12 +00:00
Michael Niedermayer
6e2fe0f20a Remove unneeded line of code from the neighbor setting code in h264. 
Originally committed as revision 22067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-26 00:10:35 +00:00
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
 2010-02-25 23:44:42 +00:00
Michael Niedermayer
5e350863cc Store data in direct_table interleaved. 
seems 20cpu cycles faster

Originally committed as revision 22055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 15:27:55 +00:00
Michael Niedermayer
013202d720 Simplify intra4x4_pred_mode_cache init. 
Originally committed as revision 22054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 14:54:31 +00:00
Michael Niedermayer
662a5b2370 Reorder intra4x4_pred_mode so that we can read/write 4 values at once. 
3-7 cpu cycles faster

Originally committed as revision 22053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 14:26:12 +00:00
Michael Niedermayer
5b0fb5244d Store intra4x4_pred_mode per row only. 
about 5 cpu cycles slower in the local code but should be overall faster
due to reduced cache use. (my sample though has too few intra4x4 blocks
for this to be meassureable easily either way)

Originally committed as revision 22052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 14:02:39 +00:00
Michael Niedermayer
c2186cbddc unroll tiny and trivial loop. Same speed but clearer. 
Originally committed as revision 22051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 12:51:32 +00:00
Michael Niedermayer
e1c88a2138 Cut the size of mvd_table by yet another factor of 2. 
The code read/write code itself was 1 cycle faster, overall its
likely more due to cache effects

Originally committed as revision 22048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 04:11:33 +00:00
Michael Niedermayer
d43c192236 Keep mvd_table values of only 2 mb rows. 
Originally committed as revision 22047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 02:42:25 +00:00
Michael Niedermayer
b5bd070029 Change mvd_cache & mvd_table to 8bit, this is overall a bit faster 
for high resolution videos.
about 20cycles faster per MB for cathederal.

Originally committed as revision 22038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 20:43:06 +00:00
Michael Niedermayer
9127a369ad Replace /2 by faster >>1 as the mvd values are now all positive. 
Originally committed as revision 22013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 01:57:31 +00:00
Michael Niedermayer
5c34e36a23 Remove unused variable. Seems i forgot to commit this. 
Originally committed as revision 22012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 01:56:27 +00:00
Diego Biurrun
dd3475682e Remove unused variable, fixes warnings of the type: 
libavcodec/h264.h:816: warning: unused variable `mb_xy'

Originally committed as revision 21941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 15:29:17 +00:00
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
 2010-02-18 16:24:31 +00:00
Michael Niedermayer
69a28f3e2b Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs 
there as well.

Originally committed as revision 21861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 02:25:05 +00:00
Michael Niedermayer
69cc31832f Move check for and call of predict_field_decoding_flag() from the mb code to 
the row code. This function would only be needed on a MB basis for MBAFF+FMO

Originally committed as revision 21860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 02:14:02 +00:00
Michael Niedermayer
c1bb66ac19 Split setting neighboring MBs from fill_decode_caches() 
no speed change.

Originally committed as revision 21842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 22:07:02 +00:00
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
Michael Niedermayer
7c2de274e7 Add forgotten include of h264_mvpred.h to h264.h. 
This could have caused the linking failure of pred_pskip_motion() missing if
a compiler included never used static functions.

Originally committed as revision 21221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-15 03:42:56 +00:00
Michael Niedermayer
cc51b28299 Split cabac decoding code out of h264.c. 
not slower according to benchmarks.

Originally committed as revision 21181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 02:35:36 +00:00
Michael Niedermayer
e1e949026e Split cavlc out of h264.c. 
Seems to speed the code up a little...
The placement of many generic functions between h264.c and h264.h is still open
Currently they are a little randomly placed between them.

Originally committed as revision 21178 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-13 01:59:19 +00:00
Michael Niedermayer
188d3c510d Split motion vector prediction off h264.c/h. 
Originally committed as revision 21174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 21:36:26 +00:00
Michael Niedermayer
2bedc0e854 Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just 
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
 2010-01-12 21:17:26 +00:00
Michael Niedermayer
ea6f00c448 Split all the reference picture handling off h264.c. 
Originally committed as revision 21172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 20:59:00 +00:00
Michael Niedermayer
889fce8e30 Split (picture|seq) parameter set decoding out of h264.c. 
no speedloss meassured, also its really not touching anything that is speed relevant.

Originally committed as revision 21169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 19:33:45 +00:00
Michael Niedermayer
9c09546352 Split SEI code off h264.c. 
Originally committed as revision 21168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 18:54:40 +00:00
Michael Niedermayer
943f69a6ea Split direct mode (macro)block decoding off h264.c. 
No speedloss meassured (its slightly faster here but that may be random fluctuations)

Originally committed as revision 21165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 14:32:58 +00:00
Michael Niedermayer
082cf97106 Split h264 loop filter off h264.c. 
No meassureable speed difference on pentium dual & cathedral sample.

Originally committed as revision 21159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-12 06:01:55 +00:00
Michael Niedermayer
903d58f631 Get rid of #include "svq3.c" 
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
 2010-01-12 05:30:31 +00:00
David Conrad
c4dffe7e36 Export fullrange flag and color information for h.264 
Originally committed as revision 21126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 00:31:39 +00:00
Laurent Aimar
75dd693840 Export get_slice_type() as ff_h264_get_slice_type(). 
Patch by Laurent Aimar <fenrir at videolan dot org>.

Originally committed as revision 21110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-09 16:20:41 +00:00
Haruhiko Yamagata
b19d493f2b Add field prev_interlaced_frame to H264Context to be able to flag soft telecine 
progressive.

Patch by Haruhiko Yamagata, h D yamagata A nifty D com

Originally committed as revision 19141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-09 21:16:40 +00:00
Reimar Döffinger
cbf1eae9a5 Add forgotten void return type to ff_h264_free_context 
Originally committed as revision 18411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 11:31:55 +00:00
Reimar Döffinger
15861962a7 Add a ff_h264_free_context function and call it from the H.264 parser. 
This ensures that the parser will no longer leak memory for all SPS/PPS it encounters.

Originally committed as revision 18406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 07:01:55 +00:00
Ivan Schreter
70e01da3bf Add support for ct_type to correctly detect interlaced flag 
Originally committed as revision 17811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-04 19:37:19 +00:00
David S. Miller
da2911d5e8 sub_mb_type[] needs to be 8-byte aligned because it is referenced 
as a uint64_t in get_dct8x8_allowed().
Patch by David S. Miller <davem at davemloft dot net>

Originally committed as revision 17655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-28 08:38:33 +00:00
Ivan Schreter
1790a5e908 Make the following H264 functions available to the parser: 
ff_h264_decode_sei, ff_h264_decode_seq_parameter_set,
ff_h264_decode_picture_parameter_set, ff_h264_decode_nal,
ff_h264_decode_rbsp_trailing

Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17487 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 19:54:14 +00:00
Ivan Schreter
2ea89d9274 Parse buffering period (H.264, D.1.1). 
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 23:33:30 +00:00
Ivan Schreter
24a414e0fa Store CPB count in the context. 
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17439 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 23:25:59 +00:00
Ivan Schreter
cf6065ca6b Parse cbp_removal_delay in SEI picture structure. 
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 00:38:10 +00:00
Ivan Schreter
ff594f81df Parse dpb_output_delay in SEI picture structure. 
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 00:36:07 +00:00
Ivan Schreter
82e38c2952 Parse initial_cpb_removal_delay_length. 
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 00:33:33 +00:00
Ivan Schreter
37a558fe51 Add SEI recovery point frame counter to H264Context and use it when 
setting key_frame.

Patch by Ivan Schreter schreter A gmx D net

Originally committed as revision 17109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 23:04:16 +00:00
Ivan Schreter
dd02ea118b Replace hard-coded SEI type constants with symbolic names 
Patch by Ivan Schreter ( schreter gmx net )

Originally committed as revision 17064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 20:28:12 +00:00
Diego Biurrun
181d8a7f3a Remove unused CONFIG_H264_ENCODER #define. 
Originally committed as revision 16993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-04 20:41:09 +00:00
Gwenole Beauchesne
cb99c652eb Add fields to H264Context and SPS for upcoming VA API support. 
Patch by Gwenole Beauchesne gbeauchesne A splitted-desktop dotcom

Originally committed as revision 16976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 20:49:02 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Aurelien Jacobs
49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 17:19:17 +00:00
Michael Niedermayer
66c07ca96f Optimize get_dct8x8_allowed(). 
30 cpu cycles faster on pentium dual.

Originally committed as revision 16248 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-20 23:11:30 +00:00
Michael Niedermayer
89db0bae26 Do not recalculate constant part of is_complex for every MB. 
Originally committed as revision 16172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 20:26:22 +00:00
Diego Biurrun
ce9ff9cc52 Move #defines that are mostly used in h264.c out of h264data.h and into h264.h. 
Originally committed as revision 15927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-24 16:08:21 +00:00
Andreas Öman
b09a7c05f6 h264: Implement decoding of picture timing SEI message. 
Now correct values are propagated to interlaced_frame, top_field_first
and repeat_pict in AVFrame structure.

patch by ffdshow tryouts

Originally committed as revision 15773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-04 18:31:48 +00:00
Michael Niedermayer
b735aeead8 Replace literally hardcoded max slice number by named constant. 
Originally committed as revision 15736 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-28 22:50:16 +00:00
Michael Niedermayer
1fdcdf8d87 Add variable to hold the svq3 watermarking key, 
patch by baptiste that is based on reverse engineering by chrono.

Originally committed as revision 15616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-14 20:30:11 +00:00
Michael Niedermayer
2791c60883 Fix indention of NAL type enum. 
Originally committed as revision 15538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 01:08:48 +00:00
Michael Niedermayer
44ee6135e2 Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h. 
Originally committed as revision 15534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 13:30:19 +00:00
Michael Niedermayer
f4d3382da2 Another try to fix temporal direct mode references. 
Fixes at least
CAPAMA3_Sand_F.264
CVMAPAQP3_Sony_E.jsv

Originally committed as revision 15384 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-22 20:43:35 +00:00
Michael Niedermayer
8b1fd554e1 Make MBAFF temporal direct mode closer to the spec. 
Fixes at least:
CAMANL2_TOSHIBA_B
CVMANL2_TOSHIBA_B
camp_mot_mbaff0_full

Originally committed as revision 15375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-21 02:39:09 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Michael Niedermayer
d50cdd82de Use the correct reference tables for interlaced MBAFF MBs in the loop filter. 
Fixes at least
CAMP_MOT_MBAFF_L30
CAMP_MOT_MBAFF_L31
FRExt/FREXT01_JVC_D

Originally committed as revision 14680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-10 02:38:51 +00:00
Michael Niedermayer
0af6967ee7 chroma_format_idc=0 aka grayscale support. 
Can be disabled by removing #define ALLOW_NOCHROMA in case the extra if()
slow the code down measurably.
Fixes at least
FRExt/HPCAMOLQ_BRCM_B.264
FRExt/HPCVMOLQ_BRCM_B.264

Originally committed as revision 14407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-26 02:27:14 +00:00
Michael Niedermayer
5a78bfbde7 qscale has a range of 0..51 we thus do not need a 256 entry table and neither need 
to and it with 0xFF.

Originally committed as revision 14336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-22 13:01:10 +00:00
Michael Niedermayer
c32867b5b6 Loop filtering with multiple slice types fix. 
Fixes at least:
CABAST3_Sony_E.jsv
CABASTBR3_Sony_A.jsv
CABASTBR3_Sony_B.jsv

Originally committed as revision 14331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-21 22:19:06 +00:00
Michael Niedermayer
e3e6f18f16 Simplify slice type checks. 
Originally committed as revision 14323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-21 18:24:45 +00:00
Michael Niedermayer
41f5c62f5c Fix used references indexes in the loop filter. 
Disable filter_mb_fast() as it optimized the incorrect code.
Fixes at least:
BA3_SVA_C.264
CABA3_SVA_B.264
CABACI3_Sony_B.jsv
CAFI1_SVA_C.264
camp_mot_frm0_full.26l
CAWP5_TOSHIBA_E.264
CVFI2_SVA_C.264
CVSE3_Sony_H.jsv
CVWP2_TOSHIBA_E.264
CVWP5_TOSHIBA_E.264
SL1_SVA_B.264

Originally committed as revision 14315 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-20 18:06:41 +00:00
Michael Niedermayer
df8a7dff29 Remove delayed_output_pic, I do not understand what this variable was good for. 
It is simpler and might be faster now.

Originally committed as revision 14289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-19 02:53:57 +00:00
Alexander Strange
64b9d48f76 Move the size of the H264Context delayed_pic array into a #define. 
This improves readability by getting rid of some magic numbers.

Originally committed as revision 14248 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-15 21:30:04 +00:00
Alexander Strange
fedec603db Don't test for H264 encoding unless an encoder exists. 
Originally committed as revision 14048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-02 21:46:18 +00:00
Alexander Strange
64514ee8de Store mb_xy in H264Context and only calculate it once per MB. 
Originally committed as revision 13125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-11 19:16:21 +00:00
Michael Niedermayer
59eeddf063 Crop parameters are unsigned, having them negative could be bad and lead 
to crashes or maybe exploits (not checked at all if this is possible).

Originally committed as revision 12789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-11 12:57:49 +00:00
Diego Biurrun
2cab640129 typo fixes 
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:58:46 +00:00
Loren Merritt
ed5d7a531c ff_h264_idct8_add_sse2. 
compared to mmx, 217->126 cycles on core2, 262->220 on k8.

Originally committed as revision 11826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-03 07:05:11 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +00:00
Carl Eugen Hoyos
d6c52130f7 Enable PAFF decoding 
Originally committed as revision 10696 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-09 12:28:17 +00:00
Jeff Downs
f3e53d9fcd Modifies macroblock addressing and current macroblock y-position for field decoding. 
Adds convenience definition for pictures that are field or mbaff based. Part of PAFF implementation.

patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30

Originally committed as revision 10672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-06 05:59:14 +00:00
Jeff Downs
f57e2af68b Fix h->curr_pic_num for field pictures. Necessary for proper PAFF support. 
patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30

Originally committed as revision 10663 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-04 06:43:58 +00:00
Jeff Downs
bbb3edb827 Partial PAFF implementation at macroblock level. 
PAFF support disabled until implementation complete.
patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30

Originally committed as revision 10658 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-04 06:33:26 +00:00
Jeff Downs
0d0447eae0 Rename MMCO stuff to prepare for h264/PAFF implementation. 
patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30

Originally committed as revision 10646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-02 14:35:20 +00:00
Jeff Downs
bcc3476c98 Cosmetic preparations for h264/PAFF implementation. 
patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30

Originally committed as revision 10645 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-02 14:25:47 +00:00
Andreas Öman
afebe2f7ca Add slice-based parallel H.264 decoding 
Patch by Andreas Öman % andreas A olebyn P nu %
NB: depends on having a thread library activated at config time, and on
having a source encoded with multiple slices
Original threads:
date: May 18, 2007 11:00 PM
subject: [FFmpeg-devel] Parallelized h264 proof-of-concept
date: Jun 15, 2007 10:10 PM
subject: [FFmpeg-devel] [PATCH] h264 parallelized, (was: Parallelized h264 proof-of-concept)
date: Jun 25, 2007 7:02 PM
subject: Re: [FFmpeg-devel] [PATCH] h264 parallelized

Originally committed as revision 10407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-05 16:18:15 +00:00
Kostya Shishkov
c92a30bb06 Move H.264 intra prediction functions into their own context 
Originally committed as revision 10397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-05 05:30:08 +00:00
Andreas Öman
4691a77db4 Add support for streams with different chroma_qp_index_offset 
for Cr and Cb
Patch by Andreas Öman % andreas A olebyn P nu %
Original thread:
Date: Jun 26, 2007 8:48 PM
subject: [FFmpeg-devel] Color corruption and seeking errors with H264 disc sources

Originally committed as revision 9505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 14:21:37 +00:00
Andreas Öman
042ef4b720 Precompute a chroma_qp table with index offset for each pps, 
this saves speed for the upcoming secondqp fix.
Patch by Andreas Öman % andreas A olebyn P nu %
Original thread:
Date: Jun 26, 2007 8:48 PM
subject: [FFmpeg-devel] Color corruption and seeking errors with H264 disc sources

Originally committed as revision 9498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 07:58:08 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Andreas Öman
24456882f3 Do not reuse the rbsp de-escape buffer if both 
the intra and inter -nal units are escaped
patch by Andreas Öman: \andreas olebyn nu/
original thread:
[FFmpeg-devel] [PATCH] h264: rbsp de-escape and data partitioning..
date: 06/20/2007 09:32 AM

Originally committed as revision 9374 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-20 08:53:53 +00:00
Diego Biurrun
90b5b51eab misc typo fixes 
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 18:50:50 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Andreas Öman
7978debdc2 allocate PPS and SPS dynamically 
patch by Andreas Öman andreas ta olebyn tod nu
reference thread:
subject: [FFmpeg-devel] [PATCH] h264: allocate PPS and SPS dynamically
date: 05/28/2007 03:00 PM

Originally committed as revision 9148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-29 14:35:29 +00:00
Aurelien Jacobs
26b4fe821c split h264.c to move parser in its own file 
Originally committed as revision 8985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 22:26:44 +00:00