generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
46,548 Commits 24 Branches 241 Tags
Commit Graph

1189 Commits

Author SHA1 Message Date
Michael Niedermayer
2967101173 The deblock filter does not need all the intra availability stuff so do 
not recalculate it.

Originally committed as revision 14689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-11 03:08:02 +00:00
Michael Niedermayer
faa7e39466 Simplify constrained_intra_pred code in fill_caches(). 
Originally committed as revision 14688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-11 02:52:14 +00:00
Michael Niedermayer
d1d10e9125 Support MBAFF + constrained intra prediction. 
(no i would not have tried to implement this had i known what mess it is)
fixes at least:
CAMACI3_Sony_C

Originally committed as revision 14687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-11 02:21:33 +00:00
Michael Niedermayer
beca9a286c Mask bits of reference indexes properly to avoid negative numbers entangling 
each other.
Fixes at least:
CAMA1_TOSHIBA_B
cama1_vtc_c
CAMA3_Sand_E
cama3_vtc_b
CAMASL3_Sony_B
CVMA1_TOSHIBA_B
CVMAQP3_Sony_D
cvmp_mot_mbaff0_full_B
FRExt/HCAMFF1_HHI
FRExt/HCHP3_HHI_A
FRExt/HVLCMFF0_Sony_B

Originally committed as revision 14683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-10 16:10:39 +00:00
Michael Niedermayer
e248cb601e Remove a few more lines of unneeded code in fill_caches() for MBAFF. 
Also document why the remaining related part is apparently needed.

Originally committed as revision 14682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-10 15:39:46 +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
0281d32550 Do not execute the part of fill_caches() for the loopfilter that overwrites 
reference indexes and motion vectors.
Fixes at least:
CVMAQP2_Sony_G

Originally committed as revision 14678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-10 00:38:41 +00:00
Michael Niedermayer
3d11b8ce13 Remove more code that has become useless after the pairless MBAFF loop 
filter cleanup.

Originally committed as revision 14676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-09 18:11:25 +00:00
Michael Niedermayer
5f7f9719ac Remove odd pairwise deblock filtering applied to MBAFF MBs. 
Originally committed as revision 14673 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-09 01:17:34 +00:00
Michael Niedermayer
2ccd25d02b Use local variabes for *stride, where local variables exist. 
Originally committed as revision 14623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 12:06:30 +00:00
Michael Niedermayer
7d54ecc9cb indent 
Originally committed as revision 14622 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 11:34:46 +00:00
Michael Niedermayer
9b5fab918b Simplify l1mv/l1ref calculation. 
Originally committed as revision 14621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 11:33:40 +00:00
Michael Niedermayer
c210fa61cf simplify y_shift/ref_shift code 
Originally committed as revision 14620 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 11:17:23 +00:00
Michael Niedermayer
cc615d2ce8 indent 
Originally committed as revision 14619 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 11:04:49 +00:00
Michael Niedermayer
d00eac6c96 Factorize some code between temporal and spatial direct mode. 
Originally committed as revision 14618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 11:00:17 +00:00
Michael Niedermayer
8354477edc Port b4/b8_stride code from spatial direct mode to temporal. 
Fixes at least:
CAMANL3_Sand_E.264
camp_mot_picaff0_full.26l
CAPA1_TOSHIBA_B.264
CVPA1_TOSHIBA_B.264

Originally committed as revision 14546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 00:15:15 +00:00
Michael Niedermayer
42de393dcb Use frame_num and reference instead of poc for matching frames for direct 
mode MBs, this seems to work better with field/frame mixes. POC of both
can be the same and can be different that makes its use tricky.

Originally committed as revision 14545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 00:08:32 +00:00
Michael Niedermayer
6c86c44b83 *2 /2 is wrong for PAFF references, so do not do it. 
Originally committed as revision 14544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 23:29:34 +00:00
Michael Niedermayer
f0538030da Port col_parity code from spatial mode to temporal mode, 
I also love it if people duplicate code and fix one but not the other.

Originally committed as revision 14543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 23:06:45 +00:00
Michael Niedermayer
301e1057b8 The code under FRAME_MBAFF for temporal direct mode MBs is needed for PAFF as well. 
Originally committed as revision 14542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 22:59:53 +00:00
Michael Niedermayer
fa6a6c59e0 Remove redundant code. 
Originally committed as revision 14541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 22:52:54 +00:00
Michael Niedermayer
7762cc3dd4 Fill ref_count/ref_poc for both fields of frames. 
Originally committed as revision 14540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 22:32:41 +00:00
Art Clarke
910e366817 Fix static leaks in h264.c. 
Patch by Art Clarke aclarke A vlideshow D com

Originally committed as revision 14538 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 21:45:05 +00:00
Michael Niedermayer
45260d4faa Use ref_poc and ref_count from the correct field. 
Fixes at least
MR8_BT_B.h264

Originally committed as revision 14537 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 11:19:54 +00:00
Michael Niedermayer
4c0d57bdef Fix dist_scale_factor for long term reference pictures. 
Originally committed as revision 14536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 11:17:22 +00:00
Michael Niedermayer
71041842ec Use the correct collocated field in pred_direct_motion() when it differs in parity. 
Fixes at least:
FRExt/HPCAFL_BRCM_C.264
FRExt/HPCAFLNL_BRCM_C.264
FRExt/HPCVFL_BRCM_A.264
FRExt/HPCVFLNL_BRCM_A.264

