ffmpeg.git
6 years agoMerge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
Michael Niedermayer [Mon, 10 Feb 2014 12:09:13 +0000 (13:09 +0100)]
Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'

* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
  avplay: add support for seeking to chapter marks

Conflicts:
doc/ffplay.texi
ffplay.c

ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams
Marton Balint [Tue, 4 Feb 2014 22:59:47 +0000 (23:59 +0100)]
lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED wanted_streams

Previously these type of streams were not returned even if wanted stream was
set to a stream of such. Now they are only skipped if they are not wanted
streams.

Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'
Michael Niedermayer [Mon, 10 Feb 2014 11:53:31 +0000 (12:53 +0100)]
Merge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'

* commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0':
  hevc: update conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'
Michael Niedermayer [Mon, 10 Feb 2014 11:39:55 +0000 (12:39 +0100)]
Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f'

* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
  FATE: force FLAC in the lavf ogg test

Conflicts:
tests/lavf-regression.sh

See: 28caf13ac394df5424a25304bda4608441bd85ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '38893dc028e458eaf3f906833d4ee515689edb7e'
Michael Niedermayer [Mon, 10 Feb 2014 11:36:32 +0000 (12:36 +0100)]
Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e'

* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
  pcmdec: replace a reachable assert with an error check

Conflicts:
libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'
Michael Niedermayer [Mon, 10 Feb 2014 11:29:05 +0000 (12:29 +0100)]
Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'

* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
  doc/APIchanges: mark the place where 9 was branched

Conflicts:
doc/APIchanges

Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203'
Michael Niedermayer [Mon, 10 Feb 2014 11:17:35 +0000 (12:17 +0100)]
Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203'

* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavplay: add support for seeking to chapter marks
Anton Khirnov [Wed, 4 Sep 2013 18:30:28 +0000 (20:30 +0200)]
avplay: add support for seeking to chapter marks

6 years agohevc: update conformance streams
Guillaume Martres [Thu, 6 Feb 2014 22:37:06 +0000 (23:37 +0100)]
hevc: update conformance streams

New streams: LTRPSPS_A_Qualcomm_1, SLPPLP_A_VIDYO_1, VPSID_A_VIDYO_1
Updated streams: EXT_A_ericsson_4, NUT_A_ericsson_5, RPS_C_ericsson_5,
  RPS_D_ericsson_6

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoFATE: force FLAC in the lavf ogg test
Anton Khirnov [Mon, 10 Feb 2014 06:43:40 +0000 (07:43 +0100)]
FATE: force FLAC in the lavf ogg test

Since b0c2c09, vorbis would be used if libvorbis is compiled in.

6 years agopcmdec: replace a reachable assert with an error check
Anton Khirnov [Mon, 10 Feb 2014 06:41:21 +0000 (07:41 +0100)]
pcmdec: replace a reachable assert with an error check

Libavformat should not make any assumptions about values returned from
other libraries. This assert is easily reachable by using a non-raw
codec id.

6 years agodoc/APIchanges: mark the place where 9 was branched
Anton Khirnov [Thu, 6 Feb 2014 12:50:33 +0000 (13:50 +0100)]
doc/APIchanges: mark the place where 9 was branched

