ffmpeg.git
8 years agovmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.
Justin Ruggles [Wed, 23 Feb 2011 18:11:13 +0000 (13:11 -0500)]
vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.

There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1108f8998c6536bb44d6ecbe5adfa18e0c1478e8)

8 years agovmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding...
Justin Ruggles [Wed, 23 Feb 2011 18:11:12 +0000 (13:11 -0500)]
vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2ec7862db8b782020cc220dae827c3438d108b3a)

8 years agovmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample...
Justin Ruggles [Wed, 23 Feb 2011 18:11:11 +0000 (13:11 -0500)]
vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1e86d685e0935077766c645e49b8533d41ca11cb)

8 years agovmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making...
Justin Ruggles [Wed, 23 Feb 2011 18:11:10 +0000 (13:11 -0500)]
vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound().

This also adds output buffer size checks for AUDIO and SILENCE block types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1574eff3d23ad799d25454a449b01f94795495ea)

8 years agocosmetics: reindent after previous commit
Justin Ruggles [Wed, 23 Feb 2011 18:11:09 +0000 (13:11 -0500)]
cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5)

8 years agovmdaudio: move all silence chunk handling to vmdaudio_loadsound().
Justin Ruggles [Wed, 23 Feb 2011 18:11:08 +0000 (13:11 -0500)]
vmdaudio: move all silence chunk handling to vmdaudio_loadsound().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 762b386e4aafc7bbdbec367bc652cf1199e81f51)

8 years agocosmetics: remove debugging cruft
Justin Ruggles [Wed, 23 Feb 2011 18:11:01 +0000 (13:11 -0500)]
cosmetics: remove debugging cruft

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8e9027d266ef39ab9f88b4bbad5cf9e425d0696c)

8 years agocosmetics: reindent after previous commit
Justin Ruggles [Wed, 23 Feb 2011 18:11:00 +0000 (13:11 -0500)]
cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 868f2f4d90e07edd9a65bd9b917bb5940643ec75)

8 years agovmdaudio: simplify buffer pointer and header size handling.
Justin Ruggles [Wed, 23 Feb 2011 18:11:07 +0000 (13:11 -0500)]
vmdaudio: simplify buffer pointer and header size handling.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2d213695fce86e740800ddcf43d8d0864d2ecea5)

8 years agovmdaudio: set *data_size to zero when skipping small packets and add a warning log...
Justin Ruggles [Wed, 23 Feb 2011 18:11:06 +0000 (13:11 -0500)]
vmdaudio: set *data_size to zero when skipping small packets and add a warning log message.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7a4fb3fd9357dfdd27431a0a8d7250dab54a9938)

8 years agovmdaudio: validate block type
Justin Ruggles [Wed, 23 Feb 2011 18:11:05 +0000 (13:11 -0500)]
vmdaudio: validate block type

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22f893e1c9f9387f0a021f775757130fa48e0180)

8 years agovmdaudio: use macros and a local variable for block type.
Justin Ruggles [Wed, 23 Feb 2011 18:11:04 +0000 (13:11 -0500)]
vmdaudio: use macros and a local variable for block type.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit dd1af5136fe7767f2f18ac943efe994946864640)

8 years agovmdaudio: correct the silent chunk count in the first block.
Justin Ruggles [Wed, 23 Feb 2011 18:11:03 +0000 (13:11 -0500)]
vmdaudio: correct the silent chunk count in the first block.

This fixes A/V sync with several samples, notably:
http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6989cb2dae85ea455ffcc8a36a763134fb311e29)

8 years agovmdaudio: output audio samples for standalone silent blocks.
Justin Ruggles [Wed, 23 Feb 2011 18:11:02 +0000 (13:11 -0500)]
vmdaudio: output audio samples for standalone silent blocks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 9b73f786005f31429d7c88092edfeef6696a5f69)

8 years agovmdaudio: remove duplicated code by merging mono and stereo decoding.
Justin Ruggles [Wed, 23 Feb 2011 18:10:59 +0000 (13:10 -0500)]
vmdaudio: remove duplicated code by merging mono and stereo decoding.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1328d433137c055df06f99772b243ceec2bbf36e)

