1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

540 Commits

Author SHA1 Message Date
Loic Le Loarer
0bf796340a H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
3 more streams of the conformance suite decode to the
end instead of failing on an assert (CABACI3_Sony_B.jsv,
CABAST3_Sony_E.jsv and CABASTBR3_Sony_B.jsv), they are still false since
the first B slice probably because of deblocking in B slices not yet
implemented.

Originally committed as revision 3932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-04 02:47:45 +00:00
Loïc Le Loarer
0d315f281c H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
With this patch, the streams CAWP5_TOSHIBA_E.264 and CVWP5_TOSHIBA_E.264
are completely decoded

Originally committed as revision 3917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-01 11:26:11 +00:00
Loïc Le Loarer
dc032f3332 correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
fixes decoding of MR2_MW_A.264

Originally committed as revision 3916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-01 11:12:53 +00:00
Michael Niedermayer
bd9ea6a462 fixing missaligned memory accesses in fill_rectangle()
Originally committed as revision 3901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-30 02:16:50 +00:00
Michael Niedermayer
4ae33c9b52 simplify
Originally committed as revision 3873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 19:11:02 +00:00
Michael Niedermayer
934982c4ac avoid buf_size == 0 checks in every decoder
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 18:09:06 +00:00
Michael Niedermayer
46f2f05f59 simplify deblock
Originally committed as revision 3868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 14:03:13 +00:00
Michael Niedermayer
3b33943e9b simplify
reference list 1 swaping fix? seems its not used by any samples i found though

Originally committed as revision 3863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 03:49:36 +00:00
Loic Le Loarer
827c91bfb7 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
Originally committed as revision 3851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-19 17:35:51 +00:00
Michael Niedermayer
eed4ebd22c div by zero aspect fix
Originally committed as revision 3850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-19 13:24:43 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 00:16:25 +00:00
Gert Vervoort
9c6221ae62 10l (obmc_scratchpad not always initialize)
patch by (Gert Vervoort <gert.vervoort at hccnet dot nl>)

Originally committed as revision 3816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-09 00:48:37 +00:00
Loren Merritt
934b0821db 10l: scratchpad could be allocated before its size was known.
Originally committed as revision 3812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-08 08:56:18 +00:00
Loren Merritt
9f2d1b4ff5 H.264 weighted prediction.
Bidirectional weighting has not been tested for bitwise accuracy, but looks correct.

Originally committed as revision 3811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-07 05:56:07 +00:00
Loren Merritt
1b2dcdc1e0 reduce stutter if we learn too late that the stream contains B-frames.
Originally committed as revision 3801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-04 10:26:47 +00:00
Loren Merritt
a4dae92b58 Sort B-frames into display order.
Originally committed as revision 3799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-04 01:12:48 +00:00
Michael Niedermayer
17bfbd70ab 10l
Originally committed as revision 3788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-31 14:02:35 +00:00
Loïc Le Loarer
579448a083 - correct several errors on the deblocking accross slice boundaries.
- add support for deblocking_filter_idc==2 which means no deblocking accross slice.
- correct MMCO with multiple slices.

5 more streams from H264 conformance suite are now correctly decoded.

patch by (Loic <lll+ffmpeg >< m4x dot org>)

Originally committed as revision 3786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-31 00:07:17 +00:00
Roberto Togni
f31ecffb4f Fix avc1 if there is nore than one nal per mov frame
Originally committed as revision 3785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-30 18:05:54 +00:00
Loren Merritt
5ad984c997 implement B_DIRECT and B_SKIP macroblock types.
fix reference list sorting for B-frames.
fix mv caching for mixed list B-blocks.

Originally committed as revision 3775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-29 04:17:52 +00:00
Loren Merritt
650cec0c8c vismv for h264 displayed incorrect motion vectors.
Originally committed as revision 3765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-20 03:03:37 +00:00
Loic Le Loarer
5175b9376f add multi slice support
for main profile H.264 streams. I have tested this on all H264
conformance streams and comparing the result with the current CVS
version, there is 8 streams which decode correctly more frames and 2
streams which are now completely correct with my patch.

This patch also correct some typo in comments.

patch by (Loic Le Loarer <lll+ffmpeg >at< m4x org>)

