ffmpeg.git
11 months agolavf/avio: Print the https warning also for missing tls protocol.
Carl Eugen Hoyos [Sat, 21 Oct 2017 23:11:55 +0000 (01:11 +0200)]
lavf/avio: Print the https warning also for missing tls protocol.

11 months agoavcodec/tak: make buf const in avpriv_dca_parse_core_frame_header()
James Almer [Sun, 22 Oct 2017 23:51:31 +0000 (20:51 -0300)]
avcodec/tak: make buf const in avpriv_dca_parse_core_frame_header()

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoavutil/tests/hmac: remove superfluous loop
James Almer [Sun, 22 Oct 2017 23:25:38 +0000 (20:25 -0300)]
avutil/tests/hmac: remove superfluous loop

The gap in enum values has been removed.

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoavutil/hmac: remove gap in AVHMACType enum values
James Almer [Sun, 22 Oct 2017 22:47:05 +0000 (19:47 -0300)]
avutil/hmac: remove gap in AVHMACType enum values

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agolavc/bitstream_filter: Make a cast explicit.
Carl Eugen Hoyos [Wed, 1 Mar 2017 22:35:14 +0000 (23:35 +0100)]
lavc/bitstream_filter: Make a cast explicit.

Fixes the following gcc warning:
libavcodec/bitstream_filter.c:133:14: warning: assignment discards ‘const’ qualifier from pointer target type

11 months agoavcodec/libavcodec.v: remove obsolete exports
James Almer [Sun, 22 Oct 2017 13:12:52 +0000 (10:12 -0300)]
avcodec/libavcodec.v: remove obsolete exports

Forgotten cruft that should have been removed in
8f483108b503fa03ed5e956e25df4cb899171df5.

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoavformat: remove dead av_stream_get_side_data() cruft
James Almer [Sun, 22 Oct 2017 04:36:28 +0000 (01:36 -0300)]
avformat: remove dead av_stream_get_side_data() cruft

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoavformat: remove ABI portion of the side data merging API
James Almer [Sun, 22 Oct 2017 04:29:41 +0000 (01:29 -0300)]
avformat: remove ABI portion of the side data merging API

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoavutil/crc: remove gap in AVCRCId enum values
James Almer [Sun, 22 Oct 2017 03:44:55 +0000 (00:44 -0300)]
avutil/crc: remove gap in AVCRCId enum values

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agopostproc: Drop deprecated qp typedef
James Almer [Sun, 22 Oct 2017 03:35:23 +0000 (00:35 -0300)]
postproc: Drop deprecated qp typedef

Deprecated in 08/2015.

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoavcodec: remove ABI portion of the side data merging API
James Almer [Sun, 22 Oct 2017 03:30:12 +0000 (00:30 -0300)]
avcodec: remove ABI portion of the side data merging API

The actual API is left in place until the deprecation period ends.

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'
James Almer [Sun, 22 Oct 2017 02:59:53 +0000 (23:59 -0300)]
Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'

* commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81':
  lavc: Drop deprecated way of setting codec dimensions

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '1146bb3babca3973e88005d267cd06210d6ac075'
James Almer [Sun, 22 Oct 2017 02:56:51 +0000 (23:56 -0300)]
Merge commit '1146bb3babca3973e88005d267cd06210d6ac075'

* commit '1146bb3babca3973e88005d267cd06210d6ac075':
  lavc: Drop deprecated voxware codec entry

Merged-by: James Almer <jamrial@gmail.com>
11 months agoavcodec: Drop deprecated VIMA codecid
James Almer [Sun, 22 Oct 2017 02:55:23 +0000 (23:55 -0300)]
avcodec: Drop deprecated VIMA codecid

Deprecated in 02/2015.

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '5c1585c4c3b5281835d784c5daef0069915ccd57'
James Almer [Sun, 22 Oct 2017 02:48:29 +0000 (23:48 -0300)]
Merge commit '5c1585c4c3b5281835d784c5daef0069915ccd57'

* commit '5c1585c4c3b5281835d784c5daef0069915ccd57':
  lavc: Drop deprecated VDPAU buffer fields

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '7b917041184874e7d7cba4450813de7e0bb28a33'
James Almer [Sun, 22 Oct 2017 02:40:03 +0000 (23:40 -0300)]
Merge commit '7b917041184874e7d7cba4450813de7e0bb28a33'

* commit '7b917041184874e7d7cba4450813de7e0bb28a33':
  lavc: Drop deprecated VDPAU codec capability

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020'
James Almer [Sun, 22 Oct 2017 02:26:55 +0000 (23:26 -0300)]
Merge commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020'