8 years agovmdaudio: fix raw_block_size calculation.
Justin Ruggles [Wed, 23 Feb 2011 18:10:58 +0000 (13:10 -0500)]
vmdaudio: fix raw_block_size calculation.

The size should depend on the output sample size, not the internal bit depth.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a58bcb40b164b92957db73e702465808a9180126)

8 years agoMark MS-MPEG4v1 encoder as experimental.
Carl Eugen Hoyos [Fri, 25 Feb 2011 14:39:49 +0000 (15:39 +0100)]
Mark MS-MPEG4v1 encoder as experimental.

The encoder has never produced files that could be decoded
with any software.

8 years agoAdd libmpcodecs to the list of libavfilter subdirectories.
Carl Eugen Hoyos [Fri, 25 Feb 2011 14:34:20 +0000 (15:34 +0100)]
Add libmpcodecs to the list of libavfilter subdirectories.

8 years agolavf: update documentation of AVOutputFormat.flags
Anssi Hannula [Mon, 14 Feb 2011 17:14:53 +0000 (19:14 +0200)]
lavf: update documentation of AVOutputFormat.flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMake FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
Michael Niedermayer [Wed, 23 Feb 2011 22:38:52 +0000 (23:38 +0100)]
Make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
This allows the values to be used without changing C code and is closer to how
the other DEBUG flags work.
If this causes a problem for any user of this flag, please tell me and
ill split the flag in 2.

8 years agolavf: postpone removal of deprecated avio functions
Anton Khirnov [Wed, 23 Feb 2011 07:01:36 +0000 (08:01 +0100)]
lavf: postpone removal of deprecated avio functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: postpone removal of public metadata conversion API
Anton Khirnov [Wed, 23 Feb 2011 07:01:35 +0000 (08:01 +0100)]
lavf: postpone removal of public metadata conversion API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavienc: fix AVI stream index for files with >10 streams
longstone [Wed, 23 Feb 2011 15:43:21 +0000 (10:43 -0500)]
avienc: fix AVI stream index for files with >10 streams

Fixes issue 2563.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4acc94e97a9551d11ead29735e23283d71f1d4c2)

8 years agoavio: rename url_fopen/fclose -> avio_open/close.
Anton Khirnov [Mon, 21 Feb 2011 21:45:20 +0000 (22:45 +0100)]
avio: rename url_fopen/fclose -> avio_open/close.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)

8 years agolibavformat: Remove FF_NETERRNO()
Martin Storsjö [Sat, 19 Feb 2011 18:14:11 +0000 (19:14 +0100)]
libavformat: Remove FF_NETERRNO()

Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR()
error codes. Provide fallback definitions of other errno.h network
errors, mapping them to the corresponding winsock errors.

This eases catching these error codes in common code, without having
to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN).

This fixes roundup issue 2614, unbreaking blocking network IO on
windows.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 28c4741a6617a4c1d2490cb13fc70ae4c9c472da)

8 years agoAdd more AVC Intra FOURCCs
Benjamin Larsson [Tue, 8 Feb 2011 10:05:05 +0000 (11:05 +0100)]
Add more AVC Intra FOURCCs

Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac
and different ones are used for 720 versus 1080 lines.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8f935b9271052be8f97d655081b94b68b6c23bfb)

8 years agoaacdec: Reduce the size of buf_mdct.
Young Han Lee [Wed, 16 Feb 2011 01:04:07 +0000 (10:04 +0900)]
aacdec: Reduce the size of buf_mdct.

It was doubled in size for the LTP implementation. This brings it back
down to its original size.
(cherry picked from commit e22910b21a6c78b0159f98426b10c204f12bc15a)

8 years agoRemove old VCSs from version.sh
Alex Converse [Mon, 21 Feb 2011 08:01:09 +0000 (00:01 -0800)]
Remove old VCSs from version.sh
(cherry picked from commit 203df50d1013ea59e558d63f3ea69ffae1249124)

8 years agompegtsenc: use correct PES stream_id for AAC
Tony Strauss [Mon, 21 Feb 2011 23:46:54 +0000 (23:46 +0000)]
mpegtsenc: use correct PES stream_id for AAC

