Commit Graph

237 Commits

Author SHA1 Message Date
Jai Menon
7817ddabc8 Apply changes made in r21308 to svq3.c.
Fixes compilation with gcc and -O0.

Originally committed as revision 21316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 03:16:48 +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
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
Jai Menon
94621d329f SVQ3 : Set avctx->pix_fmt correctly during decoder initialisation.
Fixes issue 1591.

Originally committed as revision 20810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 17:10:05 +00:00
Stefano Sabatini
2917367cac Add additional long names for the Sorenson Vector Quantizer 3 decoder.
Originally committed as revision 20316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 18:44:43 +00:00
Michael Niedermayer
e43198af4f Check thread count as multithreaded decoding is not supported.
Fixes issue1292

Originally committed as revision 19801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 21:44:48 +00:00
Reimar Döffinger
2ba8301769 Mark all pix_fmts and supported_framerates compound literals as const.
Makes no difference for gcc but at least icc can put them in .rodata then.

Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 16:09:21 +00:00
Ronald S. Bultje
faccfeec0e Parse frame size code, see "svq3.c: parse frame size" thread on ML.
Originally committed as revision 19583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-04 21:55:47 +00:00
Baptiste Coudurier
87e302bfd8 remove unused hack which set AVCodecContext frame_number to pic timestamp
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 00:24:20 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Måns Rullgård
db794291a2 SVQ3: Fix decoding with A32_BITSTREAM_READER
svq3_decode_slice_header() modifies the buffer used by the bitstream
reader.  Some of the bitstream readers cache a few bytes of data, which
must be flushed after such a modification.  Calling skip_bits_long(gb, 0)
achieves this.

Originally committed as revision 17680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 12:11:07 +00:00
Michael Niedermayer
4d8f830125 1000l for me, wrong pix_fmt.
Originally committed as revision 17573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 22:19:02 +00:00
Michael Niedermayer
09a9b45e4f Add and use ff_pixfmt_list_420.
Originally committed as revision 17564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 18:27:52 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions.
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 13:48:55 +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
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Diego Biurrun
ddaf298cee Fix sample URL.
Originally committed as revision 16309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-25 15:49:02 +00:00
Michael Niedermayer
2a5a9c2815 10l, svq3 didnt set h->cbp, this broke decoding a little.
Originally committed as revision 16214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 11:01:38 +00:00
Michael Niedermayer
54dab66174 Fix svq3 decoding, is_complex was not initialized.
Originally committed as revision 16184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 03:41:48 +00:00
Baptiste Coudurier
f4cca718cf move decoder initialization in separate function, earlier failure detection
Originally committed as revision 15929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-24 18:49:50 +00:00
Diego Biurrun
76de302dd8 cosmetics: indentation, prettyprinting
Originally committed as revision 15908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-22 16:36:50 +00:00
Diego Biurrun
7f8205da4c cosmetics: consistent function declarations
Originally committed as revision 15907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-22 16:03:20 +00:00
Diego Biurrun
7d1b158284 cosmetics: Put statements after 'if' on their own line.
Originally committed as revision 15906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-22 15:57:59 +00:00
Diego Biurrun
2be3fe39bf Add the function declaration of ff_svq1_packet_checksum to svq1.h and include
svq1.h where this function is used. Fixes the warning:
libavcodec/svq3.c:862: warning: implicit declaration of function ‘ff_svq1_packet_checksum’

Originally committed as revision 15737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 23:11:59 +00:00
Baptiste Coudurier
c48649242d svq3 watermark code now needs zlib
Originally committed as revision 15719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:41:00 +00:00
Baptiste Coudurier
1e002b602f svq3 watermark decoding support, based on reverse engineering work by chrono
Originally committed as revision 15718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:34:44 +00:00
Aurelien Jacobs
bee764ec6b svq3: remove unused include
Originally committed as revision 15709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 17:17:08 +00:00
Michael Niedermayer
e46a98271e Include zlib.h as it is needed for watermark support,
patch by baptiste based on reverse engineering work by chrono.

Originally committed as revision 15618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-14 20:42:54 +00:00
Michael Niedermayer
9dff86c672 10000l, revert
r14254
	Log:
	The funny memcpyin svq3 generally has src & dst overlapping, so it
	should at least be a memmove().
I was tired, they do not overlap.

Originally committed as revision 14259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-16 17:54:57 +00:00
Michael Niedermayer
38844c0b42 The funny memcpyin svq3 generally has src & dst overlapping, so it
should at least be a memmove().

