ffmpeg.git
6 years agoRename "AVClass class" as "AVClass component_class" for external codecs.
Sean McGovern [Thu, 4 Jul 2013 16:02:17 +0000 (18:02 +0200)]
Rename "AVClass class" as "AVClass component_class" for external codecs.

The aix header math.h defines "extern int class()" for C.
This fixes compilation on aix with external libraries enabled.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agoFix opacity and increase colour dynamics of initial vmd palette.
Carl Eugen Hoyos [Thu, 4 Jul 2013 15:01:03 +0000 (17:01 +0200)]
Fix opacity and increase colour dynamics of initial vmd palette.

6 years agoavformat/http: support relative url redirection
Zhang Rui [Thu, 4 Jul 2013 09:18:52 +0000 (17:18 +0800)]
avformat/http: support relative url redirection

see also http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-17#section-9.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/crop: support more pixel formats
Paul B Mahol [Wed, 3 Jul 2013 21:05:42 +0000 (21:05 +0000)]
lavfi/crop: support more pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/sonic: Fix usage of init_get_bits() and use init_get_bits8()
Michael Niedermayer [Thu, 4 Jul 2013 11:32:31 +0000 (13:32 +0200)]
avcodec/sonic: Fix usage of init_get_bits() and use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/h261dec: use init_get_bits8()
Michael Niedermayer [Thu, 4 Jul 2013 11:31:55 +0000 (13:31 +0200)]
avformat/h261dec: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/svq1dec: use init_get_bits8()
Michael Niedermayer [Thu, 4 Jul 2013 11:30:40 +0000 (13:30 +0200)]
avcodec/svq1dec: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ra288: use init_get_bits8()
Michael Niedermayer [Thu, 4 Jul 2013 11:26:32 +0000 (13:26 +0200)]
avcodec/ra288: use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriff: remove invalid fourcc 'exr '
Paul B Mahol [Thu, 25 Oct 2012 14:07:40 +0000 (14:07 +0000)]
riff: remove invalid fourcc 'exr '

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/rawdec: Fix 2bpp and 4bpp rawvideo in mov
Carl Eugen Hoyos [Fri, 14 Jun 2013 00:08:31 +0000 (02:08 +0200)]
avcodec/rawdec: Fix 2bpp and 4bpp rawvideo in mov

Restores carefully the old behaviour
(and does not break decoding avi samples).
Fixes Ticket2536

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/delogo: avoid propagation of rounding errors in chroma planes
Jean Delvare [Tue, 2 Jul 2013 11:50:02 +0000 (13:50 +0200)]
lavfi/delogo: avoid propagation of rounding errors in chroma planes

When operating on subsampled chroma planes, some rounding is taking
place. The left and top borders are rounded down while the width and
height are rounded up, so all rounding is done outward to guarantee the
logo area is fully covered.

The problem is that the width and height are counted from the
unrounded left and top borders, respectively. So if the left or top
border position has indeed been rounded down, and the width or height
needs no rounding (up), the position of the the right or bottom border
will be effectively rounded down, i.e. inward.

The issue can easily be seen with a yuv240p input and
  -vf delogo=45:45:60:40:show=1 -vframes 1 delogo-bug.png
(or virtually any logo area with odd x and y and even width and
height.) The right and bottom chroma borders (in green) are clearly
off.

In order to fix this, the width and height must be adjusted to include
the bits lost in the rounding of the left and top border positions,
respectively, prior to being themselves rounded up.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/delogo: take SAR into account
Jean Delvare [Mon, 1 Jul 2013 14:28:59 +0000 (16:28 +0200)]
lavfi/delogo: take SAR into account

When interpolating, weights are based on relative distances, which
assume square pixels. If a non-1:1 sample aspect ratio is used, it
should be taken into account when comparing distances, because the
human eye and brain care about the picture as it is displayed, not
stored.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opt: show default values
Paul B Mahol [Tue, 2 Jul 2013 13:31:28 +0000 (13:31 +0000)]
lavu/opt: show default values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/movenc: fix writing of some iTunes metadata tag
Matthieu Bouron [Sat, 29 Jun 2013 15:56:49 +0000 (17:56 +0200)]
lavf/movenc: fix writing of some iTunes metadata tag