This adds the AAC codec to the list of audio codecs that results
in a PES stream_id of 0xc0 (audio stream).

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6c065f0acd5b50a9037b561c6fc370b316832543)

8 years agospdifenc.c: fix compile because of missing include avio_internal.h.
Ronald S. Bultje [Mon, 21 Feb 2011 20:46:45 +0000 (15:46 -0500)]
spdifenc.c: fix compile because of missing include avio_internal.h.
(cherry picked from commit 0f86fcabdf74f658323140111dfd4de83f7f2eee)

8 years agovp8: ppc: fix invalid reads in altivec epel mc
Mans Rullgard [Mon, 21 Feb 2011 15:47:27 +0000 (15:47 +0000)]
vp8: ppc: fix invalid reads in altivec epel mc

The 4-tap filters should only access one row/column before the
reference block.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e0e46cae377347cbe1cd27c0d85568921b12c2ad)

8 years agoppc: fix vc1 inverse transform, unbreak build
Mans Rullgard [Mon, 21 Feb 2011 19:15:38 +0000 (19:15 +0000)]
ppc: fix vc1 inverse transform, unbreak build

GCC 4.3 and later are more particular about signedness matching
in vector operations.  The operations under if(rangered) were
missing assignments and thus had no effect.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 381efba0ecedd41575f99ba9e9bd3826551079f6)

8 years agoavio: make put_nbyte internal.
Anton Khirnov [Mon, 21 Feb 2011 19:02:20 +0000 (20:02 +0100)]
avio: make put_nbyte internal.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0ac8e2bf2bf3d636241bf2811018d9974687a63c)

8 years agoavio: avio: avio_ prefixes for put_* functions
Anton Khirnov [Mon, 21 Feb 2011 18:28:17 +0000 (19:28 +0100)]
avio: avio: avio_ prefixes for put_* functions

In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 77eb5504d3b3e1047900382350e0bc5e0bfb16b5)

8 years agotarga: prevent integer overflow in bufsize check.
Ronald S. Bultje [Mon, 21 Feb 2011 18:44:37 +0000 (13:44 -0500)]
targa: prevent integer overflow in bufsize check.
(cherry picked from commit 78e2380a6d09e7a8b2a74d090abfb0a922e046f6)

8 years agoavio: make get_partial_buffer internal.
Anton Khirnov [Mon, 21 Feb 2011 18:28:16 +0000 (19:28 +0100)]
avio: make get_partial_buffer internal.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b3db9ceef13037f2b6963a84b7abf8871a1e0f8a)

8 years agoavio: avio_ prefixes for get_* functions
Anton Khirnov [Mon, 21 Feb 2011 15:43:01 +0000 (16:43 +0100)]
avio: avio_ prefixes for get_* functions

In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)

8 years agoVC1: merge idct8x8, coeff adjustments and put_pixels.
Ronald S. Bultje [Mon, 21 Feb 2011 14:07:13 +0000 (09:07 -0500)]
VC1: merge idct8x8, coeff adjustments and put_pixels.

Merging these functions allows merging some loops, which makes the
results (particularly after SIMD optimizations) much faster.
(cherry picked from commit f8bed30d8b176fa030f6737765338bb4a2bcabc9)

8 years agoavio: rename av_alloc_put_byte -> avio_alloc_context for consistency
Anton Khirnov [Sun, 20 Feb 2011 14:03:29 +0000 (15:03 +0100)]
avio: rename av_alloc_put_byte -> avio_alloc_context for consistency

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8d9ac969cb4ac3e3e18f6425703af4d7aec6c513)

8 years agodsputil: make {add/put/put_signed}_pixels_clamped() non-static.
Ronald S. Bultje [Sun, 20 Feb 2011 22:31:33 +0000 (17:31 -0500)]
dsputil: make {add/put/put_signed}_pixels_clamped() non-static.
(cherry picked from commit 484a337cd7cd8bb180c4a1bd3321881f1c874a92)