6 years agodoc/APIchanges: fill in missing hashes and dates
Anton Khirnov [Thu, 6 Feb 2014 12:48:26 +0000 (13:48 +0100)]
doc/APIchanges: fill in missing hashes and dates

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Feb 2014 02:54:21 +0000 (03:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: Conceal zero td

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'
Michael Niedermayer [Mon, 10 Feb 2014 02:42:06 +0000 (03:42 +0100)]
Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'

* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
  dnxhd: Support DNx444

Conflicts:
Changelog
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f'
Michael Niedermayer [Mon, 10 Feb 2014 01:21:05 +0000 (02:21 +0100)]
Merge commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f'

* commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f':
  vp8: fix PPC assembly to work if src_stride != dst_stride

See: 34b429d5ba7b823748e897f0295aa78aaa2ebb9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b37effdc52835e121a0e259e57273a19f9cd61a3'
Michael Niedermayer [Mon, 10 Feb 2014 00:07:52 +0000 (01:07 +0100)]
Merge commit 'b37effdc52835e121a0e259e57273a19f9cd61a3'

* commit 'b37effdc52835e121a0e259e57273a19f9cd61a3':
  mxfdec: free descriptor extradata in .read_close()

See: 9f92e590ba91faa1283b1a9a35dd7e43c5bd998b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19'
Michael Niedermayer [Sun, 9 Feb 2014 21:03:59 +0000 (22:03 +0100)]
Merge commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19'

* commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19':
  asvenc: free avctx->coded_frame on codec close

Not merged as we do not allocate coded_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'
Michael Niedermayer [Sun, 9 Feb 2014 19:57:32 +0000 (20:57 +0100)]
Merge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'

* commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e':
  arm: Remove a stray .fpu directive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8'
Michael Niedermayer [Sun, 9 Feb 2014 19:15:07 +0000 (20:15 +0100)]
Merge commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8'

* commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8':
  dnxhddec: return proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: fix lavf-ogg test
Michael Niedermayer [Sun, 9 Feb 2014 19:10:02 +0000 (20:10 +0100)]
fate: fix lavf-ogg test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'
Michael Niedermayer [Sun, 9 Feb 2014 19:03:56 +0000 (20:03 +0100)]
Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'

* commit 'b0c2c097e422b9e10a7d856582f8321d28af821e':
  lavf: default .ogg audio to libvorbis if we can

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941'
Michael Niedermayer [Sun, 9 Feb 2014 19:01:32 +0000 (20:01 +0100)]
Merge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941'

* commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941':
  g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Conflicts:
libavcodec/g2meet.c

See: cb2162adba4041951c987f9f365957e067b28a97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: Conceal zero td
Luca Barbato [Sat, 8 Feb 2014 05:10:27 +0000 (06:10 +0100)]
hevc: Conceal zero td

It was done only in check_mvset(), while mv_scale() is called also by
dist_scale().

Sample-Id: 00001579-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agodnxhd: Support DNx444
Kostya Shishkov [Mon, 27 Jan 2014 18:10:44 +0000 (18:10 +0000)]
dnxhd: Support DNx444

Bug-Id: 99
Bug-Id: videolan/9620
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoMerge commit '722554788b77c13748e83458f626a9ac38b70072'
Michael Niedermayer [Sun, 9 Feb 2014 18:39:11 +0000 (19:39 +0100)]
Merge commit '722554788b77c13748e83458f626a9ac38b70072'

* commit '722554788b77c13748e83458f626a9ac38b70072':
  Add raw HEVC muxer

Conflicts:
libavformat/version.h

See: ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp8: fix PPC assembly to work if src_stride != dst_stride
Ronald S. Bultje [Wed, 5 Feb 2014 07:59:45 +0000 (07:59 +0000)]
vp8: fix PPC assembly to work if src_stride != dst_stride

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agomxfdec: free descriptor extradata in .read_close()
Janne Grunau [Sat, 8 Feb 2014 11:52:32 +0000 (12:52 +0100)]
mxfdec: free descriptor extradata in .read_close()

Fixes memleak in fate-mxf-demux.

6 years agoasvenc: free avctx->coded_frame on codec close
Janne Grunau [Sat, 8 Feb 2014 11:26:13 +0000 (12:26 +0100)]
asvenc: free avctx->coded_frame on codec close

6 years agovp9: fix compilation with !HAVE_FAST_64BIT.
Clément Bœsch [Sun, 9 Feb 2014 17:44:07 +0000 (18:44 +0100)]
vp9: fix compilation with !HAVE_FAST_64BIT.

Spotted-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agoarm: Remove a stray .fpu directive
Martin Storsjö [Sat, 8 Feb 2014 23:34:44 +0000 (23:34 +0000)]
arm: Remove a stray .fpu directive

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agodnxhddec: return proper error code
Alexandra Khirnova [Sat, 8 Feb 2014 20:25:35 +0000 (20:25 +0000)]
dnxhddec: return proper error code

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agolavf: default .ogg audio to libvorbis if we can
Andrew Kelley [Sat, 8 Feb 2014 16:18:57 +0000 (16:18 +0000)]
lavf: default .ogg audio to libvorbis if we can

Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.

Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agovp9: invert order in l[] intra prediction array.
Ronald S. Bultje [Sun, 9 Feb 2014 00:32:18 +0000 (19:32 -0500)]
vp9: invert order in l[] intra prediction array.

The directional intra predictors either don't care about order (dc, h,
dc_left, tm), or they prefer inverted order (vr, dr, hd). This allows
more efficient SIMD implementations.

6 years agovp9: remove memset in loopfilter level setting loop.
Ronald S. Bultje [Sat, 8 Feb 2014 22:03:21 +0000 (17:03 -0500)]
vp9: remove memset in loopfilter level setting loop.