Fix metadata display under iTunes for files using pgap, hdvd, stick,
tvsn and tves tags.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 3 Jul 2013 14:42:20 +0000 (16:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  jpeg2000: Use the matching coding style struct for transform selection
  jpeg2000: Merge rescaling with interleaving in 9/7 IDWT

No change, all commits & hunks where already in.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '22e18ea39e371030cc78973d1b46aae45a7ea215'
Michael Niedermayer [Wed, 3 Jul 2013 14:36:05 +0000 (16:36 +0200)]
Merge commit '22e18ea39e371030cc78973d1b46aae45a7ea215'

* commit '22e18ea39e371030cc78973d1b46aae45a7ea215':
  jpeg2000: Optimize output sample conversion
  jpeg2000: Reset s->numX/Ytiles on tile deallocation
  jpeg2000: Optimize dequantization
  jpeg2000: Do not assume a single tile
  jpeg2000: Speed up jpeg2000_decode_tile()
  jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'
Michael Niedermayer [Wed, 3 Jul 2013 14:22:11 +0000 (16:22 +0200)]
Merge commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9'

* commit 'd57c737ac30cf079a342fa649fd4888c2d059dd9':
  jpeg2000: Simplify jpeg2000_decode_packets()
  jpeg2000: Do not crash on NULL node in tag_tree_decode
  jpeg2000: Refactor SOT marker parsing

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'
Michael Niedermayer [Wed, 3 Jul 2013 14:11:01 +0000 (16:11 +0200)]
Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'

* commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788':
  jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:
libavcodec/jpeg2000.c

See: 9d56ccf5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
Michael Niedermayer [Wed, 3 Jul 2013 13:45:03 +0000 (15:45 +0200)]
Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'

* commit '589e5b52f634f6b2d307a167a19eef7e7328cb08':
  jpeg2000: Use the correct sizeof in memset for T1 data
  jpeg2000: Simplify init_tile()
  jpeg2000: Update pixel format support

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'db13e02c6f0355fabd540e77b61ade127d6411ff'
Michael Niedermayer [Wed, 3 Jul 2013 13:38:45 +0000 (15:38 +0200)]
Merge commit 'db13e02c6f0355fabd540e77b61ade127d6411ff'

* commit 'db13e02c6f0355fabd540e77b61ade127d6411ff':
  jpeg2000: Compute corrections of sub-band coordinates
  jpeg2000: Remove unneeded variable initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5bf208f659703895df7926238dcfa8a8175de36b'
Michael Niedermayer [Wed, 3 Jul 2013 13:30:05 +0000 (15:30 +0200)]
Merge commit '5bf208f659703895df7926238dcfa8a8175de36b'

* commit '5bf208f659703895df7926238dcfa8a8175de36b':
  jpeg2000: Use separate fields for int and float codepaths
  jpeg2000: Split int/float codepaths depending on the DWT

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'
Michael Niedermayer [Wed, 3 Jul 2013 13:20:37 +0000 (15:20 +0200)]
Merge commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'

* commit 'f9581f1414ec8e3e7d0868793cda4f2e4fa113ea':
  jpeg2000: Improve reduced resolution decoding
  jpeg2000: Compute quantization for 'scalar derived' in the correct case.
  jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9'
Michael Niedermayer [Wed, 3 Jul 2013 13:03:08 +0000 (15:03 +0200)]
Merge commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9'

* commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9':
  jpeg2000: Fix compute precedence error in lut_gain index
  jpeg2000: Initialize code blocks structures in precincts to 0
  jpeg2000: Check that we have enough components for MCT

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b564784a207b1395d2b5a41e580539df04651096'
Michael Niedermayer [Wed, 3 Jul 2013 12:59:35 +0000 (14:59 +0200)]
Merge commit 'b564784a207b1395d2b5a41e580539df04651096'

* commit 'b564784a207b1395d2b5a41e580539df04651096':
  jpeg2000: Check that there is a SOT before SOD
  jpeg2000: Remove unneeded returns

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'
Michael Niedermayer [Wed, 3 Jul 2013 12:49:28 +0000 (14:49 +0200)]
Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'

* commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f':
  jpeg2000: Propagate error code from get_cox()
  jpeg2000: Check that nreslevels2decode has been initialized before use

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'
Michael Niedermayer [Wed, 3 Jul 2013 12:46:10 +0000 (14:46 +0200)]
Merge commit '86a2602e16171ddc10c3ec655c23b16ffa595059'

* commit '86a2602e16171ddc10c3ec655c23b16ffa595059':
  jpeg2000: Drop unused and writeonly fields
  jpeg2000: Correctly calculate sgnd

Conflicts:
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'
Michael Niedermayer [Wed, 3 Jul 2013 12:38:37 +0000 (14:38 +0200)]
Merge commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936'

* commit 'fd54dd028bc9f7bfb80ebf823a533dc84b73f936':
  jpeg2000: check len before parsing header
  jpeg2000: Check component number in get_coc() and get_qcc()

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'
Michael Niedermayer [Wed, 3 Jul 2013 12:30:17 +0000 (14:30 +0200)]
Merge commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58'

* commit '17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
  jpeg2000: Check zero bit-plane validity

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7e201d575dc4385eb67314b0419d4d77185e65f4'
Michael Niedermayer [Wed, 3 Jul 2013 12:20:36 +0000 (14:20 +0200)]
Merge commit '7e201d575dc4385eb67314b0419d4d77185e65f4'

* commit '7e201d575dc4385eb67314b0419d4d77185e65f4':
  jpeg2000: Validate block lengthinc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '278a923c51187d37445d88a6b21082036ec9568d'
Michael Niedermayer [Wed, 3 Jul 2013 11:57:59 +0000 (13:57 +0200)]
Merge commit '278a923c51187d37445d88a6b21082036ec9568d'

* commit '278a923c51187d37445d88a6b21082036ec9568d':
  jpeg2000: Validate SIZ parsing

Conflicts:
libavcodec/jpeg2000dec.c

This commit is not exactly merged due to bugs in it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd3cb302b88503c3111e25add196622110c056188'
Michael Niedermayer [Wed, 3 Jul 2013 11:20:57 +0000 (13:20 +0200)]
Merge commit 'd3cb302b88503c3111e25add196622110c056188'

* commit 'd3cb302b88503c3111e25add196622110c056188':
  jpeg2000: Validate SOT parsing

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next...
Stefano Sabatini [Mon, 1 Jul 2013 23:39:14 +0000 (01:39 +0200)]
lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump

Add function avfilter_graph_parse_ptr() and favor it in place of
avfilter_graph_parse(), which will be restored with the old/Libav
signature at the next bump.

If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the
Libav-compatible signature for avfilter_graph_parse().

At the next major bump the current implementation of
avfilter_graph_parse() should be dropped in favor of the Libav/old
implementation.

Should address trac ticket #2672.

6 years agoconfigure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi
Stefano Sabatini [Mon, 1 Jul 2013 16:47:09 +0000 (18:47 +0200)]
configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi

"Fork" is an ambiguous term, since there may be more than one fork, also
"fork" could be confused with the corresponding function. Also it seems
important to point the name of the referenced fork in the symbol.

Note: the old --enable-incompatible-fork-abi command is retained for
compatibility, although it should be considered deprecated.

6 years agoMerge commit '57bc64e'
Michael Niedermayer [Wed, 3 Jul 2013 11:00:57 +0000 (13:00 +0200)]
Merge commit '57bc64e'

* commit '57bc64e':
  jpeg2000: Use bytestream2
  jpeg2000: Clean up return paths and error messages
  jpeg2000: Define the maximum decomposition levels
  jpeg2000: Check code-block size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "doc: add script to compute texi files dependencies"
Michael Niedermayer [Wed, 3 Jul 2013 10:59:59 +0000 (12:59 +0200)]
Revert "doc: add script to compute texi files dependencies"

This reverts commit 628ceac6526724d35cb390cc1f88344f4ea22eb4.

The commit broke out of tree builds

6 years agoMerge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'
Michael Niedermayer [Wed, 3 Jul 2013 10:54:01 +0000 (12:54 +0200)]
Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'

* commit '1a3598aae768465a8efc8475b6df5a8261bc62fc':
  jpeg2000: Use bytestream2

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
Michael Niedermayer [Wed, 3 Jul 2013 10:16:24 +0000 (12:16 +0200)]
Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'

* commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
  jpeg2000: Clean up return paths and error messages

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'be3271009ef893fbed9640e8edbd771685fd957b'
Michael Niedermayer [Wed, 3 Jul 2013 10:02:11 +0000 (12:02 +0200)]
Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'

* commit 'be3271009ef893fbed9640e8edbd771685fd957b':
  jpeg2000: Define the maximum decomposition levels

Conflicts:
libavcodec/jpeg2000.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
Michael Niedermayer [Wed, 3 Jul 2013 09:55:45 +0000 (11:55 +0200)]
Merge commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'

* commit 'fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
  jpeg2000: Check code-block size

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/muxing: make more compact audio/video_time computation
Stefano Sabatini [Tue, 25 Jun 2013 22:06:53 +0000 (00:06 +0200)]
examples/muxing: make more compact audio/video_time computation

6 years agodoc/muxers: Add AIFF doc
Timothy Gu [Wed, 3 Jul 2013 02:32:27 +0000 (19:32 -0700)]
doc/muxers: Add AIFF doc

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc: add script to compute texi files dependencies
Stefano Sabatini [Tue, 28 May 2013 19:52:33 +0000 (21:52 +0200)]
doc: add script to compute texi files dependencies

Replace the inline awk script with a Perl script which tracks the
dependencies recursively.

This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).