8 years agoVC1: inline vc1_put_block() in vc1_decode_i_blocks().
Ronald S. Bultje [Sun, 20 Feb 2011 15:46:55 +0000 (10:46 -0500)]
VC1: inline vc1_put_block() in vc1_decode_i_blocks().

Advantage is that it allows us to combine several loops into a single
one, and these can eventually be merged into the IDCT itself. Also, it
allows us to remove vc1_put_block(), and makes CODEC_FLAG_GRAY faster.
(cherry picked from commit bbfd2e7ab4e2ae0b934657fe51afdbbbaead52b7)

8 years agoMakefile: include deps from tools directory
Mans Rullgard [Sun, 20 Feb 2011 17:16:42 +0000 (17:16 +0000)]
Makefile: include deps from tools directory

This ensures the tools are rebuilt when necessary.  Specifically,
lavfi-showfiltfmts was sometimes not rebuilt causing spurious test
failures.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 08df7f866663f83ba42398cea9f3eeff4681ea9a)

8 years agoamrnb: use correct size when copying lsf_r array
Mans Rullgard [Sun, 20 Feb 2011 16:47:19 +0000 (16:47 +0000)]
amrnb: use correct size when copying lsf_r array

lsf_r is an array of int16_t, not float.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1efa772e20be5869817b2370a557bb14e7ce2fff)

8 years agox86: use raw opcode for xgetbv instruction
Mans Rullgard [Sun, 20 Feb 2011 14:38:32 +0000 (14:38 +0000)]
x86: use raw opcode for xgetbv instruction

This allows the CPU detection to work with assemblers not supporting
the xgetbv mnemonic.  These include clang and some BSD versions.

All AVX code will be written for yasm, where the main assembler
is not involved.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ef6695387522fc783105ac187c84beaa284e7cff)

8 years agoAdd shadow support to the drawtext filter
Michael Niedermayer [Tue, 22 Feb 2011 00:41:52 +0000 (01:41 +0100)]
Add shadow support to the drawtext filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofactor draw_glyphs out of drawtext filter
Michael Niedermayer [Tue, 22 Feb 2011 00:11:35 +0000 (01:11 +0100)]
factor draw_glyphs out of drawtext filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix and optimize yuv blend in the drawtext filter
Michael Niedermayer [Mon, 21 Feb 2011 23:54:48 +0000 (00:54 +0100)]
Fix and optimize yuv blend in the drawtext filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoget rid of divisions in the inner loop of the drawtext filter
Michael Niedermayer [Mon, 21 Feb 2011 23:43:19 +0000 (00:43 +0100)]
get rid of divisions in the inner loop of the drawtext filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofix chroma alpha in the drawtext filter
Michael Niedermayer [Mon, 21 Feb 2011 23:28:54 +0000 (00:28 +0100)]
fix chroma alpha in the drawtext filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSimplify chroma blend in the drawtext filter
Michael Niedermayer [Mon, 21 Feb 2011 23:23:31 +0000 (00:23 +0100)]
Simplify chroma blend in the drawtext filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoPort drawtext filter by Hemanth from the libavfilter soc repo, with
Stefano Sabatini [Mon, 21 Feb 2011 00:02:29 +0000 (01:02 +0100)]
Port drawtext filter by Hemanth from the libavfilter soc repo, with
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: add fade filter
Brandon Mintern [Mon, 21 Feb 2011 11:02:57 +0000 (12:02 +0100)]
lavfi: add fade filter

Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: put color source in a dedicated file
Stefano Sabatini [Sun, 20 Feb 2011 22:42:24 +0000 (23:42 +0100)]
lavfi: put color source in a dedicated file

Move the color source code from vf_pad.c to vsrc_color.c.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: add drawutils
Stefano Sabatini [Sun, 20 Feb 2011 22:42:17 +0000 (23:42 +0100)]
lavfi: add drawutils

Add drawutils.h and drawutils.c, and use them in the pad filter.
The new functions are going to be shared by other filters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoUpdate version and APIchanges.
Ronald S. Bultje [Sun, 20 Feb 2011 13:46:22 +0000 (08:46 -0500)]
Update version and APIchanges.