* commit 'b748c280e59cac468ed36cbbe5e71d5ebd434020':
  lavc: Drop deprecated lowres option

This commit is a noop. The deprecation was postponed.

Merged-by: James Almer <jamrial@gmail.com>
11 months agoavcodec: Drop deprecated audio convert API
James Almer [Sun, 22 Oct 2017 02:16:13 +0000 (23:16 -0300)]
avcodec: Drop deprecated audio convert API

Deprecated in 10/2013.

11 months agoavcodec: Drop deprecated audio resample API
James Almer [Sun, 22 Oct 2017 02:13:44 +0000 (23:13 -0300)]
avcodec: Drop deprecated audio resample API

Deprecated in 03/2013.

11 months agoMerge commit '0337adfab5d14a17bf4d5060aa0425e4049a9862'
James Almer [Sun, 22 Oct 2017 01:53:41 +0000 (22:53 -0300)]
Merge commit '0337adfab5d14a17bf4d5060aa0425e4049a9862'

* commit '0337adfab5d14a17bf4d5060aa0425e4049a9862':
  lavc: Drop deprecated missing sample log function

Merged-by: James Almer <jamrial@gmail.com>
11 months agoRevert efb79cabb2 and 75bd215727
James Almer [Sat, 21 Oct 2017 20:55:08 +0000 (17:55 -0300)]
Revert efb79cabb2 and 75bd215727

ffserver usage of rc_eq was fixed.

Signed-off-by: James Almer <jamrial@gmail.com>
11 months agoavformat: Drop deprecated feof() AVIO fuction
James Almer [Sun, 22 Oct 2017 01:08:08 +0000 (22:08 -0300)]
avformat: Drop deprecated feof() AVIO fuction

Deprecated in 08/2014.

11 months agoavcodec/libxavs: make dia the default for motion-est
James Almer [Sat, 21 Oct 2017 21:37:38 +0000 (18:37 -0300)]
avcodec/libxavs: make dia the default for motion-est

This will make the default behavior the same as it was with me_method.

11 months agoavcodec/libxvid: make 4 the default for me_quality
James Almer [Sat, 21 Oct 2017 21:34:02 +0000 (18:34 -0300)]
avcodec/libxvid: make 4 the default for me_quality

This will make the default behavior the same as it was with me_method.

11 months agomovtextdec: Move declaration out of for initialisation statement
Mark Thompson [Tue, 17 Oct 2017 20:28:25 +0000 (21:28 +0100)]
movtextdec: Move declaration out of for initialisation statement

11 months agocinepakenc: Move declaration out of for initialisation statement
Mark Thompson [Wed, 27 Sep 2017 00:48:37 +0000 (01:48 +0100)]
cinepakenc: Move declaration out of for initialisation statement

(cherry picked from commit 92f0aceb36c6e4412d4cf346e70dc74b5a4069e9)

11 months agohevc: Fix aligned array declarations
Mark Thompson [Wed, 27 Sep 2017 00:44:21 +0000 (01:44 +0100)]
hevc: Fix aligned array declarations

(cherry picked from commit d41e10c1485ec34aa342f7bc2e5bf4f9b6e66414)

11 months agoavcodec/v4l2_m2m_enc: fix usage of deprecated codec flag
James Almer [Sat, 21 Oct 2017 21:19:02 +0000 (18:19 -0300)]
avcodec/v4l2_m2m_enc: fix usage of deprecated codec flag

11 months agoffserver: remove usage of deprecated rc_eq option
James Almer [Sat, 21 Oct 2017 20:48:01 +0000 (17:48 -0300)]
ffserver: remove usage of deprecated rc_eq option

The private codec option will be used instead when available.

11 months agolibavcodec/version: add a comment about FF_API_MPV_OPT deprecation
Rostislav Pehlivanov [Sat, 21 Oct 2017 20:02:35 +0000 (21:02 +0100)]
libavcodec/version: add a comment about FF_API_MPV_OPT deprecation

In order to prevent it from being forgotten and delayed until the next bump.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
11 months agoavcodec/version: re-enable FF_API_MPV_OPT until the open ABI period is over
James Almer [Sat, 21 Oct 2017 19:26:07 +0000 (16:26 -0300)]
avcodec/version: re-enable FF_API_MPV_OPT until the open ABI period is over

ffserver depends on it, so keep it in place until the two can be
removed together.

11 months agoMerge commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6'
James Almer [Sat, 21 Oct 2017 18:59:31 +0000 (15:59 -0300)]
Merge commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6'