This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.

6 years agoMerge commit '5650e331a733711b809bc27f968500f0f5530126'
Michael Niedermayer [Wed, 3 Jul 2013 09:20:39 +0000 (11:20 +0200)]
Merge commit '5650e331a733711b809bc27f968500f0f5530126'

* commit '5650e331a733711b809bc27f968500f0f5530126':
  jpeg2000: Validate resolution levels

Conflicts:
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/avcodec.h: fix prolems -> problems typo
Stefano Sabatini [Tue, 2 Jul 2013 09:21:44 +0000 (11:21 +0200)]
lavc/avcodec.h: fix prolems -> problems typo

6 years agoMAINTAINERS: add address to contact "AvxSynth Team"
Michael Niedermayer [Wed, 3 Jul 2013 00:26:13 +0000 (02:26 +0200)]
MAINTAINERS: add address to contact "AvxSynth Team"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskaenc: Allow VP9 and Opus in webm
Tudor Suciu [Sun, 2 Jun 2013 15:49:24 +0000 (17:49 +0200)]
avformat/matroskaenc: Allow VP9 and Opus in webm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: Use the matching coding style struct for transform selection
Michael Niedermayer [Mon, 1 Jul 2013 08:01:39 +0000 (10:01 +0200)]
jpeg2000: Use the matching coding style struct for transform selection

