Commit Graph

289 Commits

Author SHA1 Message Date
Reinhard Nissl
ad1ea1f155 When dst_length == 0 bit_length has to be 0, too, but the current code still
calls decode_rbsp_trailing() and therefore bit_length might get negative.
Although the remaining code is able to handle a negative bit_length, avoid
the calculation at all by setting bit_length to 0 for dst_length == 0.
patch by Reinhard Nissl, rnissl gmx de

Originally committed as revision 8690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 14:10:07 +00:00
Reinhard Nissl
6ac9696e77 Remove a NAL unit's trailing zero bytes even when dst_length is 1.
Consider the following byte sequence

    00 00 01 0a 00 00 00 01 09 ...
               ^  ^
               A  B

decode_nal() determines dst_length to be 1 (i. e. the byte between label
A and B above). However, this byte is a trailing zero byte as the spec
says the the current NAL unit is terminated by a byte sequence 00 00 00.

The current code used a loop to decrement dst_length accordingly. But the
loop doesn't start as the loop condition checks for dst_length > 1, which
should read dst_length > 0.
patch by Reinhard Nissl, rnissl gmx de

Originally committed as revision 8689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 13:39:35 +00:00
Reinhard Nissl
ff82e429cb scenario: A properly coded frame is followed by an end of sequence NAL unit,
i.e. the four bytes 00 00 01 0a.
When decode_nal() decodes the end of sequence NAL unit, it returns with
dst_length == 0. The original code leads to a return -1 which discards
the current properly decoded frame.
patch by Reinhard Nissl, rnissl gmx de

Originally committed as revision 8688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 12:55:07 +00:00
Diego Biurrun
e42dba481f typos/grammar
Originally committed as revision 8641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 14:09:20 +00:00
Stefan Huehner
2b100ab2bf changes some function declarations from () to (void) as per ansi c.
Patch by Stefan Huehner % stefan A huehner P org %

Originally committed as revision 8625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-04 11:51:08 +00:00
Panagiotis Issaris
449659919c Fix compilation when using the --disable-opts parameter. This to help those
interested in using a debugger to debug FFmpeg.

Original thread:
Subject: [PATCH] Fix compilation when using --disable-opts
Date: 2007-03-15 16:58:35 GMT

Originally committed as revision 8549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 14:20:30 +00:00
Baptiste Coudurier
b21c9af936 reindent after last commit
Originally committed as revision 8399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-14 11:13:17 +00:00
Baptiste Coudurier
1153be3be1 h264 complete frames parsing support
Originally committed as revision 8398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-14 11:12:02 +00:00
Michael Niedermayer
56c70e1d3a check for no frame and prevent segfault
Originally committed as revision 8211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 21:33:33 +00:00
Michael Niedermayer
66a4b2c179 support feeding individual NAL units to the decoder instead of just complete frames
Originally committed as revision 8197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-02 23:35:26 +00:00
Michel Bardiaux
a9c9a2400b Supply context to tprintf
Originally committed as revision 8142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 09:39:04 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 10:27:12 +00:00
Michael Niedermayer
0268a54a65 rewrite find_frame_end()
new code correctly splits long start codes, also its about twice as fast

Originally committed as revision 8120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 02:38:08 +00:00
Alexander Strange
bd91fee3d7 h264 optimization: common case hl_decode_mb patch by (Alexander Strange astrange ithinksw com)
144095->142319 dezicycles for hl_decode_mb() on duron
trailing whitespace removed by me

Originally committed as revision 8106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-24 00:58:28 +00:00
Michael Niedermayer
97bbb8851b output delayed frames
fixes:
CANL4_SVA_B.264
NL3_SVA_C.264
NL3_SVA_E.264

Originally committed as revision 8055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-21 21:16:07 +00:00
Diego Biurrun
0afd2a92bd cosmetics: Fix a common typo, sepErate --> sepArate.
Originally committed as revision 8047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-21 10:15:08 +00:00
Loren Merritt
4672503d8c simplify in fill_caches
Originally committed as revision 8026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-19 04:44:17 +00:00
Michael Niedermayer
fda51641b1 factorize more calls to fill_rectangle()
Originally committed as revision 8017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-18 01:37:50 +00:00
Michael Niedermayer
d19f5acb36 factorize fill_rectangle() calls
Originally committed as revision 8016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-18 01:24:57 +00:00
Michael Niedermayer
8d6947bc7d factorize fill_rectangle()
remove more silly ref_count checks
use list_count where appropriate

Originally committed as revision 8000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-16 21:50:37 +00:00
Michael Niedermayer
3425501d3b replace list<2 checks by list<list_count
remove silly ref_count<0 and ref_count==0 checks its impossible for this variable to have such a value

Originally committed as revision 7999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-16 21:42:01 +00:00
Michael Niedermayer
187696fa72 fix 2nd ref_count check
add list_count