Update libavformat/version.h and doc/APIChanges after renaming
init_put_byte() and ByteIOContext to ffio_init_context() (private)
and AVIOContext, (public), and deprecating the originals.
(cherry picked from commit d2bbf82e65e4a128ab1f0bf48df5d1e43c43c698)

8 years agoavio: move init_put_byte() to a new private header and rename it
Anton Khirnov [Sun, 20 Feb 2011 10:04:13 +0000 (11:04 +0100)]
avio: move init_put_byte() to a new private header and rename it

init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e731b8d8729e75bfb69f5540e6446d6118dac549)

8 years agoavio: rename ByteIOContext to AVIOContext.
Anton Khirnov [Sun, 20 Feb 2011 10:04:12 +0000 (11:04 +0100)]
avio: rename ByteIOContext to AVIOContext.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)

8 years agoVC1: don't use vc1_put_block() in vc1_decode_i_blocks_adv().
Ronald S. Bultje [Sun, 20 Feb 2011 00:07:29 +0000 (19:07 -0500)]
VC1: don't use vc1_put_block() in vc1_decode_i_blocks_adv().

Advanced profile never uses "range reduction", so vc1_put_block() quite
literally just calls put_pixels_clamped() from vc1_decode_i_blocks_adv().
By inlining the function, we can prevent calling IDCT8x8 if
CODEC_FLAG_GRAY is set, and we don't have to scale the coeffs in the
[0,256] range, but can instead use put_signed_pixels_clamped().
(cherry picked from commit 70aa916e4630bcec14439a2d703074b6d4c890a8)

8 years agox86: check for AVX support
Mans Rullgard [Wed, 16 Feb 2011 02:39:42 +0000 (02:39 +0000)]
x86: check for AVX support

This adds configure and runtime checks for AVX support on x86 CPUs.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 87f1355f9b4fc11414d0e6a91404203c2745f89f)

8 years agoMMS: also discover streams in extended stream properties object
Marton Balint [Sat, 19 Feb 2011 16:33:15 +0000 (17:33 +0100)]
MMS: also discover streams in extended stream properties object

Allows playback of nonprimary audio streams in multiple bitrate sources,
such as mmsh://wmscr1.dr.dk/e02ch03m

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 74d6871d6244865b5863a01c3dab16a2f06a1706)

8 years agodsputil_mmx.c: remove ff_vector128.
Ronald S. Bultje [Sat, 19 Feb 2011 13:50:37 +0000 (08:50 -0500)]
dsputil_mmx.c: remove ff_vector128.

Remove ff_vector128, it is identical to ff_pb_80.
(cherry picked from commit bf6fa732459399fac215bdfa44dd39a6fb1d1e01)

8 years agoFix invalid reads in VC1 decoder
Reimar Döffinger [Sat, 19 Feb 2011 10:33:01 +0000 (11:33 +0100)]
Fix invalid reads in VC1 decoder

Patch discussed and taken from https://roundup.ffmpeg.org/issue2584
(cherry picked from commit 2bbec1eda46d907605772a8b6e8263caa4bc4c82)

8 years agoFix VP3 edge emulation
David Conrad [Sat, 19 Feb 2011 09:41:51 +0000 (01:41 -0800)]
Fix VP3 edge emulation

With negative stride, the start of the edge_emu buffer should be pointing to
the last line, not the end of the buffer.
With positive stride, pointing to the end of the buffer was completely wrong.
(cherry picked from commit a89f4ca005efa5ee82089583c7b8bc00bcee816a)

8 years agoaacdec: dsputilize the scalar multiplication in intensity stereo
Young Han Lee [Sat, 19 Feb 2011 00:32:24 +0000 (09:32 +0900)]
aacdec: dsputilize the scalar multiplication in intensity stereo
(cherry picked from commit 9707f84fa73c23352937fc7e4e0a85eaf3135cbc)

8 years agoVP3: fix decoding of videos with stride > 2048
Jason Garrett-Glaser [Fri, 18 Feb 2011 04:24:05 +0000 (20:24 -0800)]
VP3: fix decoding of videos with stride > 2048