* commit 'bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6':
  lavc: Drop deprecated chroma subsample function

This commit is a noop, see 2c800eb7375c65ffd56164b03bb035bdb3f1e172

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'
James Almer [Sat, 21 Oct 2017 18:54:22 +0000 (15:54 -0300)]
Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'

* commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88':
  lavf: Drop deprecated hint to set muxer timebase

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'
James Almer [Sat, 21 Oct 2017 18:51:11 +0000 (15:51 -0300)]
Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'

* commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a':
  lavf: Drop deprecated AVFract type and related field

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'
James Almer [Sat, 21 Oct 2017 18:48:25 +0000 (15:48 -0300)]
Merge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'

* commit '5e71299758d3aa7c93c3cca618a8e048a9483794':
  lavf: Drop deprecated bitexact functionality

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '96a47364d1cf346a5d0437e054b1b10d44d8d969'
James Almer [Sat, 21 Oct 2017 18:40:14 +0000 (15:40 -0300)]
Merge commit '96a47364d1cf346a5d0437e054b1b10d44d8d969'

* commit '96a47364d1cf346a5d0437e054b1b10d44d8d969':
  lavfi: Drop deprecated non-const filter retrieval

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'
James Almer [Sat, 21 Oct 2017 18:37:34 +0000 (15:37 -0300)]
Merge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'

* commit '8e18328b18e69b38a5feae5d10ad01b403a205b6':
  lavfi: Drop deprecated filter registration

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '52067b3c0e5ddbcf7021a093420798420351a9e2'
James Almer [Sat, 21 Oct 2017 18:35:14 +0000 (15:35 -0300)]
Merge commit '52067b3c0e5ddbcf7021a093420798420351a9e2'

* commit '52067b3c0e5ddbcf7021a093420798420351a9e2':
  lavfi: Drop deprecated filter initialization

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9'
James Almer [Sat, 21 Oct 2017 18:28:35 +0000 (15:28 -0300)]
Merge commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9'

* commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9':
  lavfi: Drop deprecated functions to open a filter or a filterchain

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'
James Almer [Sat, 21 Oct 2017 18:27:03 +0000 (15:27 -0300)]
Merge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'

* commit '88fd836a015a5f3380df74592e440e7d1e5b8000':
  lavfi: Drop deprecated way of passing options for a few filters

Merged-by: James Almer <jamrial@gmail.com>
11 months agolavfi/graphparser: Constify a variable.
Carl Eugen Hoyos [Sat, 21 Oct 2017 18:24:49 +0000 (20:24 +0200)]
lavfi/graphparser: Constify a variable.

Fixes the following warning:
libavfilter/graphparser.c:122:10: warning: assignment discards 'const' qualifier from pointer target type

11 months agolavd/lavfi: Constify two variables.
Carl Eugen Hoyos [Sat, 21 Oct 2017 18:22:52 +0000 (20:22 +0200)]
lavd/lavfi: Constify two variables.

Fixes the following warnings:
libavdevice/lavfi.c:136:16: warning: assignment discards 'const' qualifier from pointer target type
libavdevice/lavfi.c:137:17: warning: assignment discards 'const' qualifier from pointer target type

11 months agoMerge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5'
James Almer [Sat, 21 Oct 2017 17:57:53 +0000 (14:57 -0300)]
Merge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5'

* commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5':
  Bump major versions of all libraries

A few API deprecated ~2 years ago or more are also postponed here for
varying reasons.

FF_API_LOWRES:
Since this functionality depends on AVStream->codec, i figure the two can
be removed at the same time in the next bump or so.

FF_API_AVCTX_TIMEBASE:
Couldn't get this one to work. Not just libavcodec but apparently also
libavformat and ffmpeg.c expect AVCodecContext->time_base to be set for
decoding. Upon removal some tests report a different generic stream time
base (like 1/25), and others lose packet duration values. I guess it's
somehow tied to the AVStream->codec clusterfuck.
It can be dealt with alongside FF_API_LAVF_AVCTX in the next bump.

FF_API_OLD_FILTER_OPTS_ERROR:
This one is meant to remain after FF_API_OLD_FILTER_OPTS is removed.
Its purpose is displaying the corrected command line using the new syntax
as a suggestion as part of the error message.

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008'
James Almer [Sat, 21 Oct 2017 17:34:24 +0000 (14:34 -0300)]
Merge commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008'

* commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008':
  flvdec: Set avg_frame_rate for video streams

