1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

93 Commits

Author SHA1 Message Date
Baptiste Coudurier
891263eff2 Fix svq3 watermark log uncompress on 64bit, probably fixes issue 1263
Originally committed as revision 23620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 22:38:16 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Michael Niedermayer
3b606e71c4 svq3 now in working condition, at least vissually, ill let fate tell us
if the checksums match

Originally committed as revision 22061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 18:41:48 +00:00
Michael Niedermayer
fc7f7f171f fix compilation, sorry ive not checked cvslog for a while :(((
svq3 decoder does not work yet though but i didnt want to keep compilation
broken longer

Originally committed as revision 22060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 18:39:01 +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
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