Also remove qscale_table code; this didn't make sense anyways as VP3 doesn't
use an MPEG-like quantizer scale.
(cherry picked from commit 902685b8abf4e2089802528a32a50f3c68033fda)

8 years agoFix issue2619.
Michael Niedermayer [Sat, 19 Feb 2011 16:30:04 +0000 (17:30 +0100)]
Fix issue2619.
regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotarga: fix potential buffer overreads
Jean-Daniel Dupas [Fri, 18 Feb 2011 09:35:51 +0000 (10:35 +0100)]
targa: fix potential buffer overreads

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 351423ae1f861da1c647d30c73503fde2b1f3dad)

8 years agoFix PPC build.
Ronald S. Bultje [Fri, 18 Feb 2011 00:33:33 +0000 (19:33 -0500)]
Fix PPC build.
(cherry picked from commit ed040f35f298b39f1ddd45a133c82cb5d6d79dda)

8 years agoVP8: init one less near_mv
Jason Garrett-Glaser [Thu, 17 Feb 2011 21:56:26 +0000 (13:56 -0800)]
VP8: init one less near_mv

This one didn't actually need to be initialized.
(cherry picked from commit 891b1f15a7e45a2a5f91cb4c27d11259ef8e012f)

8 years agoForce inlining of avutil common routines
Jason Garrett-Glaser [Wed, 16 Feb 2011 18:20:54 +0000 (10:20 -0800)]
Force inlining of avutil common routines

On some versions of gcc, these weren't always getting inlined due to hitting
the inline cap limit in some files.  This is generally bad, as most of these
functions are smaller inlined than not.
(cherry picked from commit eb3755a5aa65da685d81399cfae4bd35e4a178b6)

8 years agoVP8: split out declarations to new header
Jason Garrett-Glaser [Wed, 16 Feb 2011 17:49:50 +0000 (09:49 -0800)]
VP8: split out declarations to new header
(cherry picked from commit bcf4568f183055331415ba230e82af6d59faac1c)

8 years agoVP8: faster MV clipping
Jason Garrett-Glaser [Wed, 16 Feb 2011 17:39:00 +0000 (09:39 -0800)]
VP8: faster MV clipping
(cherry picked from commit 7634771e70575b2a5abaeb420c5b3c2f9948c693)

8 years agodsputil: move VC1-specific stuff into VC1DSPContext.
Ronald S. Bultje [Thu, 17 Feb 2011 19:45:03 +0000 (14:45 -0500)]
dsputil: move VC1-specific stuff into VC1DSPContext.
(cherry picked from commit 12802ec0601c3bd7b9c7a2503518e28fd5e7d744)

8 years agoVC1: simplify a calculation in a loop.
Ronald S. Bultje [Thu, 17 Feb 2011 17:14:12 +0000 (12:14 -0500)]
VC1: simplify a calculation in a loop.
(cherry picked from commit 0b16cdc3fa1d73056649abf43288be0a7624fdcc)

8 years agoVC1: transpose IDCT 8x8 coeffs while reading.
Ronald S. Bultje [Wed, 16 Feb 2011 19:18:21 +0000 (14:18 -0500)]
VC1: transpose IDCT 8x8 coeffs while reading.
(cherry picked from commit 1da6ea39542424ddb691dc6cf08d611a4c6db247)

8 years agoffserver: Try matching the RTSP url without a trailing slash
Martin Storsjö [Wed, 16 Feb 2011 14:37:40 +0000 (16:37 +0200)]
ffserver: Try matching the RTSP url without a trailing slash

If the client sends PLAY/PAUSE requests with the same url as
specified in Content-Base, these requests may have urls with
trailing slashes.
(cherry picked from commit c2ca851b234e169b50730ef357aeade8047491eb)

8 years agoAdd SHA1s to APIChanges for av_dump_format, av_parse_time and av_find_info_tag
Janne Grunau [Thu, 17 Feb 2011 20:49:08 +0000 (21:49 +0100)]
Add SHA1s to APIChanges for av_dump_format, av_parse_time and av_find_info_tag
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c3dbfa1afd7d989e3bba4c6bfc492a52c012e9b3)