This commit is a noop, see e0791c5aaf1c12601322e410119ca46c6d09981d

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '8e2346154e6d58b733fd20326ce706f82fd91b3e'
James Almer [Sat, 21 Oct 2017 17:25:55 +0000 (14:25 -0300)]
Merge commit '8e2346154e6d58b733fd20326ce706f82fd91b3e'

* commit '8e2346154e6d58b733fd20326ce706f82fd91b3e':
  libavutil: Hook up the rest of the gcc specific attributes to clang as well

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '3aa9c523e9cf4f4a5e239ac737281e096c884907'
James Almer [Sat, 21 Oct 2017 17:21:12 +0000 (14:21 -0300)]
Merge commit '3aa9c523e9cf4f4a5e239ac737281e096c884907'

* commit '3aa9c523e9cf4f4a5e239ac737281e096c884907':
  libavutil: Define the noreturn attribute for clang in MSVC mode as well

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'a46a4f722d2fac07c57990f0f548777622599f59'
James Almer [Sat, 21 Oct 2017 17:19:07 +0000 (14:19 -0300)]
Merge commit 'a46a4f722d2fac07c57990f0f548777622599f59'

* commit 'a46a4f722d2fac07c57990f0f548777622599f59':
  dca: Refactor dca_filter_channels() a little
  dca: Validate the channel map

This commit is a noop, we have a different DCA decoder.

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '3df77b58e35a30ed550f99936a308f6bd2f47a20'
James Almer [Sat, 21 Oct 2017 17:16:44 +0000 (14:16 -0300)]
Merge commit '3df77b58e35a30ed550f99936a308f6bd2f47a20'

* commit '3df77b58e35a30ed550f99936a308f6bd2f47a20':
  nvenc: Allow different const qps for I, P and B frames

This commit is a noop, see 2db5ab73d43a8c22616e686ab12f94223910c761

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'ca960161f087ca38267b88ce90592010c59584f1'
James Almer [Sat, 21 Oct 2017 17:14:26 +0000 (14:14 -0300)]
Merge commit 'ca960161f087ca38267b88ce90592010c59584f1'

* commit 'ca960161f087ca38267b88ce90592010c59584f1':
  rtsp: Move message parsing to a separate function

This commit is a noop, see 1e27837265702b63db65122e97178a0ca4d25e05

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'bd805964f40f7af83da64645ba83d1e8060a1214'
James Almer [Sat, 21 Oct 2017 17:10:39 +0000 (14:10 -0300)]
Merge commit 'bd805964f40f7af83da64645ba83d1e8060a1214'

* commit 'bd805964f40f7af83da64645ba83d1e8060a1214':
  configure: Do not treat JACK as a system library

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb'
James Almer [Sat, 21 Oct 2017 16:37:07 +0000 (13:37 -0300)]
Merge commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb'

* commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb':
  avconv: Document the -init_hw_device option
  avconv: Enable generic hwaccel support for VDPAU
  lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx API
  lavc: Add hwaccel_flags field to AVCodecContext
  avconv: Enable generic hwaccel support for VAAPI
  avconv: Generic device setup
  hwcontext: Make it easier to work with device types
  hwcontext: Add device derivation

This commit is a noop, see
b22172f6f3530b8bd9d1d2c38a31b1e9c3729e42
0b1794a43e1083644aa3db2a09323681cfe080ec
06043cc0bc72b530db352a67776392cf61a54104
be510733523016aae7dca74bba6aa3b223c1fed6
156bd8278f4098426cffaa68efb161907e5c1869
7e4ba776a2240d40124d5540ea6b2118fa2fe26a
e462ace84b92e54d2a5fa651d6469aefe0f1efbf
527a1e213167123d24d014bc0b956ef43d9d6542

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'b864230c49089b087eef56988a3d6a784f6f9827'
James Almer [Sat, 21 Oct 2017 16:31:13 +0000 (13:31 -0300)]
Merge commit 'b864230c49089b087eef56988a3d6a784f6f9827'

* commit 'b864230c49089b087eef56988a3d6a784f6f9827':
  rtmp: Move RTMP digest calculation to a separate file

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7'
James Almer [Sat, 21 Oct 2017 16:27:04 +0000 (13:27 -0300)]
Merge commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7'

* commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7':
  build: Add missing object dependency for extract_extradata bitstream filter

This commit is a noop, see f8e29a371622316c68db7017ab04dd447b0114ba

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '7995ebfad12002033c73feed422a1cfc62081e8f'
James Almer [Sat, 21 Oct 2017 16:24:39 +0000 (13:24 -0300)]
Merge commit '7995ebfad12002033c73feed422a1cfc62081e8f'