Fixes a null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Optimize output sample conversion
Michael Niedermayer [Mon, 1 Jul 2013 08:01:37 +0000 (10:01 +0200)]
jpeg2000: Optimize output sample conversion

67935 -> 29984 kcycles

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Merge rescaling with interleaving in 9/7 IDWT
Michael Niedermayer [Mon, 1 Jul 2013 08:01:38 +0000 (10:01 +0200)]
jpeg2000: Merge rescaling with interleaving in 9/7 IDWT

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Reset s->numX/Ytiles on tile deallocation
Michael Niedermayer [Mon, 1 Jul 2013 08:01:36 +0000 (10:01 +0200)]
jpeg2000: Reset s->numX/Ytiles on tile deallocation

Keep the structure fields more consistent after cleanup.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Simplify jpeg2000_decode_packets()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:31 +0000 (10:01 +0200)]
jpeg2000: Simplify jpeg2000_decode_packets()

Raise PATCHWELCOME error in case of non-implemented progression order.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Proper cleanup on failure in decode_frame()
Luca Barbato [Mon, 1 Jul 2013 08:01:28 +0000 (10:01 +0200)]
jpeg2000: Proper cleanup on failure in decode_frame()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Optimize dequantization
Michael Niedermayer [Mon, 1 Jul 2013 08:01:35 +0000 (10:01 +0200)]
jpeg2000: Optimize dequantization