8 years agolavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixes
Anton Khirnov [Wed, 16 Feb 2011 08:52:39 +0000 (09:52 +0100)]
lavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixes

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 09d171b98879f58be1a766d5f277e131b18e98a1)

8 years agoMove find_info_tag to lavu and add av_ prefix to it
Anton Khirnov [Wed, 16 Feb 2011 08:52:38 +0000 (09:52 +0100)]
Move find_info_tag to lavu and add av_ prefix to it

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit ab0287fcbdebc8ff416214535d7ee8424406990e)

8 years agomdct: remove unnecessary multiplication
Young Han Lee [Thu, 17 Feb 2011 07:45:54 +0000 (16:45 +0900)]
mdct: remove unnecessary multiplication

3*n4 was already calculated in n3.
(cherry picked from commit 979395bbbb9381b522b44c3448c24aef9c819ffc)

8 years agoac3enc: fix bug in stereo rematrixing decision.
Justin Ruggles [Wed, 16 Feb 2011 00:30:24 +0000 (00:30 +0000)]
ac3enc: fix bug in stereo rematrixing decision.

The rematrixing strategy reuse flags are not reset between frames, so they
need to be initialized for all blocks, not just block 0.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5b54d4b376fbd2c291b8a6dba7d425e28f654bcf)

8 years agoReplace remaining uses of parse_date with av_parse_time.
Anton Khirnov [Wed, 16 Feb 2011 08:52:37 +0000 (08:52 +0000)]
Replace remaining uses of parse_date with av_parse_time.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f)

8 years agoDeprecate parse_date() in favor of av_parse_time().
Stefano Sabatini [Wed, 16 Feb 2011 08:52:36 +0000 (08:52 +0000)]
Deprecate parse_date() in favor of av_parse_time().

The new av_parse_time() is created in libavutil/parseutils.h, all the
internal functions used by parse_date are moved to
libavutil/parseutils.c and made static.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f6c7375a175ac649558aefab14f3895b2cb469aa)

8 years agolavf: add av_ prefix to dump_format()
Anton Khirnov [Wed, 16 Feb 2011 08:52:35 +0000 (08:52 +0000)]
lavf: add av_ prefix to dump_format()

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 610219a598095f938705f200dfe3946455ef871a)

8 years agortsp: udp_read_packet returning 0 doesn't mean success
Martin Storsjö [Wed, 16 Feb 2011 12:35:47 +0000 (14:35 +0200)]
rtsp: udp_read_packet returning 0 doesn't mean success

If udp_read_packet returns 0, rtsp_st isn't set and we shouldn't
treat it as a successfully received packet (which is counted and
possibly triggers a RTCP receiver report).

This fixes issue 2612.
(cherry picked from commit 2c35a6bde95a382e2d48570255deb67a7633fa46)

8 years agoffserver: set the sample aspect ratio
Nicolas George [Wed, 16 Feb 2011 13:53:08 +0000 (14:53 +0100)]
ffserver: set the sample aspect ratio

Hi.

It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf
rejects it.

I am not sure what I am doing here, but the attached patch actually solves
something: using the following config:

CustomLog -
NoDaemon
RTSPPort 5454
<Stream test1-rtsp.mpg>
Format rtp
File "/tmp/test1-rtsp.mpg"
</Stream>

it allows a somewhat old ffplay (unaffected by the content-base issue I
spoke of in another thread) to play the stream.

Without it, ffserver logs this and closes the stream:

Wed Feb 16 14:52:14 2011 [rtp @ 0x1399de0]Aspect ratio mismatch between encoder and muxer layer

Regards,

--
  Nicolas George

From 1b89c3c2164335060e87567b27deb0d354e0a814 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Wed, 16 Feb 2011 14:44:31 +0100
Subject: [PATCH] ffserver: set the sample aspect ratio.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
(cherry picked from commit 6741f7c9be4913e084ad067571f3f29853ec5d5a)

8 years agodocumentation: add encoders chapter
James Zern [Sat, 12 Feb 2011 00:02:45 +0000 (16:02 -0800)]
documentation: add encoders chapter

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 0fa904c9d845d4a47372e619067e21991bb39b06)