Originally committed as revision 14254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-16 02:10:21 +00:00
Michael Niedermayer
fb0fbd7c6c Print slice num as well.
Originally committed as revision 14253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-16 01:57:28 +00:00
Michael Niedermayer
54347c2f51 Fix infinite loop at EOF.
Originally committed as revision 14231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 16:18:29 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Alexander Strange
5da1ab1ae1 Previous commit missed an initialization - this fixes FATE's test sample.
Originally committed as revision 13131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 23:39:55 +00:00
Alexander Strange
488aca9b1e Set and use h->mb_xy in SVQ3 too.
Originally committed as revision 13129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 20:26:35 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 22:39:51 +00:00
Aurelien Jacobs
9701840bb5 add FF_ prefix to all (frame)_TYPE usage
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:31:02 +00:00
Michael Niedermayer
30317501a0 consts
Originally committed as revision 11705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 02:35:11 +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
Alex Beregszaszi
3a5729eae1 use skip_bits where appropriate
Originally committed as revision 10005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 01:08:28 +00:00
Alex Beregszaszi
5fc32c275e use get_bits1(..) instead get_bits(.., 1)
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 00:13:31 +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
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
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
Carl Eugen Hoyos
154e30f6c2 rename attribute_unused to av_unused and moves its declaration to common.h
patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM

Originally committed as revision 9155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 09:32:25 +00:00
Michael Niedermayer
a1f6643d62 dont write over the end of ref_cache
Originally committed as revision 9026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-14 23:22:02 +00:00
Reimar Döffinger
e36d79c837 Change some leftover __attribute__((unused)) and __attribute__((used)) to
attribute_unused and attribute_used respectively to ease compiling on non-gcc.

Originally committed as revision 9024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-14 14:07:50 +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
0c74098b1c crash fix by Carl Eugen Hoyos cehoyos ag.or at
Originally committed as revision 7684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 11:20:01 +00:00
Michael Niedermayer
2c16032028 maybe fix segfault with missing extradata (unchecked)
Originally committed as revision 7677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 00:54:36 +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
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
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Michael Niedermayer
63d33cf439 bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
Originally committed as revision 4747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 11:31:56 +00:00
Michael Niedermayer
8c3eba7c62 skip_idct
skip_frame
skip_loop_filter

Originally committed as revision 4440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-14 21:39:36 +00:00
Michael Niedermayer
5bb8a0daa1 various fixes related to the non alt_bitstream_reader
Originally committed as revision 4136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-18 12:08:16 +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
884182b383 more detailed error messages
Originally committed as revision 3871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 17:59:01 +00:00
Michael Niedermayer
cbf5374fc0 1000l to myself for FFMIN(...,0) instead of ...,6)
some more checks

Originally committed as revision 3238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-19 01:25:02 +00:00
Michael Niedermayer
6258c7e674 segfault fix
Originally committed as revision 3236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-19 00:10:21 +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
Mike Melanson
ee59b4b680 don't fetch the size of SEQH unless SEQH was found
Originally committed as revision 2888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-14 15:04:21 +00:00
Mike Melanson
3a278992bd remove numerous definitions of BE_*/LE_* macros; convert FOURCC_TAG ->
MKTAG/MKBETAG

Originally committed as revision 2886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-14 04:04:08 +00:00
Mike Melanson
ebcd2f9689 be smarter about the variable size of the extra SVQ3 data
Originally committed as revision 2881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-13 21:26:54 +00:00
Mike Melanson
14284f78c5 smarten up the SVQ3 extradata decoder without changing the external API
Originally committed as revision 2878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-13 20:07:38 +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
Mike Melanson
4ff7c576f8 SVQ3 uses unrestricted motion vectors
Originally committed as revision 2626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-18 23:44:49 +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
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
Mike Melanson
a7d3e7729a don't step on the context
Originally committed as revision 1976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 02:38:29 +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
Michael Niedermayer
4c701ac80d CODEC_CAP_DRAW_HORIZ_BAND
Originally committed as revision 1886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-16 10:14:25 +00:00
Michael Niedermayer
669ac79cf5 moving the svq3 motion compensation stuff to dsputil (this also means that existing optimized halfpel code is used now ...)
Originally committed as revision 1885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-15 23:30:03 +00:00
Michael Niedermayer
94d44f455c optimize
Originally committed as revision 1883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-15 00:43:43 +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
Mike Melanson
89a79364ed change the way the ImageDescription is passed to the decoder
Originally committed as revision 1846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-10 04:30:29 +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