Originally committed as revision 7998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-16 21:34:21 +00:00
Michael Niedermayer
0565c64834 fix ref_count check
Originally committed as revision 7997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-16 21:29:15 +00:00
Michael Niedermayer
65a0f3fd47 factorize mv_cache and mvd_cache init
Originally committed as revision 7996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-16 21:27:59 +00:00
Michael Niedermayer
43ff071456 simplify
Originally committed as revision 7995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-16 21:25:22 +00:00
Francois Oligny-Lemieux
6ff9b4226b always decode extradata when of non-avc stream (like RTSP)
Patch by Francois Oligny-Lemieux % eucloid A gmail P com %
Original thread:
Date: Feb 9, 2007 12:00 AM
Subject: [Ffmpeg-devel] h264.c patch, always decoding extradata when on non avc stream

Originally committed as revision 7904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-09 22:25:29 +00:00
Michael Niedermayer
08eb8fcdbf fix segfault with darkkben.free.fr/corrupted_h264.mp4
Originally committed as revision 7671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 19:32:26 +00:00
Michael Niedermayer
2f29af3952 flame
Originally committed as revision 7664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 13:42:09 +00:00
Michael Niedermayer
6f9ca74bec check num_reorder_frames for validity
increase delayed_pic buffer size (one temporary is used and a terminating NULL is assumed by most code so it has to be 18 large)

Originally committed as revision 7663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 13:36:56 +00:00
Michael Niedermayer
9170e34537 adding assert to protect delayed_pic
Originally committed as revision 7661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 12:45:57 +00:00
Michael Niedermayer
88e7a4d18c checking bitstream values and other related changes
some of these might have been exploitable

Originally committed as revision 7591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-20 13:50:00 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
Guillaume Poirier
50eaa857c0 remove useless cast that makes code unreadable
Originally committed as revision 7586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 12:41:56 +00:00
Francois Oligny-Lemieux
ac658be5db harden h264 decoding to prevent some crashes when input data is corrupted.
Patch by Frank %eucloid A gmail P com%
date: Jan 18, 2007 6:48 PM
subject: Re: [Ffmpeg-devel] h264, protection against corrupted data (second try patch)
AND
date: Jan 17, 2007 8:22 PM
subject: [Ffmpeg-devel] h264, protection against corrupted data

this also fixes a possible security issue (the sps and pps ids where not checked,
then used as index into an array of sps/pps structs which was then filled with data from the bitstream)

Originally committed as revision 7585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 09:37:04 +00:00
Reimar Döffinger
b18e5c031c Avoid calling decode_slice when context_initialized is not set.
Avoids a crash due to dsp.clear_blocks being NULL when called.

Originally committed as revision 7547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:46:26 +00:00
Michael Niedermayer
6de062957b fix 16 CABAC_BIT * 10l bug introduced in r6578
Originally committed as revision 7440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 00:56:43 +00:00
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 00:35:08 +00:00
Panagiotis Issaris
acd8d10ffb Making rem6 and div6 globally visible and thus adding prefixes.
Originally committed as revision 7245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 09:59:05 +00:00
Panagiotis Issaris
14e95e2c92 Removing unused code
Originally committed as revision 7244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 09:47:29 +00:00
Panagiotis Issaris
a074f143dd Export symbols of several H.264 intra prediction functions
Originally committed as revision 7232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 08:17:43 +00:00
Alexander Chemeris
a083f53c45 fix crash when decoding a truncated H264 slice
patch by Alexander Chemeris % ipse P ffmpeg A gmail.com %
Original thread:
date: Dec 5, 2006 7:26 PM
subject: [Ffmpeg-devel] [PATCH] Fix crush when truncated slice passed to H.264 decoder

Originally committed as revision 7229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 22:18:19 +00:00
Panagiotis Issaris
3ee5c5b739 Removing unused code
Originally committed as revision 7228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 22:05:09 +00:00
Panagiotis Issaris
550e66cb59 Change NAL unit type defines to an enum and move to a header file for usage
in other code.

Originally committed as revision 7226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 21:52:15 +00:00
Måns Rullgård
55fde95e3b rename cropTbl -> ff_cropTbl
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 20:08:09 +00:00
Panagiotis Issaris
c2212338e8 Remove the H264Context parameter from decode_init_vlc() as it is not being used.
Originally committed as revision 6955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-09 16:40:33 +00:00
Michael Niedermayer
65342b2b4a merge clip() into the alpha/beta/tc0 tables (10% faster filter_mb_fast() on P3)
Originally committed as revision 6863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 19:34:30 +00:00
Reimar Döffinger
d55f46e5a8 Reenable AMD64 optimizations for cabac accidentially disabled in r6852
Originally committed as revision 6853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 17:18:49 +00:00
Diego Biurrun
419b878494 Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change
the semantics of ARCH_X86 to mean both 32 and 64 bits.

Originally committed as revision 6852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 17:01:33 +00:00
Diego Biurrun
d5cd50ed73 Fix compilation with PIC enabled, BRANCHLESS_GET_CABAC is defined under
!PIC but gets used without a check for !PIC.

Originally committed as revision 6834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-29 13:14:37 +00:00
Michael Niedermayer
e08f580644 decode_significance_8x8_x86()
8% faster decode_cabac_residual() (8x8 case only) on P3

Originally committed as revision 6750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-20 21:34:02 +00:00