Use same function for segmentation map writing also.

6 years agovp9: coef decoding context-splat speedup.
Ronald S. Bultje [Sat, 25 Jan 2014 17:55:55 +0000 (12:55 -0500)]
vp9: coef decoding context-splat speedup.

6 years agovp9: decode_mode context optimizations.
Ronald S. Bultje [Sat, 25 Jan 2014 02:53:22 +0000 (21:53 -0500)]
vp9: decode_mode context optimizations.

6 years agovp9: more aligned zeroes.
Ronald S. Bultje [Thu, 23 Jan 2014 01:51:54 +0000 (20:51 -0500)]
vp9: more aligned zeroes.

6 years agovp9: faster skip-block coefficient blanking.
Ronald S. Bultje [Sat, 25 Jan 2014 02:54:15 +0000 (21:54 -0500)]
vp9: faster skip-block coefficient blanking.

6 years agovp9: coef context reading optimization.
Ronald S. Bultje [Wed, 22 Jan 2014 01:08:18 +0000 (20:08 -0500)]
vp9: coef context reading optimization.

6 years agovp9: just disallow temporal or no-update segmentation on size-change.
Ronald S. Bultje [Sun, 9 Feb 2014 01:47:44 +0000 (20:47 -0500)]
vp9: just disallow temporal or no-update segmentation on size-change.

The spec doesn't describe how it should be decoded so this is probably
the safest thing to do. Fixes valgrind errors on fuzzed11.ivf and fixes
valgrind errors on fuzzed10.ivf differently.