Originally committed as revision 3758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-18 03:49:07 +00:00
Michael Niedermayer
bf835aee11 uppercase codec_tag=AVC1 support
Originally committed as revision 3746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-09 22:04:15 +00:00
Michael Niedermayer
a979965313 out of buffer access fix
Originally committed as revision 3744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-09 01:01:11 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-27 18:10:06 +00:00
Loren Merritt
7d7f635dc0 Fixed typo which caused incorrect motion prediction in B-frames. patch by (Loren Merritt <lorenm ta u tod washington tod edu>)
Originally committed as revision 3709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-24 22:50:49 +00:00
Michael Niedermayer
5d0e4cb87a segfault fix
Originally committed as revision 3656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-31 00:42:43 +00:00
Michael Niedermayer
db4d9faf8d optimzation
Originally committed as revision 3630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-24 02:59:36 +00:00
Michael Niedermayer
58897665ae optimization
Originally committed as revision 3629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-24 02:08:45 +00:00
Michael Niedermayer
7b89e963e8 fix CABAC+LOOP missmatch
Originally committed as revision 3628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-23 21:13:31 +00:00
Michael Niedermayer
3981c385cc cbp_table cleanup
Originally committed as revision 3627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-23 19:12:21 +00:00
Michael Niedermayer
9af1ec8e9a cleanup of decode_cabac_residual()
Originally committed as revision 3626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-23 15:59:01 +00:00
Michael Niedermayer
d6b0c1bbf8 decode intra cabac mb_type cleanup
Originally committed as revision 3625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-23 12:07:57 +00:00
Gildas Bazin
03393cb766 small typo patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 3624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-22 19:55:57 +00:00
Loren Merritt
d5af70c3b8 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-22 18:30:50 +00:00
Loren Merritt
0bc42caddf h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-03 22:01:21 +00:00
Michael Niedermayer
0fa8158d3e move h264 idct to its own file and call via function pointer in DspContext
allow h264 idct to be used for lowres=1

Originally committed as revision 3524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 19:47:17 +00:00
Michael Niedermayer
792bb815e3 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-25 10:06:31 +00:00
Michael Niedermayer
5cbb0e70a0 H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-25 09:59:36 +00:00
Roberto Togni
4770b1b4fb AVC (H264 in mp4 files, fourcc avc1) support
Originally committed as revision 3459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-13 21:20:55 +00:00
Loren Merritt
d89dc06a96 h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-02 10:49:54 +00:00
Michael Niedermayer
b3067ac197 cleanup
Originally committed as revision 3395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-16 22:51:18 +00:00
Måns Rullgård
ec587a50c7 Get H.264 frame rate from SPS/VUI patch by (Måns Rullgård <mru at kth dot se>)
Originally committed as revision 3394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-16 22:48:05 +00:00
Michael Niedermayer
7440fe839d segfault fix
Originally committed as revision 3376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-03 01:50:52 +00:00
Michael Niedermayer
bba8334965 overread fix
Originally committed as revision 3294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-08 00:53:21 +00:00
Michael Niedermayer
68b3ba0dfa 1000l
Originally committed as revision 3277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 22:39:01 +00:00
Alex Beregszaszi
d967e3b8a5 some debug
Originally committed as revision 3257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-26 10:09:42 +00:00
Michael Niedermayer
53db1cae1c data_size = 0 cleanup
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 14:37:16 +00:00
Michael Niedermayer
e4cb187db8 remove duplicated find_frame_end() code
move codec specific code from parser.c -> <codecname>.c as far as its easily possible

Originally committed as revision 3087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-29 14:21:33 +00:00
Michael Niedermayer
c8470cc173 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
Originally committed as revision 3044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-23 19:44:27 +00:00
Laurent Aimar
693399ba55 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
Originally committed as revision 3043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-23 19:36:52 +00:00
Laurent Aimar
9e5281141c progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
Originally committed as revision 3000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-11 16:28:31 +00:00
Michael Niedermayer
042e3bfe9d fix decoding of qp<6
Originally committed as revision 2933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 20:28:29 +00:00
Laurent Aimar
e5017ab870 h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
Originally committed as revision 2932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 19:35:53 +00:00
Michael Niedermayer
53c05b1eac do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
Originally committed as revision 2910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-20 16:40:20 +00:00
Michael Niedermayer
3ebc7e04de h264 loop filter optimizations
Originally committed as revision 2909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-20 00:18:52 +00:00
Michael Niedermayer
980a82b70b h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
Originally committed as revision 2908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-19 21:21:17 +00:00
Michael Niedermayer
3edcacde04 init cleanup
Originally committed as revision 2899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-16 16:11:29 +00:00
Alex Beregszaszi
fe455f3328 get_bit_count -> put_bits_count
Originally committed as revision 2752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-06 15:27:31 +00:00
Michael Niedermayer
303e50e65b closed gop support & flags2 as all bits in flags are used
and a few minor things i forgot to commit ...