8 years agoIn graph2dot, print more specific audio information for audio links.
Stefano Sabatini [Sun, 13 Feb 2011 21:50:47 +0000 (22:50 +0100)]
In graph2dot, print more specific audio information for audio links.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 009026efb1e3b3a5f05fd9934019a6300b25f364)

8 years agospdifenc: set flag AVFMT_NOTIMESTAMPS
Anssi Hannula [Mon, 14 Feb 2011 17:19:30 +0000 (19:19 +0200)]
spdifenc: set flag AVFMT_NOTIMESTAMPS

There are no timestamps in IEC 61937.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 6c60fcf89afc84c9dc863669d78e611d7c72fe41)

8 years agoReduce picture size for yadif.
Michael Niedermayer [Fri, 18 Feb 2011 18:39:56 +0000 (19:39 +0100)]
Reduce picture size for yadif.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoChange yadif to not use out of picture lines.
Michael Niedermayer [Fri, 18 Feb 2011 18:10:33 +0000 (19:10 +0100)]
Change yadif to not use out of picture lines.
Fixes issue2272.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3dsp: Change punpckhqdq to movhlps in ac3_max_msb_abs_int16().
Justin Ruggles [Wed, 16 Feb 2011 19:04:04 +0000 (14:04 -0500)]
ac3dsp: Change punpckhqdq to movhlps in ac3_max_msb_abs_int16().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1f004fc512babe8215e2aa31fa4770aa27812cab)

8 years agofix nsvdec.c compilation if DEBUG macro defined
Maksym Veremeyenko [Wed, 16 Feb 2011 07:52:44 +0000 (09:52 +0200)]
fix nsvdec.c compilation if DEBUG macro defined

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 41cdc1ff1e86f1bfb935e1bde53ccc9c645ff71e)

8 years agoFix av_find_best_stream when using a program
Balint Marton [Wed, 16 Feb 2011 00:17:13 +0000 (00:17 +0000)]
Fix av_find_best_stream when using a program

The current implementation has a bug, it is returning the stream index
in the found program, and not the stream index in the list of all
streams. The attached patch fixes this issue.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 22ec6b738f1608e4b959fb655cf37c3343ec7e9f)

8 years agoDocument audio_resample_close().
Stefano Sabatini [Mon, 14 Feb 2011 09:59:25 +0000 (10:59 +0100)]
Document audio_resample_close().

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDocument that av_write_header sets stream time_base to a value of it chosing.
Reimar Döffinger [Sat, 29 Jan 2011 12:53:14 +0000 (13:53 +0100)]
Document that av_write_header sets stream time_base to a value of it chosing.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agospdifenc: update 482d98f69b2eb7a7b0b5054101a43db384e9432b to the latest patch
Janne Grunau [Sun, 13 Feb 2011 16:18:07 +0000 (17:18 +0100)]
spdifenc: update 482d98f69b2eb7a7b0b5054101a43db384e9432b to the latest patch

"spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI"
(cherry picked from commit ec25f83bd98e10c023e6c7b07da1dcfc4d80cefc)

8 years agoac3enc: change default floor code to 7.
Justin Ruggles [Tue, 15 Feb 2011 18:46:56 +0000 (18:46 +0000)]
ac3enc: change default floor code to 7.

This is to match the value in every (E-)AC-3 file from commercial sources.
It has a negligible effect on audio quality.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 50d7140441b61809ad4ba4ea7b4ad8fe77bc6888)

8 years agoos_support: fix poll() implementation
Max Shakhmetov [Tue, 15 Feb 2011 16:49:27 +0000 (17:49 +0100)]
os_support: fix poll() implementation

Our poll implementation does not iterate over the pollfd array properly
while setting the revents.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 9ac2085dbf1821b7995fe360038c1bf0f3940032)

8 years agoMerge libavcore into libavutil
Reinhard Tartler [Mon, 7 Feb 2011 13:37:08 +0000 (14:37 +0100)]
Merge libavcore into libavutil

Done to keep ABI compatible. Otherwise this is just silly