* commit '7995ebfad12002033c73feed422a1cfc62081e8f':
  arm/aarch64: vp9: Fix vertical alignment

This commit is a noop, see 21c89f3a26bb1331381b90e653277585447cfbb3

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574'
James Almer [Sat, 21 Oct 2017 15:56:33 +0000 (12:56 -0300)]
Merge commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574'

* commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574':
  matroskaenc: add support for Spherical Video elements

See 58eb0f57f6702d57b6f97ec5010657bb2c076eff. Merged for cosmetics
purposes.
Also includes changes from d32d59bc977b43031007bb2ab21e232f96d2ebcb

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5'
James Almer [Sat, 21 Oct 2017 15:50:49 +0000 (12:50 -0300)]
Merge commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5'

* commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5':
  configure: Replace -no_weak_symbols with -Werror=partial-availability

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '681a86aba6cb09b98ad716d986182060c7795d20'
James Almer [Sat, 21 Oct 2017 15:45:49 +0000 (12:45 -0300)]
Merge commit '681a86aba6cb09b98ad716d986182060c7795d20'

* commit '681a86aba6cb09b98ad716d986182060c7795d20':
  x86: fft: Port to cpuflags

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb'
James Almer [Sat, 21 Oct 2017 15:39:41 +0000 (12:39 -0300)]
Merge commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb'

* commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb':
  x86: h264: Simplify DEQUANT macro with cpuflags

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '307eb1a8ee363db1fcf869e427a8deb6d9538881'
James Almer [Sat, 21 Oct 2017 15:28:39 +0000 (12:28 -0300)]
Merge commit '307eb1a8ee363db1fcf869e427a8deb6d9538881'

* commit '307eb1a8ee363db1fcf869e427a8deb6d9538881':
  x86: vp8dsp: port FILTER_BILINEAR macro to cpuflags

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2'
James Almer [Sat, 21 Oct 2017 15:07:16 +0000 (12:07 -0300)]
Merge commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2'

* commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2':
  x86util: Port all macros to cpuflags

See d5f8a642f6eb1c6e305c41dabddd0fd36ffb3f77

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a'
James Almer [Sat, 21 Oct 2017 14:52:36 +0000 (11:52 -0300)]
Merge commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a'

* commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a':
  h264_cavlc: check the value of run_before

[10:00:09] <jamrial> michaelni: what do you think of libav commit
522d850e68?
[10:00:45] <jamrial> it applies, but i can't reproduce the invalid
reads with the sample from the ticket mentioned in it
[10:52:57] <michaelni> jamrial, if theres an issue it should be fixed
by enlarging the scantable (as its faster) or maybe you can even drop
the if/else and use vlcs that are never returning a out of range
value. Id say the FFMIN is wrong in all cases, it should be a error
return if a check is added not silently continuing
[11:22:11] <michaelni> jamrial, i think the mb_padding stuff we have
makes it unneeded but we can possibly improve it beyond what we have

This commit is a noop

Merged-by: James Almer <jamrial@gmail.com>
11 months agoavformat/mov: Set start_pad correctly in mov_fix_index()
Dale Curtis [Mon, 16 Oct 2017 21:17:35 +0000 (14:17 -0700)]
avformat/mov: Set start_pad correctly in mov_fix_index()

Sets the correct start padding value when an edit list is present.

A new fate test is added, fate-mov-440hz-10ms, to ensure this is
handled correctly.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Sasi Inguva <isasi-at-google.com@ffmpeg.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
11 months agolavc: drop support for OpenJPEG 1.3-2.0
Michael Bradshaw [Wed, 18 Oct 2017 18:34:06 +0000 (11:34 -0700)]
lavc: drop support for OpenJPEG 1.3-2.0

We now require 2.1+ with pkg-config.

Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
11 months agoMerge commit '83b2b34d06e74cc8775ba3d833f9782505e17539'
James Almer [Fri, 20 Oct 2017 22:04:53 +0000 (19:04 -0300)]
Merge commit '83b2b34d06e74cc8775ba3d833f9782505e17539'

* commit '83b2b34d06e74cc8775ba3d833f9782505e17539':
  h2645_parse: use the bytestream2 API for packet splitting

Merged-by: James Almer <jamrial@gmail.com>
11 months agoMerge commit 'b76f6a76c6312dc551d7c37c6ded36bea7973c74'
James Almer [Fri, 20 Oct 2017 22:02:09 +0000 (19:02 -0300)]
Merge commit 'b76f6a76c6312dc551d7c37c6ded36bea7973c74'

