1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

11583 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Jason Garrett-Glaser
e8c7fca90c Add intra refresh and crf-max support to the libavcodec libx264 wrapper.
Minor version bump.

Originally committed as revision 23038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-06 22:38:18 +00:00
Alex Converse
46174079c9 10l: store the result of clipping added in r23035
Originally committed as revision 23037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-06 20:38:42 +00:00
Alex Converse
217b44ddc3 Error out when too many bits per frame are requested.
Originally committed as revision 23036 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-06 20:35:10 +00:00
Alex Converse
32fa7725d2 Make the faac inspired quantizer search make sense for a slightly narrower definition of "make sense."
Originally committed as revision 23035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-06 20:18:36 +00:00
David Conrad
e9d96831f7 schroenc: Set colorspace info
Originally committed as revision 23030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:38:02 +00:00
David Conrad
37284120ca schroenc: Use AV_RB32
Originally committed as revision 23029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:37:58 +00:00
David Conrad
31cf8c650a schroenc: Set open-gop
Originally committed as revision 23028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:49 +00:00
David Conrad
3d6fa004e8 schroenc: Set keyframe interval
Originally committed as revision 23027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:45 +00:00
David Conrad
e0a24555b4 schroenc: Use constant quality for constant quality, not noise threshold
Originally committed as revision 23026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:41 +00:00
David Conrad
614748ceeb schroenc: Don't touch gop_structure by default, it should be left adaptive
Originally committed as revision 23025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 21:02:37 +00:00
Sebastian Vater
cfdaee45d1 Align plane size to word-boundary.
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 23023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 17:02:55 +00:00
Ronald S. Bultje
4fe4bb6150 Revert r22974 int->unsigned parts that don't have any meaningful effect.
Originally committed as revision 23016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-03 22:08:31 +00:00
Alex Converse
17d5959998 10l: The SBR refactor requires the use of 2 independent output X buffers.
Originally committed as revision 23014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-03 19:21:35 +00:00
Martin Storsjö
fa36165adf amrnbdec: Apply AMR_SAMPLE_SCALE when finishing the decoder output
The output scaling was accidentally removed in rev 22937.

Originally committed as revision 23012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-03 05:57:48 +00:00
Ronald S. Bultje
1302ccc1a7 Another buffer overflow, fixes issue1758.
Originally committed as revision 23011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-02 21:52:25 +00:00
Reimar Döffinger
bf9766995c Clarify how allocation works for the picture argument for
avcodec_decode_video3.

Originally committed as revision 23009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-02 16:07:29 +00:00
Ronald S. Bultje
593a861470 Fix buffer overrun (or, well, actually a typo, 80 should be 0x80...).
Partially fixes issue 1758.

Originally committed as revision 23005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-01 18:45:02 +00:00
Alex Converse
2d23fecd5d Enforce time border monotonicity.
Thanks to Chromium.

Originally committed as revision 23000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 23:32:42 +00:00
Alex Converse
a91d82b5cc Move the SBR patch count check to prevent overwrites.
Thanks to Chromium.

Originally committed as revision 22999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 23:08:44 +00:00
Alex Converse
10678e5c72 Increase size of patch_borders[].
6 patches means there can be 7 borders. Found by Chromium.

Originally committed as revision 22998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 22:42:52 +00:00
Michael Niedermayer
19a00c5eb2 avi bgr24 padding fix.
Fixes issue1901

Originally committed as revision 22997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 22:09:42 +00:00
Alex Converse
d0dedce71d Reindent
Originally committed as revision 22996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:43:29 +00:00
Alex Converse
ca6d3f234c Rewrite ff_sbr_apply in a manner more friendly to PS.
This includes merging ff_sbr_dequant into ff_sbr_apply.

Originally committed as revision 22995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:43:23 +00:00
Måns Rullgård
5635985c26 ARM: NEON optimised VP6 edge filter
Originally committed as revision 22993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:30:27 +00:00
Måns Rullgård
5e1ba34bbb VP56: move vp56_edge_filter to new VP56DSPContext
Using macro templates allows the vp[56]_adjust functions to be
inlined instead of called through function pointers.  The new
function pointers enable optimised implementations of the filters.

4% faster VP6 decoding on Cortex-A8.

Originally committed as revision 22992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-30 21:30:22 +00:00
Michael Niedermayer
2308b6c19a Add version to AVClass so we can add to and use fields of AVClass without ABI issues.
Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-28 20:00:23 +00:00
Sebastian Vater
726dc06158 Reidnent after r22795.
Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:39:08 +00:00
Sebastian Vater
fe51b5ce50 Move some branches outside looped code. Should improve the generated asm (and
thus performance) slightly.

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:38:41 +00:00
Sebastian Vater
473147bed0 Switch some ints to unsigned (they can only have positive values, this allows
compiler to optimize some math from mul/div to shr/shl). Also add a cast to
uint32_t when calling decodeplane32(), this silences a compiler warning.
Lastly, in decodeplane8/32(), flatten a double-loop into a single-loop and
calculate the length once before entering the loop instead of during every
iteration (since it doesn't change).

Patch by Sebastian Vater <cdgs.basty googlemail com>.

Originally committed as revision 22974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:37:13 +00:00
Sebastian Vater
687dc3555d Make two functions out of #define hackery.
Patch by Sebastian Vater, cdgs D basty A googlemail

Originally committed as revision 22970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-26 22:00:57 +00:00
Stefano Sabatini
4cf1ba0445 Make avcodec_check_dimensions() return AVERROR(EINVAL) rather than -1
in case of invalid picture size.

Originally committed as revision 22962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 15:05:16 +00:00
Ronald S. Bultje
0bb848016a Add acelp_filters.o as QCELP decoder object file.
Originally committed as revision 22956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 16:45:38 +00:00
Måns Rullgård
07876e25c8 Workaround for missing llrintf()
Originally committed as revision 22954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-23 16:28:10 +00:00