Originally committed as revision 2718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-22 19:48:28 +00:00
Wolfgang Hesseler
0c9bbaec60 motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
Originally committed as revision 2636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-30 02:12:12 +00:00
Michael Niedermayer
9a41c2c747 svq3 fix
Originally committed as revision 2625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-18 21:35:02 +00:00
Michael Niedermayer
68ca24e6db intra16x16 fix
Originally committed as revision 2539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-29 00:19:24 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 13:26:22 +00:00
Michael Niedermayer
5ff85f1d8b AVRational
sample_aspect_ratio
aspect ratio in JPEG JFIF is SAR not DAR !
removed nonsense SAR guessing code
various related cleanups
bugs?

Originally committed as revision 2403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-20 20:23:46 +00:00
Alex Beregszaszi
c58222c56c 10l
Originally committed as revision 2368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-13 08:02:46 +00:00
Alex Beregszaszi
ed7debda14 removed the obsolete and unused parameters of init_put_bits
Originally committed as revision 2366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-12 21:25:00 +00:00
Fabrice Bellard
1df1df0b44 removed warnings
Originally committed as revision 2246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 22:50:44 +00:00
Michael Niedermayer
a15e68deb6 bitstream changes to match JM7.2
Originally committed as revision 2073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-23 00:32:50 +00:00
Alex Beregszaszi
2ca71015ef unwanted second definition of CHECKED_ALLOCZ
Originally committed as revision 2009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-04 17:16:53 +00:00
Mike Melanson
2e26c8d204 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
- fix B-frame motion compensation
- cleanup motion vector math and other blocks of common code

Originally committed as revision 1991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-27 15:05:29 +00:00
Alex Beregszaszi
eb60dddc2e some warning fixes
Originally committed as revision 1977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 15:21:25 +00:00
Mike Melanson
da3b975630 added support for B-frames and multiple slices
Originally committed as revision 1974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-19 01:44:44 +00:00
Michael Niedermayer
c009df3f86 make ff_emulated_edge_mc() independant of MpegEncContext
Originally committed as revision 1971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-18 22:00:23 +00:00
Falk Hüffner
4cfbf61bf1 Warning and compatibility fixes.
Originally committed as revision 1902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-24 18:48:30 +00:00
Michael Niedermayer
377ec88802 bigendian fix
Originally committed as revision 1887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-16 19:18:53 +00:00
Falk Hüffner
3db320ea0c Warning fixes.
Originally committed as revision 1884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-15 01:34:47 +00:00
Michael Niedermayer
d8085ea727 cleanup
Originally committed as revision 1882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-14 23:08:01 +00:00
Michael Niedermayer
f7a8c179a7 optimizations
Originally committed as revision 1869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-13 13:38:09 +00:00
Michael Niedermayer
4704097a2b optimizations
Originally committed as revision 1867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-13 00:46:42 +00:00
Michael Niedermayer
8b82a95675 svq3 decoder by anonymous
Originally committed as revision 1845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-09 22:16:14 +00:00
Michael Niedermayer
067ff8b1ee tired
Originally committed as revision 1825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-27 01:33:39 +00:00
Michael Niedermayer
d90cf87b90 fixing mixed dr1 + internal buffers
Originally committed as revision 1820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-25 00:29:48 +00:00
Michael Niedermayer
af6e2fed04 minor cleanup / some warning fixes
Originally committed as revision 1772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-14 13:44:38 +00:00
Michael Niedermayer
30f73fc72e faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
Originally committed as revision 1769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-12 22:49:54 +00:00
Michael Niedermayer
7bc9090a41 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
more direct use of the new mb_type stuff instead of codec specific stuff
runtime mb_type debug output h264/h263 variants/mpeg1/2/4
error concealment /resilience for mpeg1/2
various minor optimizations

Originally committed as revision 1746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-10 13:18:38 +00:00
Michael Niedermayer
8b92b792d1 some checks to avoid segfault
Originally committed as revision 1740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-07 19:23:21 +00:00
Michael Niedermayer
95c2634838 #ifdef TRACE printf() -> tprintf()
Originally committed as revision 1735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-05 10:08:48 +00:00
Michael Niedermayer
1924f3ce36 multiple reference frames support
Originally committed as revision 1734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-04 20:59:50 +00:00
Michael Niedermayer
0da71265d8 H264 decoder & demuxer
Originally committed as revision 1732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-04 14:42:28 +00:00