* commit 'b76f6a76c6312dc551d7c37c6ded36bea7973c74':
  h264dec: initialize field_started to 0 on each decode call

This commit is a noop

Merged-by: James Almer <jamrial@gmail.com>
11 months agolibavformat: not treat 0 as EOF
Daniel Kucera [Tue, 17 Oct 2017 08:29:30 +0000 (10:29 +0200)]
libavformat: not treat 0 as EOF

transfer_func variable passed to retry_transfer_wrapper
are h->prot->url_read and h->prot->url_write functions.
These need to return EOF or other error properly.
In case of returning >= 0, url_read/url_write is retried
until error is returned.

Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com>
12 months agoffmpeg: always init output stream before reaping filters
Marton Balint [Tue, 3 Oct 2017 22:43:30 +0000 (00:43 +0200)]
ffmpeg: always init output stream before reaping filters

Otherwise the frame size of the codec is not set in the buffersink.

Fixes ticket #6603 and the following simpler case:

ffmpeg -c aac -filter_complex "sine=d=0.1,asetnsamples=1025" out.aac

Signed-off-by: Marton Balint <cus@passwd.hu>
12 months agoavdevice/decklink_dec: 32 bit audio support
Dave Rice [Wed, 18 Oct 2017 19:21:46 +0000 (15:21 -0400)]
avdevice/decklink_dec: 32 bit audio support

Signed-off-by: Marton Balint <cus@passwd.hu>
12 months agovorbis: Reorder conditions to avoid possible overread
Mark Thompson [Tue, 17 Oct 2017 21:25:46 +0000 (22:25 +0100)]
vorbis: Reorder conditions to avoid possible overread

This can trigger a single-byte overread if the codebook has the maximum
number of entries.

Fixes #6743.

12 months agoopusenc: Fix double-declaration of variable
Mark Thompson [Tue, 17 Oct 2017 20:47:03 +0000 (21:47 +0100)]
opusenc: Fix double-declaration of variable

12 months agovaapi_h264: Do not use deprecated header type
Mark Thompson [Wed, 18 Oct 2017 18:46:53 +0000 (19:46 +0100)]
vaapi_h264: Do not use deprecated header type

SEI headers should be inserted as generic raw data (the old specific
type has been deprecated in libva2).

12 months agovaapi_h264: Add missing return value check
Mark Thompson [Wed, 18 Oct 2017 18:39:10 +0000 (19:39 +0100)]
vaapi_h264: Add missing return value check

Fixes CID 1419829.

12 months agocbs_h264: Fix memory leak in error case
Mark Thompson [Wed, 18 Oct 2017 18:37:30 +0000 (19:37 +0100)]
cbs_h264: Fix memory leak in error case

Fixes CID 1419834.

12 months agoh264_metadata: Fix clearing SEI payload in error case
Mark Thompson [Wed, 18 Oct 2017 18:34:53 +0000 (19:34 +0100)]
h264_metadata: Fix clearing SEI payload in error case

Fixes CID 14198321419835.

12 months agocbs_h264: Fix writing streams with auxiliary pictures
Mark Thompson [Sat, 23 Sep 2017 15:46:11 +0000 (16:46 +0100)]
cbs_h264: Fix writing streams with auxiliary pictures

Tested with the alphaconformanceG sample.

Fixes CID 1419836.

(cherry picked from commit 9ed18f302b09e444f5b1be01979cce62c4b2c04a)

12 months agoconfigure: add pkg-config check for alsa
Jan Ekström [Mon, 16 Oct 2017 19:28:00 +0000 (22:28 +0300)]
configure: add pkg-config check for alsa

Helps with use cases such as static linking, as the .pc file
does actually contain the necessary Libs.private entries for all
required dependencies.

12 months agoMerge commit '3a0d5e206d24d41d87a25ba16a79b2ea04c39d4c'
James Almer [Wed, 18 Oct 2017 14:16:55 +0000 (11:16 -0300)]
Merge commit '3a0d5e206d24d41d87a25ba16a79b2ea04c39d4c'

* commit '3a0d5e206d24d41d87a25ba16a79b2ea04c39d4c':
  arm/aarch64: vp9itxfm: Skip loading the min_eob pointer when it won't be used
  arm: vp9itxfm: Template the quarter/half idct32 function

This commit is a noop, see
b7a565fe71d16747209bd66955a54c9b54abc5dd
70317b25aa35c0907720e4d2b7686408588c07aa

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit 'b57a95d0147beae746db1c1223d100447f42dced'
James Almer [Wed, 18 Oct 2017 14:05:56 +0000 (11:05 -0300)]
Merge commit 'b57a95d0147beae746db1c1223d100447f42dced'