Originally committed as revision 14529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-04 02:41:19 +00:00
Michael Niedermayer
aa6de49e95 Remove useless mb_field_decoding_flag setting code that was at the wrong spot. 
Originally committed as revision 14519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 13:11:14 +00:00
Michael Niedermayer
44e9dcf13a mb_field_decoding_flag was not initialized 
Fixes at least:
MR7_BT_B.h264
Sharp_MP_PAFF_1r2.jvt
Sharp_MP_PAFF_2.jvt

Originally committed as revision 14518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 13:00:39 +00:00
Michael Niedermayer
2879c75ff3 Picture.ref_count/ref_poc have to be stored per field (actually also per 
slice but thats a seperate bug)
Fixes at least:
CABREF3_Sand_D.264
camp_mot_fld0_full.26l
CVFI2_Sony_H.jsv
CVNLFI2_Sony_H.jsv

Originally committed as revision 14511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 23:13:27 +00:00
Michael Niedermayer
c1708e8dc8 Simplify intra PCM MB handling. 
Originally committed as revision 14476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-30 18:21:51 +00:00
Paul Kendall
9bec77fe8d Use #define instead of a constant. Patch by Paul Kendall. 
Originally committed as revision 14463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-29 05:39:33 +00:00
Jason Garrett-Glaser
aa6a89aa79 Small h264 decoding speed optimization: while->do/while 
Originally committed as revision 14459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-28 15:42:49 +00:00
Jeff Downs
18c7be6501 Initialize outputed_poc to INT_MIN at decoder initialization. 
Fixes issue 560

Originally committed as revision 14428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-27 13:49:04 +00:00
Paul Kendall
143d7f1443 left_block intialisation optimisation. 
This patch changes the left_block initialisation code in the fill_caches
function from individual array element setters to a simple pointer to a
pre-initialised array.
Patch by (Paul Kendall ! paul X kcbbs knodel gen knodel nz)
Date: Sun, 27 Jul 2008 11:40:18 +1200
Subject: [FFmpeg-devel] [PATCH] h264 fill_caches left_block intialisation optimisation

Originally committed as revision 14427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-27 13:01:17 +00:00
Jeff Downs
e791eb1ed4 And.... Fix another spec reference to be more specific and correct. 
Originally committed as revision 14423 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-26 18:38:30 +00:00
Jeff Downs
25f8bceb1c Fix reference to spec to be more specific and correct. 
Originally committed as revision 14422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-26 18:34:34 +00:00
Paul Kendall
4a1aa38bda Simple refactoring to resolve a FIXME. Patch by Paul Kendall. 
Originally committed as revision 14419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-26 15:07:04 +00:00
Michael Niedermayer
fef744d404 indent 
Originally committed as revision 14408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-26 02:31:19 +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
af8c5e08d7 Revert r14404 
Remove another 2 incorrect checks.
	These would ignore fields of different parity.
I was wrong, i thought pic_stricture is the current pic structure.
But it does not make a difference either way on the reference bitstreams.

Originally committed as revision 14405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 23:55:31 +00:00
Michael Niedermayer
d9022d38fb Remove another 2 incorrect checks. 
These would ignore fields of different parity.

Originally committed as revision 14404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 23:49:01 +00:00
Michael Niedermayer
79b5c77692 Print an error if a reference picture is missing. 
Originally committed as revision 14403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 23:39:43 +00:00
Michael Niedermayer
6edac8e104 Remove mysterious ref->data[0] check. 
What the standard calls non-existent is not related to the
value of the data[0] pointer.

Originally committed as revision 14402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 23:36:48 +00:00
Michael Niedermayer
99157e499c 10l typo, fix compilation 
Originally committed as revision 14401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 22:42:49 +00:00
Michael Niedermayer
91ea868eeb Remove another stupidity, long_ref==0 check 4 lines after assert(long_ref==0). 
Originally committed as revision 14400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 22:39:43 +00:00
Michael Niedermayer
b3e93fd408 indent 
Originally committed as revision 14399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 21:51:50 +00:00
Michael Niedermayer
d4f7d83866 Rewrite fill_default_ref_list(), the old code was obfuscated beyond 
repair with hacks.
new code is ~60lines old was ~200
Fixes at least:
FRExt/HCHP2_HHI_A.264
one sample also get decoded much better:
FRExt/FRExt1_Panasonic.avc (PSNR 11 -> 80)
(no i do not know why, the old code was too a big mess to figure out
 what it did)

Originally committed as revision 14398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 21:46:15 +00:00
Michael Niedermayer
37dcf83077 Do not scare the user with error messages when everything is ok. 
Originally committed as revision 14396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 14:52:58 +00:00
Michael Niedermayer
d9e3242213 Make remove_short() match remove_long() in that it calls unreference_pic(). 
Originally committed as revision 14395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 14:00:01 +00:00
Michael Niedermayer
472c9a58a8 Removing yet another weird field pic special case, 
now related to SHORT2LONG MMCOs.

Originally committed as revision 14394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-25 13:40:13 +00:00