Float:   4700 -> 2700 cycles
Integer: 4400 -> 2800 cycles

(sandybridge  i7)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Do not crash on NULL node in tag_tree_decode
Michael Niedermayer [Mon, 1 Jul 2013 08:01:30 +0000 (10:01 +0200)]
jpeg2000: Do not crash on NULL node in tag_tree_decode

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Do not assume a single tile
Michael Niedermayer [Mon, 1 Jul 2013 08:01:34 +0000 (10:01 +0200)]
jpeg2000: Do not assume a single tile

In preparation of supporting multiple tiles.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Refactor SOT marker parsing
Michael Niedermayer [Mon, 1 Jul 2013 08:01:29 +0000 (10:01 +0200)]
jpeg2000: Refactor SOT marker parsing

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Speed up jpeg2000_decode_tile()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:33 +0000 (10:01 +0200)]
jpeg2000: Speed up jpeg2000_decode_tile()

Skip processing bands with dimension set to 0.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:32 +0000 (10:01 +0200)]
jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()

Speed it up a bit.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Use the correct sizeof in memset for T1 data
Michael Niedermayer [Mon, 1 Jul 2013 08:01:27 +0000 (10:01 +0200)]
jpeg2000: Use the correct sizeof in memset for T1 data

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Compute corrections of sub-band coordinates
Michael Niedermayer [Mon, 1 Jul 2013 08:01:24 +0000 (10:01 +0200)]
jpeg2000: Compute corrections of sub-band coordinates

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Use separate fields for int and float codepaths
Michael Niedermayer [Mon, 1 Jul 2013 08:01:22 +0000 (10:01 +0200)]
jpeg2000: Use separate fields for int and float codepaths

Split stepsize and data into int and float variants.
Eliminates a number of casts and simplifies spotting errors.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Improve reduced resolution decoding
Michael Niedermayer [Mon, 1 Jul 2013 08:01:20 +0000 (10:01 +0200)]
jpeg2000: Improve reduced resolution decoding

Correctly scale down the component coordinates and
clean up some redundant code.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Simplify init_tile()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:26 +0000 (10:01 +0200)]
jpeg2000: Simplify init_tile()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Remove unneeded variable initialization
Michael Niedermayer [Mon, 1 Jul 2013 08:01:23 +0000 (10:01 +0200)]
jpeg2000: Remove unneeded variable initialization

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Split int/float codepaths depending on the DWT
Michael Niedermayer [Mon, 1 Jul 2013 08:01:21 +0000 (10:01 +0200)]
jpeg2000: Split int/float codepaths depending on the DWT

DWT53 is always int, DWT97 is always float.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Update pixel format support
Michael Niedermayer [Mon, 1 Jul 2013 08:01:25 +0000 (10:01 +0200)]
jpeg2000: Update pixel format support

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Fix compute precedence error in lut_gain index
Michael Niedermayer [Mon, 1 Jul 2013 08:01:17 +0000 (10:01 +0200)]
jpeg2000: Fix compute precedence error in lut_gain index

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check that there is a SOT before SOD
Michael Niedermayer [Mon, 1 Jul 2013 08:01:14 +0000 (10:01 +0200)]
jpeg2000: Check that there is a SOT before SOD