* commit 'b57a95d0147beae746db1c1223d100447f42dced':
  cfhd: Add FATE tests

Merged-by: James Almer <jamrial@gmail.com>
12 months agoavcodec/cfhd: support cropped height tag
James Almer [Wed, 18 Oct 2017 01:05:09 +0000 (22:05 -0300)]
avcodec/cfhd: support cropped height tag

Ported from libav. Authored by one of the following:

Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Vittorio Giovara <vittorio.giovara@gmail.com>

Reviewed-by: kierank
Signed-off-by: James Almer <jamrial@gmail.com>
12 months agodoc/filters: add note on flite thread safety and update URL
Gyan Doshi [Mon, 9 Oct 2017 05:36:10 +0000 (11:06 +0530)]
doc/filters: add note on flite thread safety and update URL

Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoMerge commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f'
James Almer [Tue, 17 Oct 2017 23:26:00 +0000 (20:26 -0300)]
Merge commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f'

* commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f':
  Add Cineform HD Decoder

See 3485332bf99602910fe8830b0230d02fc653135d.

Some cosmetics are merged. The refactoring is not merged at the
request of Kieran Kunhya.

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit 'f6790b5e1075133ee39be91105f1135db7afd259'
James Almer [Tue, 17 Oct 2017 22:11:10 +0000 (19:11 -0300)]
Merge commit 'f6790b5e1075133ee39be91105f1135db7afd259'

* commit 'f6790b5e1075133ee39be91105f1135db7afd259':
  add initial QP value options

This commit is a noop, see 5f44a4a0a97e802479e6ce689d719e5277267f22

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '8a60bba0aef77015111570058d5a72f0428dc748'
James Almer [Tue, 17 Oct 2017 21:49:36 +0000 (18:49 -0300)]
Merge commit '8a60bba0aef77015111570058d5a72f0428dc748'

* commit '8a60bba0aef77015111570058d5a72f0428dc748':
  avcodec: clarify some decoding/encoding API details

This commit is a noop, see f940492bb241d1cf27175f40e580c51c20d6ebc3

Merged-by: James Almer <jamrial@gmail.com>
12 months agolavf/cafenc: Only allow mono and stereo for Opus.
Carl Eugen Hoyos [Tue, 17 Oct 2017 21:00:07 +0000 (23:00 +0200)]
lavf/cafenc: Only allow mono and stereo for Opus.

Found-by: James Almer
12 months agoChangelog: Add metadata bitstream filters
Mark Thompson [Tue, 17 Oct 2017 20:15:23 +0000 (21:15 +0100)]
Changelog: Add metadata bitstream filters

This starts a new section - 3.4 has been released.

12 months agocbs: Add some read/write tests
Mark Thompson [Tue, 15 Aug 2017 17:14:32 +0000 (18:14 +0100)]
cbs: Add some read/write tests

Use the appropriate metadata filter for each codec - in the absence of any
options to modify the stream, the output bitstream should be identical to
the input (though the output file may differ in padding).

All tests use conformance bitstreams, the MPEG-2 streams are newly added
from the conformance test streams
<http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_13818-4_2004_Conformance_Testing/Video/>

(cherry picked from commit 3cae7f8b9baaf43789490b676d8f5825f2e1bc2c)
(cherry picked from commit fbd63170bcbc5cad8965edad7c357f6eb4132250)

12 months agovaapi_mpeg2: Convert to use coded bitstream infrastructure
Mark Thompson [Fri, 23 Jun 2017 23:29:32 +0000 (00:29 +0100)]
vaapi_mpeg2: Convert to use coded bitstream infrastructure

(cherry picked from commit 10eb496d9ae94df6f792b0e1d8750738eb3a0952)

12 months agovaapi_h265: Add support for AUD NAL units
Mark Thompson [Sun, 23 Jul 2017 22:22:54 +0000 (23:22 +0100)]
vaapi_h265: Add support for AUD NAL units

Matching the H.264 encoder.

(cherry picked from commit e3e8eab359238486dc233f7aa89b7bb3cb19ec38)

12 months agovaapi_h265: Convert to use coded bitstream infrastructure
Mark Thompson [Sun, 14 May 2017 20:36:24 +0000 (21:36 +0100)]
vaapi_h265: Convert to use coded bitstream infrastructure

Also improves the metadata and generally makes the configuration
a bit cleaner.

(cherry picked from commit ac12486714b48f9bd5d9167f90b77c936751d6ef)

