1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

24012 Commits

Author SHA1 Message Date
Michael Niedermayer
0c0d88aed5 Optimize decoding high freqs.
this is 10-20cpu cycles faster on duron (whole is about 50-60 cpu cylses)
I wonder why gcc isnt doing this on its own ...

Originally committed as revision 23097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 21:10:55 +00:00
Michael Niedermayer
fd9451c68f Make lsf_sf_expand() 4 times faster.
Originally committed as revision 23096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 20:33:48 +00:00
Michael Niedermayer
b91d46614d float based mp1/mp2/mp3 decoders.
Originally committed as revision 23095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 19:52:42 +00:00
Alex Converse
495af353db Set cur_channel in the AAC encoder context where needed.
Most coder functions read it. Carting this around in the context may be
suboptimal; a refactor should be considered.

Originally committed as revision 23094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 18:53:49 +00:00
Baptiste Coudurier
2c2b2c0ac2 silence gcc warning about potential uninitialized usage
Originally committed as revision 23093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:39:52 +00:00
Baptiste Coudurier
d21f58b52d cosmetics, rename loop to frame_available
Originally committed as revision 23092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:25:18 +00:00
Baptiste Coudurier
a9f3cb9372 rename curr_filter to last_filter, factorize filter declaration
Originally committed as revision 23091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:23:06 +00:00
Baptiste Coudurier
79b90b2549 cosmetics: indentation, whitespaces
Originally committed as revision 23090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:18:13 +00:00
Baptiste Coudurier
6e82e7fa48 simplify, reuse existing args variable
Originally committed as revision 23089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:16:52 +00:00
Baptiste Coudurier
aa1249b8aa cosmetics: filt_graph_all -> graph, like in ffplay.c
Originally committed as revision 23088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 17:14:36 +00:00
Janne Grunau
405213b736 Add -ldl to libfaadbin_extralibs instead of libfaadbin_decoder_extralibs.
The latter does not exist and thus compilation fails.
patch by Janne Grunau, janne-ffmpeg jannau.net

Originally committed as revision 23087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 15:58:50 +00:00
Michael Niedermayer
86433cc6f5 Remove unused FRAC_RND() macro from mpegaudiodec.c.
Originally committed as revision 23086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 14:49:48 +00:00
Nick Brereton
857c30ecba mlpdec: Comment channel_params field in struct SubStream.
Patch by Nick Brereton <nick at nbrereton dot net>

Originally committed as revision 23085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 01:46:13 +00:00
Nick Brereton
22fb814c2f mlpdec: Allocate channel decoding parameters for each substream. Some file
was encountered with a channel range that overlapped the previous substreams,
and the code assumed no such overlap was possible.
Patch by Nick Brereton <nick at nbrereton dot net>

Originally committed as revision 23084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 01:44:52 +00:00
Ramiro Polla
d9d14dc607 Use int instead of long to pass width parameters in non-public functions.
long was being incorrectly used as an x86-sized register, both for 32 and 64
bits, but this is not the case in win64.

Originally committed as revision 31153 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-05-11 00:36:34 +00:00
Michael Niedermayer
22cb6fb60f Adding missing () to mathops.h.
Originally committed as revision 23083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-11 00:22:50 +00:00
Reimar Döffinger
1c71b5c89a Replace more "m" constraints with MANGLE to fix compilation issues
with x86_32 gcc 4.4.4 and -fPIC.

Originally committed as revision 23082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 21:16:08 +00:00
Sebastian Vater
dce2f7d36b Optimize decodeplane32().
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 17:18:09 +00:00
Sebastian Vater
59cca5040e Ensure that width and height are > 0. avcodec_open() itself only checks that
they are >= 0.

Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 17:00:56 +00:00
Måns Rullgård
666d7d18e1 FATE: print friendly error for individual tests when SAMPLES unset
Originally committed as revision 23079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 09:32:59 +00:00
Thomas Devanneaux
52486603b5 Check NAL unit size to avoid reading past the buffer.
This fixes issue1907

Patch by Thomas Devanneaux gmail(thomdev)

Originally committed as revision 23078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 07:08:57 +00:00
Vitor Sessak
8ad802e610 Alloc 16 extra bytes in libavfilter frames. Needed for MMX-optimized swscale.
Fix issue 1924.

Originally committed as revision 23077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 00:28:18 +00:00
Francesco Lavra
f10d3d343e Add FourCC MJPG for CODEC_ID_JPEGLS.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 23:19:19 +00:00
Stefano Sabatini
658e7576fc Reorder nut specific codec tags and add a comment for marking them as
such.

Also put the [3][0][0][0] codec tag, mapped to rgb565le, in a special
section. It needs to be specified *after* the nut RGB[16] codec tag,
otherwise it will be used by default when encoding normal non-flipped
rgb565le, and will be decoded like a flipped format (see
rawdec.c:raw_init_decoder()).

Originally committed as revision 23075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 23:04:06 +00:00
Stefano Sabatini
43451ec247 Add missing nut-specific codec tags for rawvideo pixel formats.
Add codec tags for the formats:
[15]BGR Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian [NOT in AVI]
[15]RGB Packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian [NOT in AVI]
[16]BGR Packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian [NOT in AVI]
[16]RGB Packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian [NOT in AVI]
RGBA    Packed RGBA 8:8:8:8, 32bpp, RGBA [NOT in AVI]
BGRA    Packed RGBA 8:8:8:8, 32bpp, BGRA [NOT in AVI]
ABGR    Packed RGBA 8:8:8:8, 32bpp, ABGR [NOT in AVI]
ARGB    Packed RGBA 8:8:8:8, 32bpp, ARGB [NOT in AVI]
RGB[24] Packed RGB 8:8:8, 24bpp RGB [NOT in AVI]
BGR[24] Packed RGB 8:8:8, 24bpp BGR [NOT in AVI]