Avoid overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Propagate error code from get_cox()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:12 +0000 (10:01 +0200)]
jpeg2000: Propagate error code from get_cox()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Compute quantization for 'scalar derived' in the correct case.
Michael Niedermayer [Mon, 1 Jul 2013 08:01:19 +0000 (10:01 +0200)]
jpeg2000: Compute quantization for 'scalar derived' in the correct case.

Scalar derived case is represented by the JPEG2K_QSTY_SI define.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Initialize code blocks structures in precincts to 0
Michael Niedermayer [Mon, 1 Jul 2013 08:01:16 +0000 (10:01 +0200)]
jpeg2000: Initialize code blocks structures in precincts to 0

Prevent use of uninitialized memory / valgrind failure.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Remove unneeded returns
Michael Niedermayer [Mon, 1 Jul 2013 08:01:13 +0000 (10:01 +0200)]
jpeg2000: Remove unneeded returns

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check that nreslevels2decode has been initialized before use
Michael Niedermayer [Mon, 1 Jul 2013 08:01:11 +0000 (10:01 +0200)]
jpeg2000: Check that nreslevels2decode has been initialized before use

Avoid buffer overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:18 +0000 (10:01 +0200)]
jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check that we have enough components for MCT
Michael Niedermayer [Mon, 1 Jul 2013 08:01:15 +0000 (10:01 +0200)]
jpeg2000: Check that we have enough components for MCT

Avoid overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Drop unused and writeonly fields
Michael Niedermayer [Mon, 1 Jul 2013 08:01:10 +0000 (10:01 +0200)]
jpeg2000: Drop unused and writeonly fields

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: check len before parsing header
Michael Niedermayer [Mon, 1 Jul 2013 08:01:08 +0000 (10:01 +0200)]
jpeg2000: check len before parsing header

Avoid overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check zero bit-plane validity
Michael Niedermayer [Mon, 1 Jul 2013 08:01:06 +0000 (10:01 +0200)]
jpeg2000: Check zero bit-plane validity

Prevent integer overflows.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate block lengthinc
Luca Barbato [Mon, 1 Jul 2013 08:01:05 +0000 (10:01 +0200)]
jpeg2000: Validate block lengthinc

Currently we are using an array with a static data size.

Similar to a patch with the same purpose by Michael Niedermayer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate SIZ parsing
Michael Niedermayer [Mon, 1 Jul 2013 08:01:04 +0000 (10:01 +0200)]
jpeg2000: Validate SIZ parsing

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate SOT parsing
Michael Niedermayer [Mon, 1 Jul 2013 08:01:03 +0000 (10:01 +0200)]
jpeg2000: Validate SOT parsing

Avoid some overreads.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Correctly calculate sgnd
Michael Niedermayer [Mon, 1 Jul 2013 08:01:09 +0000 (10:01 +0200)]
jpeg2000: Correctly calculate sgnd

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check component number in get_coc() and get_qcc()
Michael Niedermayer [Mon, 1 Jul 2013 08:01:07 +0000 (10:01 +0200)]
jpeg2000: Check component number in get_coc() and get_qcc()

Avoid overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Use bytestream2
Michael Niedermayer [Mon, 1 Jul 2013 08:01:02 +0000 (10:01 +0200)]
jpeg2000: Use bytestream2

Prevent a number of overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Clean up return paths and error messages
Luca Barbato [Mon, 1 Jul 2013 08:01:01 +0000 (10:01 +0200)]
jpeg2000: Clean up return paths and error messages

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Define the maximum decomposition levels
Luca Barbato [Mon, 1 Jul 2013 08:01:00 +0000 (10:01 +0200)]
jpeg2000: Define the maximum decomposition levels