6 years agolavd: add decklink output device
Ramiro Polla [Sat, 8 Feb 2014 20:01:26 +0000 (18:01 -0200)]
lavd: add decklink output device

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format
mrlika [Mon, 3 Feb 2014 12:11:05 +0000 (14:11 +0200)]
avcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO
Maxim Poliakovski [Mon, 21 Oct 2013 22:17:22 +0000 (00:17 +0200)]
g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agoAdd raw HEVC muxer
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:25 +0000 (14:46 +0000)]
Add raw HEVC muxer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoAdd raw HEVC muxer
Derek Buitenhuis [Wed, 2 Oct 2013 14:46:25 +0000 (14:46 +0000)]
Add raw HEVC muxer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Feb 2014 01:36:46 +0000 (02:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
libavcodec/mlp_parser.c

See: bd35d58463f01f7781df052864ae16f5e228c1bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f'
Michael Niedermayer [Sun, 9 Feb 2014 00:29:53 +0000 (01:29 +0100)]
Merge commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f'

* commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f':
  mlpdec: fix request_channel_layout behavior.

See: 1a8050ad616c9682f44671c6febb6030a8e3b71e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: Validate bpp and bitmasks in the display info
Maxim Poliakovski [Sat, 8 Feb 2014 22:17:08 +0000 (23:17 +0100)]
g2meet: Validate bpp and bitmasks in the display info

That prevents processing of media files with
incompatible or unsupported settings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: factor out chunk seeking
Maxim Poliakovski [Sat, 8 Feb 2014 21:27:51 +0000 (22:27 +0100)]
g2meet: factor out chunk seeking

This version requires fewer code and is safer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO
Maxim Poliakovski [Mon, 21 Oct 2013 22:17:22 +0000 (00:17 +0200)]
g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: don't allow retaining old segmentation maps after a size change.
Ronald S. Bultje [Sat, 8 Feb 2014 20:48:19 +0000 (15:48 -0500)]
vp9: don't allow retaining old segmentation maps after a size change.

Fixes valgrind warnings on fuzzed10.ivf.

6 years agomlp_parser: fix request_channel_layout behavior.
Tim Walker [Sat, 8 Feb 2014 17:21:14 +0000 (17:21 +0000)]
mlp_parser: fix request_channel_layout behavior.

When request_channel_layout is 0,
all substreams should be decoded.

Thanks to Michael Niedermayer for spotting.

Also fix a mismatch between the parser and
decoder when request_channel_layout is a
subset of Stereo.

6 years agomlpdec: fix request_channel_layout behavior.
Michael Niedermayer [Sat, 8 Feb 2014 17:21:13 +0000 (17:21 +0000)]
mlpdec: fix request_channel_layout behavior.

When request_channel_layout is 0,
all substreams should be decoded.

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 8 Feb 2014 18:02:46 +0000 (19:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Mirillis FIC video decoder

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '76a75c523cd3c63560185394a0a5cd7249db962a'
Michael Niedermayer [Sat, 8 Feb 2014 17:20:16 +0000 (18:20 +0100)]
Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'

* commit '76a75c523cd3c63560185394a0a5cd7249db962a':
  lavr: mix front center channel as indicated in the ATSC A/52 specification.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: some variable re-arrangements for alignment.
Ronald S. Bultje [Sat, 25 Jan 2014 02:54:13 +0000 (21:54 -0500)]
vp9: some variable re-arrangements for alignment.

6 years agovp9: re-allocate block buffers on uses_2pass change w/o size change.
Ronald S. Bultje [Sat, 8 Feb 2014 13:24:13 +0000 (08:24 -0500)]
vp9: re-allocate block buffers on uses_2pass change w/o size change.

Fixes valgrind errors and crashes in fuzzed9.ivf.

6 years agoavcodec/mlp_parser: fix multichannel
Michael Niedermayer [Sat, 8 Feb 2014 17:13:34 +0000 (18:13 +0100)]
avcodec/mlp_parser: fix multichannel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mlpdec: fix mulichannel output
Michael Niedermayer [Sat, 8 Feb 2014 17:08:01 +0000 (18:08 +0100)]
avcodec/mlpdec: fix mulichannel output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'
Michael Niedermayer [Sat, 8 Feb 2014 16:31:01 +0000 (17:31 +0100)]
Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'

* commit 'c0c45188e56cfa3050bb39f8299025345b8a204c':
  mlp: improve request_channel_layout behavior.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae'
Michael Niedermayer [Sat, 8 Feb 2014 16:25:26 +0000 (17:25 +0100)]
Merge commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae'

* commit '5c1c6e82261b856214499b9fef3a08bf3ff6e0ae':
  dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6398d8fd813490fc3900baf8c788f803d8e17b73'
Michael Niedermayer [Sat, 8 Feb 2014 16:14:52 +0000 (17:14 +0100)]
Merge commit '6398d8fd813490fc3900baf8c788f803d8e17b73'

* commit '6398d8fd813490fc3900baf8c788f803d8e17b73':
  configure: clang: add -Qunused-arguments to as|ld_flags as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c'
Michael Niedermayer [Sat, 8 Feb 2014 16:08:12 +0000 (17:08 +0100)]
Merge commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c'

* commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c':
  h264: give numbers to nalus

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0cffd6fff59f192120dc93aa6c3cb8180f5506e3'
Michael Niedermayer [Sat, 8 Feb 2014 15:59:31 +0000 (16:59 +0100)]
Merge commit '0cffd6fff59f192120dc93aa6c3cb8180f5506e3'

* commit '0cffd6fff59f192120dc93aa6c3cb8180f5506e3':
  x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMirillis FIC video decoder
Kostya Shishkov [Fri, 7 Feb 2014 08:35:07 +0000 (09:35 +0100)]
Mirillis FIC video decoder

Does not contain cursor rendering yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolavr: mix front center channel as indicated in the ATSC A/52 specification.
Tim Walker [Wed, 15 Jan 2014 00:18:19 +0000 (00:18 +0000)]
lavr: mix front center channel as indicated in the ATSC A/52 specification.

When mixing 3 front channels into 2, the center channel is mixed into left and right with the center mix level, not -3dB.

6 years agomlp: improve request_channel_layout behavior.
Tim Walker [Thu, 6 Feb 2014 21:50:38 +0000 (21:50 +0000)]
mlp: improve request_channel_layout behavior.

Don't decode further substreams if request_channel_layout
is a subset of the current substream's channel_layout.

Before, we would only discard further substreams if
request_channel_layout matched the substream's
channel_layout extactly, thus decoding additional
channels which the caller would probably end up downmixing.

6 years agodca: include dcadsp.h in {arm,x86}/dca.h for checkheaders
Janne Grunau [Sat, 8 Feb 2014 12:29:51 +0000 (13:29 +0100)]
dca: include dcadsp.h in {arm,x86}/dca.h for checkheaders

6 years agoconfigure: clang: add -Qunused-arguments to as|ld_flags as well
Janne Grunau [Fri, 7 Feb 2014 18:23:28 +0000 (19:23 +0100)]
configure: clang: add -Qunused-arguments to as|ld_flags as well

6 years agoh264: give numbers to nalus
Vittorio Giovara [Thu, 6 Feb 2014 22:28:32 +0000 (22:28 +0000)]
h264: give numbers to nalus

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agovp9/parser: change size type to unsigned.
Ronald S. Bultje [Sat, 8 Feb 2014 11:50:43 +0000 (06:50 -0500)]
vp9/parser: change size type to unsigned.

Fixes valgrind errors in fuzzed8.ivf because size >= 0x80000000.

6 years agoavcodec/hevc: remove FFUMOD() in slice qp_y init
Michael Niedermayer [Sat, 8 Feb 2014 11:14:43 +0000 (12:14 +0100)]
avcodec/hevc: remove FFUMOD() in slice qp_y init

This has become redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: remove unused variables
Michael Niedermayer [Sat, 8 Feb 2014 11:06:35 +0000 (12:06 +0100)]
avcodec/hevc: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/sdl: reset context variables after destroy
Lukasz Marek [Thu, 6 Feb 2014 23:30:27 +0000 (00:30 +0100)]
lavd/sdl: reset context variables after destroy

SDL device reports double free or hangs when quiting.
Reseting variables solves the issue.

The issue is caused by double call of write_trailer callback.
It is called for the first time in write_packet when quit flag is set.
Second call comes from ffmpeg.c or may come from other client application.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/sdl: make waiting spurious wakeup aware
Lukasz Marek [Thu, 6 Feb 2014 23:31:29 +0000 (00:31 +0100)]
lavd/sdl: make waiting spurious wakeup aware

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale
Janne Grunau [Sat, 8 Feb 2014 10:48:19 +0000 (11:48 +0100)]
x86: use the inline int8x8_fmul_int32 only if inline SSE2 is availbale

Fixes compilation with MSVC. Also does not rely on on earlier config.h
include but include it directly.

6 years agoFix compilation with --disable-everything --enable-encoder=flac.
Carl Eugen Hoyos [Sat, 8 Feb 2014 11:06:49 +0000 (12:06 +0100)]
Fix compilation with --disable-everything --enable-encoder=flac.

6 years agovp9: fix mix-up of last-frame/cur-frame in frame size checks.
Ronald S. Bultje [Sat, 8 Feb 2014 01:14:38 +0000 (20:14 -0500)]
vp9: fix mix-up of last-frame/cur-frame in frame size checks.

Fixes invalid reads in fuzzed7.ivf.

6 years agox86/vp9lpf: simplify 2nd transpose in 44/48/88/84.
Clément Bœsch [Sat, 8 Feb 2014 10:09:30 +0000 (11:09 +0100)]
x86/vp9lpf: simplify 2nd transpose in 44/48/88/84.

For non-avx optims, this saves 8 movs.

before:
  1785 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524129 runs, 159 skips
  3327 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262116 runs, 28 skips
  2712 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193729 runs, 575 skips
  3237 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524061 runs, 227 skips

after:
  1768 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524062 runs, 226 skips
  3310 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262107 runs, 37 skips
  2719 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193954 runs, 350 skips
  3184 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524236 runs, 52 skips

6 years agoffserver: drop unneeded delay1 var
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 03:19:39 +0000 (00:19 -0300)]
ffserver: drop unneeded delay1 var

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: move misplaced comment
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 01:02:26 +0000 (22:02 -0300)]
ffserver: move misplaced comment

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: drop obvious comment
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 01:00:07 +0000 (22:00 -0300)]
ffserver: drop obvious comment