which are listed in the nut4cc.txt spec.

Originally committed as revision 23074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 23:04:03 +00:00
Stefano Sabatini
934edecdb8 Make the codec tags for the yuvjXXX pixel formats the same as the
corresponding ones for the yuvXXX pixel formats.

Originally committed as revision 23073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 23:04:01 +00:00
Stefano Sabatini
b43f432c8c Add support to the Y411 codec tag, corresponding to the rawvideo pixel
format uyyvyy411.

The codec tag is referenced in fourcc.org.

Originally committed as revision 23072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 22:56:04 +00:00
Stefano Sabatini
8e89cd1fee Make the nut demuxer issue a more meaningful error message if it
cannot recognize the provided codec tag.

Originally committed as revision 23071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 22:56:02 +00:00
Måns Rullgård
cc6849ae50 bswap: 10L add missing parens around macro args
Originally committed as revision 23070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 20:32:35 +00:00
Sebastian Vater
0613ece542 Replace usage of s->streams[0]->* with st->*, which is shorter.
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 20:10:48 +00:00
Sebastian Vater
9d45a32ba8 Remove "bps" parameter to decodeplane8/32(), it's unused.
Patch by Sebastian Vater <cdgs basty googlemail com>.

Originally committed as revision 23068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 20:08:13 +00:00
Stefano Sabatini
fc25c04960 Add entry for AVFilterPicRef interlaced and top_field_first fields
addition.

Originally committed as revision 23067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 20:07:29 +00:00
Stefano Sabatini
b6bc205155 Bump lavfi minor after the addition of the fields interlaced and
top_field_first in AVFilterPicRef, done in r23044.

Originally committed as revision 23066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 20:02:40 +00:00
Martin Storsjö
6ad533b7cb qt-faststart: Avoid leaking memory if encountering a file with double ftyp atoms
Originally committed as revision 23065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 17:46:42 +00:00
Måns Rullgård
17be16a336 FATE: update idroq-video-encode command
Originally committed as revision 23064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 17:05:35 +00:00
Måns Rullgård
79a9672d45 IFF: decode last 8 pixels per line
The decodeplane8() function processes one byte of input less than
it should.  Also, the for loop has an unusual style with side-effects
in the controlling expression; replaced with a more intuitive while
loop.

10l to Basty.

Originally committed as revision 23063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 16:24:20 +00:00
Måns Rullgård
e24db3e391 Fix build with swscale disabled
Originally committed as revision 23062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-09 12:04:48 +00:00
Sebastian Vater
0a9cb385ad Optimize decodeplane8(), patch by Sebastian Vater <cdgs basty googlemail com>.
Originally committed as revision 23061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 21:48:44 +00:00
Stefano Sabatini
3f073fa22c Fix auto-scaling.
Use the numeric value assigned to sws_flags for the sws_flags set in
the graph, rather than the string "bilinear", which is not even
parsable by the scale filter.

Originally committed as revision 23060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 21:39:57 +00:00
Michael Niedermayer
3fe1ec39c6 Add means to adjust the log level per context.
Originally committed as revision 23059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 20:41:20 +00:00
Reimar Döffinger
c12caa32b2 Remove hardcoded-tables hack for IA-64: with latest binutils that now actually
causes linking errors instead of avoiding them.

Originally committed as revision 23058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 16:32:05 +00:00
Reimar Döffinger
7f20cb2df0 Another try for fixing/improving decode_video documentation.
Originally committed as revision 23057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 16:24:33 +00:00
Stefano Sabatini
d760a316e9 Make config_props() show conversion information before to create the
swscale context.

This makes eventual warnings issued in case of swscale context
creation failure to be shown after the conversion information rather
than before, which is slightly less confusing.

Originally committed as revision 23056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 22:12:13 +00:00
Stefano Sabatini
38efdb2c6b Log input size, input format and swscale flags used for conversion in
config_props().

Useful for debugging.

Originally committed as revision 23055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 22:12:10 +00:00
Ronaldo Moura
447a5b1996 blackfin: fix yuv422 to yuv420 conversion
The old code is correct only when stride = 2*width.

Patch by Ronaldo Moura <ronaldo d moura monity com br>

Originally committed as revision 31142 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-05-07 21:59:18 +00:00
Måns Rullgård
f66b390582 vf_pad: fix mixed code and declarations
Originally committed as revision 23054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 17:53:29 +00:00
Michael Niedermayer
a0aa73544c c99 sucks. Replacing scanf("%i") by strtoul()
Originally committed as revision 23053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 13:00:56 +00:00
Stefano Sabatini
06e1db056d Document the pad filter.
Originally committed as revision 23052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 12:52:46 +00:00
Stefano Sabatini
8d787f8e52 Document cmdutils.c:print_error().
Originally committed as revision 23051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 12:42:26 +00:00
Michael Niedermayer
0c22311b56 Remove messy pading hack in ffmpeg.c.
Use avfilters if you want padding!

Originally committed as revision 23050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 12:16:23 +00:00