And define the resolution levels according.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Check code-block size
Michael Niedermayer [Mon, 1 Jul 2013 08:00:59 +0000 (10:00 +0200)]
jpeg2000: Check code-block size

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojpeg2000: Validate resolution levels
Luca Barbato [Mon, 1 Jul 2013 08:00:58 +0000 (10:00 +0200)]
jpeg2000: Validate resolution levels

There are 32 maximum decomposition levels, thus 33 resolution levels.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavf: add support for libgme
wm4 [Fri, 28 Jun 2013 08:36:00 +0000 (10:36 +0200)]
lavf: add support for libgme

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd a maintainer for the delogo filter
Jean Delvare [Tue, 2 Jul 2013 11:55:34 +0000 (13:55 +0200)]
Add a maintainer for the delogo filter

I volunteer to maintain the delogo filter for at least the year to
come.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: clarify the expected format in the document header
Jean Delvare [Tue, 2 Jul 2013 11:55:34 +0000 (13:55 +0200)]
MAINTAINERS: clarify the expected format in the document header

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat_find_stream_info: move ret init down from flush codecs.
Michael Niedermayer [Tue, 2 Jul 2013 13:06:43 +0000 (15:06 +0200)]
avformat_find_stream_info: move ret init down from flush codecs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat_find_stream_info: Do not consider no streams an error in flush codecs
Michael Niedermayer [Tue, 2 Jul 2013 13:04:13 +0000 (15:04 +0200)]
avformat_find_stream_info: Do not consider no streams an error in flush codecs

This should have no functional effect, but allows a cleaner diff when moving it
down

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat_find_stream_info: try to preserve the error code
Michael Niedermayer [Tue, 2 Jul 2013 13:02:55 +0000 (15:02 +0200)]
avformat_find_stream_info: try to preserve the error code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoav_find_stream_info: initialize ret
Michael Niedermayer [Tue, 2 Jul 2013 13:00:28 +0000 (15:00 +0200)]
av_find_stream_info: initialize ret

This should fix hypothetical corner cases where it might have never been initialized before use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: Print "Consider increasing the value for analzeduration and probesize"...
Carl Eugen Hoyos [Thu, 20 Jun 2013 07:34:15 +0000 (09:34 +0200)]
avformat: Print "Consider increasing the value for analzeduration and probesize" even more often

The sample from ticket #2691 currently does not trigger "Consider increasing
the value for analzeduration and probesize" because the audio streams are
only added after calling estimate_timings(). Attached patch moves the message
below this function call.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/x86: reenable ff_update_lls_avx()
Michael Niedermayer [Tue, 2 Jul 2013 09:58:08 +0000 (11:58 +0200)]
avutil/x86: reenable ff_update_lls_avx()

The bug has been fixed in c8b920a9b7fa534a6141695ace4e8c2dfcd56cee by Loren Merritt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 2 Jul 2013 09:50:30 +0000 (11:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggdec: do not fall back on binary search in the generic code.

Conflicts:
libavformat/oggdec.c
tests/ref/seek/lavf-ogg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c8b920a9b7fa534a6141695ace4e8c2dfcd56cee'
Michael Niedermayer [Tue, 2 Jul 2013 09:40:38 +0000 (11:40 +0200)]
Merge commit 'c8b920a9b7fa534a6141695ace4e8c2dfcd56cee'

* commit 'c8b920a9b7fa534a6141695ace4e8c2dfcd56cee':
  lls/x86: use 3-operator vaddpd in ADDPD_MEM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8bd9039900e67a633cc838d691c449e71c060553'
Michael Niedermayer [Tue, 2 Jul 2013 09:26:49 +0000 (11:26 +0200)]
Merge commit '8bd9039900e67a633cc838d691c449e71c060553'

* commit '8bd9039900e67a633cc838d691c449e71c060553':
  Revert "indeo5: reject negative motion vectors"

See: cc53c28fdc2bd060e90a82d4238ad26e619a9fca
Merged-by: Michael Niedermayer <michaelni@gmx.at>