12 months agovaapi_h264: Fix CPB/DPB delays
Mark Thompson [Sat, 9 Sep 2017 21:49:14 +0000 (22:49 +0100)]
vaapi_h264: Fix CPB/DPB delays

This should be ticks, not time_scale steps - it was wrong for all
framerates not a multiple of 1/2.

(cherry picked from commit 30645174e333c7db1946ab09be769db9be9d7481)

12 months agovaapi_h264: Add support for SEI recovery points
Mark Thompson [Sun, 7 May 2017 22:02:09 +0000 (23:02 +0100)]
vaapi_h264: Add support for SEI recovery points

Included by default with non-IDR intra frames.

(cherry picked from commit a49ee60d5fdbdae1706a44cfbb814abb9793815f)

12 months agovaapi_h264: Add support for AUD NAL units
Mark Thompson [Sun, 7 May 2017 21:58:56 +0000 (22:58 +0100)]
vaapi_h264: Add support for AUD NAL units

Adds a new private option to enable them (off by default).

(cherry picked from commit 820a4483af13cf6fd51f13638e57bcd1c3f629d4)

12 months agovaapi_h264: Convert to use coded bitstream infrastructure
Mark Thompson [Sun, 7 May 2017 14:01:42 +0000 (15:01 +0100)]
vaapi_h264: Convert to use coded bitstream infrastructure

(cherry picked from commit 7a4fac5e91789b73e07bd4ad20493cfde028df76)

12 months agolavc: Add mpeg2_metadata bitstream filter
Mark Thompson [Tue, 1 Aug 2017 14:35:14 +0000 (15:35 +0100)]
lavc: Add mpeg2_metadata bitstream filter

(cherry picked from commit b78c30d7ec26af67c00ce2002709a189f6a87a7e)

12 months agompeg12: Add a common function to find the best frame rate
Mark Thompson [Tue, 12 Sep 2017 21:11:56 +0000 (22:11 +0100)]
mpeg12: Add a common function to find the best frame rate

This will be used later in both the mpeg2_metadata filter and the
VAAPI MPEG-2 encoder.  Also adds a unit test.

(cherry picked from commit b5859e0b04bdbe12c97cb12ac10a45d51d2d73c9)

12 months agolavc: Add hevc_metadata bitstream filter
Mark Thompson [Sun, 23 Jul 2017 15:23:51 +0000 (16:23 +0100)]
lavc: Add hevc_metadata bitstream filter

This is able to modify some header metadata found in the VPS/SPS/VUI,
and can also add/remove AUDs.

(cherry picked from commit b31a9eae0233325c4b382c657f4b687d5d8b0812)

12 months agolavc: Add h264_redundant_pps bitstream filter
Mark Thompson [Thu, 4 May 2017 22:10:19 +0000 (23:10 +0100)]
lavc: Add h264_redundant_pps bitstream filter

This applies a specific fixup to some Blu-ray streams which contain
redundant PPSs modifying irrelevant parameters of the stream which
confuse other transformations which require correct extradata.

A new single global PPS is created, and all of the redundant PPSs
within the stream are removed.

(cherry picked from commit e6874bc3af2f09af39b5d91b9c5f9ded67459696)

12 months agolavc: Add h264_metadata bitstream filter
Mark Thompson [Thu, 4 May 2017 22:09:02 +0000 (23:09 +0100)]
lavc: Add h264_metadata bitstream filter

This is able to modify some header metadata found in the SPS/VUI,
and can also add/remove AUDs and insert user data in SEI NAL units.

(cherry picked from commit 9e93001b6135a23fe4e200196c08fb4fbffed6fc)
(cherry picked from commit c42b62d1f9641f10ffc23cad9abbe47d8a4a165b)

12 months agolavc: Add trace_headers bitstream filter
Mark Thompson [Thu, 4 May 2017 22:06:20 +0000 (23:06 +0100)]
lavc: Add trace_headers bitstream filter

Supports all streams that the coded bitstream infrastructure does
(currently H.264, H.265 and MPEG-2).

(cherry picked from commit f11d8a5e8b185340cc50fcbc8a1437b0fbe7e931)

12 months agolavc: Add coded bitstream read/write support for MPEG-2
Mark Thompson [Thu, 4 May 2017 22:03:03 +0000 (23:03 +0100)]
lavc: Add coded bitstream read/write support for MPEG-2

(cherry picked from commit 2bc9ba8d3c41f3a8e56484bd67b05040c7909a01)
(cherry picked from commit a41b69b5eb950c10d8ede472bcc4e88ce4246db9)