Following code line is self explanatory

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: cosmetics and grammar
Reynaldo H. Verdejo Pinochet [Fri, 7 Feb 2014 22:54:56 +0000 (19:54 -0300)]
ffserver: cosmetics and grammar

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agolavc/mpegvideo: add missing const
Lukasz Marek [Fri, 7 Feb 2014 15:43:10 +0000 (16:43 +0100)]
lavc/mpegvideo: add missing const

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/jpeg2000dec: silent warning discards qualifiers
Lukasz Marek [Fri, 7 Feb 2014 15:25:33 +0000 (16:25 +0100)]
lavc/jpeg2000dec: silent warning discards qualifiers

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 8 Feb 2014 01:16:47 +0000 (02:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadsp: split lfe_dir cases

Conflicts:
libavcodec/arm/dcadsp_init_arm.c

See: 45854df9a5220bdde400a447f63f61618b89dde2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadsp: split lfe_dir cases
Christophe Gisquet [Thu, 6 Feb 2014 00:41:54 +0000 (00:41 +0000)]
dcadsp: split lfe_dir cases

The x86 runs short on registers because numerous elements are not static.
In addition, splitting them allows more optimized code, at least for x86.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5b59a9fc6152169599561f04b4f66370edda5c9c'
Michael Niedermayer [Sat, 8 Feb 2014 00:11:50 +0000 (01:11 +0100)]
Merge commit '5b59a9fc6152169599561f04b4f66370edda5c9c'

* commit '5b59a9fc6152169599561f04b4f66370edda5c9c':
  x86: dcadsp: implement int8x8_fmul_int32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2bd44cb705340c4f7bd7e459a1efed5074bf45fc'
Michael Niedermayer [Fri, 7 Feb 2014 23:55:37 +0000 (00:55 +0100)]
Merge commit '2bd44cb705340c4f7bd7e459a1efed5074bf45fc'

* commit '2bd44cb705340c4f7bd7e459a1efed5074bf45fc':
  dcadsp: add int8x8_fmul_int32 to dsp context

See: 481a46a462ca762600ee4ad4c3b1e93d21b1fa35
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadsp: add int8x8_fmul_int32 to DSP context
Christophe Gisquet [Fri, 11 May 2012 09:17:36 +0000 (11:17 +0200)]
dcadsp: add int8x8_fmul_int32 to DSP context

It is currently declared as a macro who is set to inlinable functions,
among which a Neon and a default C implementations.

Add a DSP parameter to each inline function, unused except by the
default C implementation which calls a function from the DSP context.

On an Arrandale CPU, gain for an inlined SSE2 function vs. a call:
- Win32: 29 to 26 cycles
- Win64: 25 to 23 cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635'
Michael Niedermayer [Fri, 7 Feb 2014 23:49:11 +0000 (00:49 +0100)]
Merge commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635'

* commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635':
  arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5bcbb516f2ff45290ef7995b081762e668693672'
Michael Niedermayer [Fri, 7 Feb 2014 23:29:45 +0000 (00:29 +0100)]
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

* commit '5bcbb516f2ff45290ef7995b081762e668693672':
  arm: Add X() around all references to extern symbols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: Simplify get_qPy_pred()
Michael Niedermayer [Fri, 7 Feb 2014 22:28:22 +0000 (23:28 +0100)]
avcodec/hevc: Simplify get_qPy_pred()

Fixes use of uninitialized memory
Fixes: 93728afd9aa074ba14a09bfd93a632fd-asan_static-oob_124a17d_1445_cov_1021181966_DBLK_D_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: make check for previous slice segment tighter
Michael Niedermayer [Fri, 7 Feb 2014 15:31:11 +0000 (16:31 +0100)]
avcodec/hevc: make check for previous slice segment tighter

This ensures the previous one is matching the curent and not just any

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadsp: split lfe_dir cases
Christophe Gisquet [Wed, 5 Feb 2014 23:40:52 +0000 (23:40 +0000)]
dcadsp: split lfe_dir cases

The x86 runs short on registers because numerous elements are not static.
In addition, splitting them allows more optimized code, at least for x86.

Arm asm changes by Janne Grunau.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agox86: dcadsp: implement int8x8_fmul_int32
Christophe Gisquet [Fri, 11 May 2012 09:25:30 +0000 (11:25 +0200)]
x86: dcadsp: implement int8x8_fmul_int32

For the callable function (as opposed to the inline one):
         C  SSE  SSE2  SSE4
Win32:  47   42   29    26
Win64:  30   33   25    23
The SSE version is neither compiled nor set for ARCH_X86_64, as the
inlinable function takes over.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agodcadsp: add int8x8_fmul_int32 to dsp context
Christophe Gisquet [Fri, 11 May 2012 09:17:36 +0000 (11:17 +0200)]
dcadsp: add int8x8_fmul_int32 to dsp context

It is currently declared as a macro who is set to inlinable functions,
among which a Neon and a default C implementations.

Add a DSP parameter to each inline function, unused except by the
default C implementation which calls a function from the DSP context.

On an Arrandale CPU, gain for an inlined SSE2 function vs. a call:
- Win32: 29 to 26 cycles
- Win64: 25 to 23 cycles

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agolavc/adpcm_data: fix const misplacement
Lukasz Marek [Fri, 7 Feb 2014 15:42:17 +0000 (16:42 +0100)]
lavc/adpcm_data: fix const misplacement

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavc/evrcdec: fix const misplacement
Lukasz Marek [Fri, 7 Feb 2014 15:38:59 +0000 (16:38 +0100)]
lavc/evrcdec: fix const misplacement

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>