ffmpeg.git
5 years agoMerge commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9'
Clément Bœsch [Thu, 23 Mar 2017 10:40:09 +0000 (11:40 +0100)]
Merge commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9'

* commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9':
  fate: Add test for rscc palette

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266'
Clément Bœsch [Thu, 23 Mar 2017 10:33:27 +0000 (11:33 +0100)]
Merge commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266'

* commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266':
  rscc: Support palette format

See 11777eb8142117864bff0c8060f17b4089434143

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'
Clément Bœsch [Thu, 23 Mar 2017 10:27:41 +0000 (11:27 +0100)]
Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'

* commit 'b8d5070db6313f985562865edcfd08a01c2d7503':
  avcodec: Document AV_PKT_DATA_PALETTE side data type

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '497c087939e32b26b792515d2dbc7e22561203f7'
Clément Bœsch [Thu, 23 Mar 2017 10:27:12 +0000 (11:27 +0100)]
Merge commit '497c087939e32b26b792515d2dbc7e22561203f7'

* commit '497c087939e32b26b792515d2dbc7e22561203f7':
  avidec: Set palette alpha as fully opaque

This commit is a noop, see 64cafe340bd5ddfe704efa95cd9f21471ca12a12

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'
Clément Bœsch [Thu, 23 Mar 2017 10:26:20 +0000 (11:26 +0100)]
Merge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'

* commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4':
  avidec: Do not special case palette on big-endian

This commit is a noop, see 64cafe340bd5ddfe704efa95cd9f21471ca12a12

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '310c55f1799deab395319471a75c528d0fa7b30d'
Clément Bœsch [Thu, 23 Mar 2017 10:22:32 +0000 (11:22 +0100)]
Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'

* commit '310c55f1799deab395319471a75c528d0fa7b30d':
  pixfmt: Document alternative names for smpte 431 and 432

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'
Clément Bœsch [Thu, 23 Mar 2017 10:20:34 +0000 (11:20 +0100)]
Merge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'

* commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e':
  vaapi_h265: Add main 10 encode support

This commit is a noop, see b9514756ba2b4f764fb86500a8172a57acb58403

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07'
Clément Bœsch [Thu, 23 Mar 2017 10:19:25 +0000 (11:19 +0100)]
Merge commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07'

* commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07':
  hwcontext_vaapi: Enable P010 support

This commit is a noop, see 7e0623b70ba79df6b07e71a810f495ce7e5886f8

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3'
Clément Bœsch [Thu, 23 Mar 2017 10:16:11 +0000 (11:16 +0100)]
Merge commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3'

* commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3':
  vaapi_h265: Fix buffering parameters
  vaapi_h265: Fix slice header writing
  vaapi_h264: Write bitstream restriction fields
  vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  vaapi_encode: Decide on GOP setup before initialising sequence parameters

This merge is a noop, see:
  30ebabca7c vaapi_h265: Fix buffering parameters
  ae0230cc3e vaapi_h265: Fix slice header writing
  6796e6ea84 vaapi_h264: Write bitstream restriction fields
  658c5afaa0 vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  ded1859df1 vaapi_encode: Decide on GOP setup before initialising sequence parameters

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'
Clément Bœsch [Thu, 23 Mar 2017 10:12:05 +0000 (11:12 +0100)]
Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'

* commit '5cc0057f4910c8c72421b812c8f337ef6c43696c':
  lavu: remove the custom atomic API

This commit is a noop. The removal is postponed until all usages in
FFmpeg are dropped as well. A patchset is on discussion on the
mailing-list:
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html

Merged-by: Clément Bœsch <u@pkh.me>
5 years agolavc: vdpau: Add support for new hw_frames_ctx and hw_device_ctx API
wm4 [Sat, 4 Mar 2017 23:57:33 +0000 (23:57 +0000)]
lavc: vdpau: Add support for new hw_frames_ctx and hw_device_ctx API

This supports retrieving the device from a provided hw_frames_ctx, and
automatically creating a hw_frames_ctx if hw_device_ctx is set.

The old API is not deprecated yet. The user can still use
av_vdpau_bind_context() (with or without setting hw_frames_ctx), or use
the API before that by allocating and setting hwaccel_context manually.

Cherry-picked from Libav commit 1a7ddba5.
(Adds missing APIchanges entry to the Libav version.)

Reviewed-by: Mark Thompson <sw@jkqxz.net>
5 years agolavc: Add hwaccel_flags field to AVCodecContext
wm4 [Sat, 4 Mar 2017 23:57:32 +0000 (23:57 +0000)]
lavc: Add hwaccel_flags field to AVCodecContext

This "reuses" the flags introduced for the av_vdpau_bind_context() API
function, and makes them available to all hwaccels. This does not affect
the current vdpau API, as av_vdpau_bind_context() should obviously
override the AVCodecContext.hwaccel_flags flags for the sake of
compatibility.

Cherry-picked from Libav commit 16a163b5.

Reviewed-by: Mark Thompson <sw@jkqxz.net>
5 years agoavcodec/lossless_videodsp: use ptrdiff_t for length parameters
James Almer [Wed, 22 Mar 2017 21:27:53 +0000 (18:27 -0300)]
avcodec/lossless_videodsp: use ptrdiff_t for length parameters

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agovaapi_vp9: Mark as async-safe
Mark Thompson [Tue, 21 Mar 2017 22:31:21 +0000 (22:31 +0000)]
vaapi_vp9: Mark as async-safe

5 years agovaapi_hevc: Mark as async-safe
Mark Thompson [Tue, 21 Mar 2017 22:31:04 +0000 (22:31 +0000)]
vaapi_hevc: Mark as async-safe

5 years agovaapi: Implement device-only setup
Mark Thompson [Sat, 11 Feb 2017 15:13:12 +0000 (15:13 +0000)]
vaapi: Implement device-only setup

In this case, the user only supplies a device and the frame context
is allocated internally by lavc.

(cherry picked from commit 5dd9a4b88b287bf8c93520afda7becb1ad0d1894)

5 years agoPlace attribute_deprecated in the right position for struct declarations
Diego Biurrun [Wed, 22 Feb 2017 10:39:21 +0000 (11:39 +0100)]
Place attribute_deprecated in the right position for struct declarations

libavcodec/vaapi.h:58:1: warning: attribute 'deprecated' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]

(cherry picked from commit ed6a891c364f8b0850b557d9578b8920cc15a937)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
5 years agolavc/hevc: use atomics for wpp_err
Clément Bœsch [Wed, 22 Mar 2017 17:23:17 +0000 (18:23 +0100)]
lavc/hevc: use atomics for wpp_err

5 years agomdct15: fix left shift of a negative value
Rostislav Pehlivanov [Wed, 22 Mar 2017 17:17:04 +0000 (17:17 +0000)]
mdct15: fix left shift of a negative value

Should fix Chromium issue 704064.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
5 years agolavc/bitstream_filter: remove unused atomic.h include
Clément Bœsch [Wed, 22 Mar 2017 17:17:44 +0000 (18:17 +0100)]
lavc/bitstream_filter: remove unused atomic.h include

5 years agolavc/bitstream: remove unused atomic.h include
Clément Bœsch [Wed, 22 Mar 2017 17:16:58 +0000 (18:16 +0100)]
lavc/bitstream: remove unused atomic.h include

5 years agoMerge commit '59c70227405c214b29971e6272f3a3ff6fcce3d0'
Clément Bœsch [Wed, 22 Mar 2017 17:13:47 +0000 (18:13 +0100)]
Merge commit '59c70227405c214b29971e6272f3a3ff6fcce3d0'

* commit '59c70227405c214b29971e6272f3a3ff6fcce3d0':
  pthread_frame: use atomics for frame progress

This commit is a noop, see b6587421c7799f18038c7c802b62d034ede52f8f

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5'
Clément Bœsch [Wed, 22 Mar 2017 17:12:21 +0000 (18:12 +0100)]
Merge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5'

* commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5':
  pthread_frame: use atomics for PerThreadContext.state

This commit is a noop, see 749262693247808e2db5a2eb29a11ad3cfec211c

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'db2733256db323e4b88a34b135320f33274148e2'
Clément Bœsch [Wed, 22 Mar 2017 17:09:54 +0000 (18:09 +0100)]
Merge commit 'db2733256db323e4b88a34b135320f33274148e2'

* commit 'db2733256db323e4b88a34b135320f33274148e2':
  pthread_frame: use a thread-safe way for signalling threads to die

This commit is a noop, see 4845f0720e38c5baab7baad52bfce1451f1c1639

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '8385ba53f115401a67a4748c0d107769ebfb2941'
Clément Bœsch [Wed, 22 Mar 2017 17:01:51 +0000 (18:01 +0100)]
Merge commit '8385ba53f115401a67a4748c0d107769ebfb2941'

* commit '8385ba53f115401a67a4748c0d107769ebfb2941':
  mmaldec: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f'
Clément Bœsch [Wed, 22 Mar 2017 16:55:18 +0000 (17:55 +0100)]
Merge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f'

* commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f':
  v4l2: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '27079a426c9d3db918b158976e44b9b143d78e1c'
Clément Bœsch [Wed, 22 Mar 2017 16:46:01 +0000 (17:46 +0100)]
Merge commit '27079a426c9d3db918b158976e44b9b143d78e1c'

* commit '27079a426c9d3db918b158976e44b9b143d78e1c':
  buffer: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
5 years agolavu/buffer: drop USE_ATOMICS
Clément Bœsch [Wed, 22 Mar 2017 16:31:15 +0000 (17:31 +0100)]
lavu/buffer: drop USE_ATOMICS

USE_ATOMICS is only set if there is no thread implementation enabled, in
which case you can't expect any lock mechanism from FFmpeg.

This is also conflicting with the incoming use of stdatomic.

5 years agoMerge commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81'
Clément Bœsch [Wed, 22 Mar 2017 15:42:53 +0000 (16:42 +0100)]
Merge commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81'

* commit 'eb34d40354e2474517c9b9bd787e0dadc89c2a81':
  Add a compat dummy stdatomic.h used when threading is disabled
  Add a compat stdatomic.h implementation based on pthreads
  Add a compat stdatomic.h implementation based on suncc atomics
  Add a compat stdatomic.h implementation based on windows atomics
  Add a compat stdatomic.h implementation based on GCC atomics

This merge is a noop, see:
  41e891e89e Add a compat dummy stdatomic.h used when threading is disabled
  74b5f10862 Add a compat stdatomic.h implementation based on pthreads
  70faadc826 Add a compat stdatomic.h implementation based on suncc atomics
  c91e72ed52 Add a compat stdatomic.h implementation based on windows atomics
  3359eede8f Add a compat stdatomic.h implementation based on GCC atomics

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '13f5d2bf75b95a0bfdb9940a5e359a719e242bed'
Clément Bœsch [Wed, 22 Mar 2017 15:41:29 +0000 (16:41 +0100)]
Merge commit '13f5d2bf75b95a0bfdb9940a5e359a719e242bed'

* commit '13f5d2bf75b95a0bfdb9940a5e359a719e242bed':
  configure: check for stdatomic.h

This commit is a noop, see 6a4e24280dd7f15c41628ebfb01ee25661d8b258

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'b015872c0d0823e70776e98b865509ec1287e2f6'
Clément Bœsch [Wed, 22 Mar 2017 15:37:30 +0000 (16:37 +0100)]
Merge commit 'b015872c0d0823e70776e98b865509ec1287e2f6'

* commit 'b015872c0d0823e70776e98b865509ec1287e2f6':
  huffyuvdsp: Enable the altivec code for PPC little-endian as well

This commit is a noop, see 902ce2a6c4364fd27ae3f1db78cd275caf79c006 and
libavcodec/ppc/lossless_videodsp_altivec.c

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '1d25a86902946dbc80bb3a38e61755181ca3af7b'
Clément Bœsch [Wed, 22 Mar 2017 15:35:13 +0000 (16:35 +0100)]
Merge commit '1d25a86902946dbc80bb3a38e61755181ca3af7b'

* commit '1d25a86902946dbc80bb3a38e61755181ca3af7b':
  huffyuvdsp: Reenable PPC optimizations

This commit is a noop, see 6596b34954fc2c101fe620a4b4d305bf27315013

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '22c3ab18646924ce24dc6017a9e882ff69689e40'
Clément Bœsch [Wed, 22 Mar 2017 15:29:44 +0000 (16:29 +0100)]
Merge commit '22c3ab18646924ce24dc6017a9e882ff69689e40'

* commit '22c3ab18646924ce24dc6017a9e882ff69689e40':
  checkasm: Add test for huffyuvdsp add_bytes

huffyuvdsp is renamed to llviddsp to be consistent with our codebase.

Note: af607b7e07 wasn't actually required for this test since this
commit is not actually testing huffyuvdsp.

Merged-by: Clément Bœsch <u@pkh.me>
5 years agolavc/huffyuvdsp: only transmit the pix_fmt instead of the whole avctx
Clément Bœsch [Wed, 22 Mar 2017 15:21:20 +0000 (16:21 +0100)]
lavc/huffyuvdsp: only transmit the pix_fmt instead of the whole avctx

Only the pixel format is required in that init function. This will also
simplify the incoming merge.

5 years agolavc/huffyuvdsp: remove unused ppc init prototype
Clément Bœsch [Wed, 22 Mar 2017 15:15:42 +0000 (16:15 +0100)]
lavc/huffyuvdsp: remove unused ppc init prototype

5 years agoMerge commit '27085d1b47c3741cc0fac284c916127c4066d049'
Clément Bœsch [Wed, 22 Mar 2017 15:02:51 +0000 (16:02 +0100)]
Merge commit '27085d1b47c3741cc0fac284c916127c4066d049'

* commit '27085d1b47c3741cc0fac284c916127c4066d049':
  avconv: only retry decoding on actual decoding errors

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af'
Clément Bœsch [Wed, 22 Mar 2017 14:53:38 +0000 (15:53 +0100)]
Merge commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af'

* commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af':
  avconv: make sure the filtergraph is freed on init failure

This commit is a noop, see 16abc10b0997c76cbb0c0ebedc49f6bc21452f9d

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'
Clément Bœsch [Wed, 22 Mar 2017 14:50:37 +0000 (15:50 +0100)]
Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'

* commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6':
  avconv: set the encoding framerate when the output is CFR

This commit is a noop, see 8db301deadfcf113fb274881e65afcbe3e1bd645

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36'
Clément Bœsch [Wed, 22 Mar 2017 14:49:13 +0000 (15:49 +0100)]
Merge commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36'

* commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36':
  h264dec: support broken files with mp4 extradata/annex b data

This commit is a noop, see 93b89868e139e9b45dfc8a62b4f8e1832bbfd5d8

The sample pointed out on
https://github.com/HandBrake/HandBrake/issues/339 decodes fine in
FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
5 years agofate: update ref file for apng-clock test
James Almer [Wed, 22 Mar 2017 13:27:46 +0000 (10:27 -0300)]
fate: update ref file for apng-clock test

5 years agoMerge commit '2124711b950b03c582a119c75f52a87acc32d6ec'
Clément Bœsch [Wed, 22 Mar 2017 11:59:20 +0000 (12:59 +0100)]
Merge commit '2124711b950b03c582a119c75f52a87acc32d6ec'

* commit '2124711b950b03c582a119c75f52a87acc32d6ec':
  hwcontext_vaapi: add a quirk for the missing MemoryType attribute

This commit is a noop, see 775a8477b74bb2fa95ca2b13c08f3fd8d6c617b6

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'b57e38f52cc3f31a27105c28887d57cd6812c3eb'
Clément Bœsch [Wed, 22 Mar 2017 11:44:49 +0000 (12:44 +0100)]
Merge commit 'b57e38f52cc3f31a27105c28887d57cd6812c3eb'

* commit 'b57e38f52cc3f31a27105c28887d57cd6812c3eb':
  ac3dsp: x86: Replace inline asm for in-decoder downmixing with standalone asm

Merged-by: Clément Bœsch <u@pkh.me>
5 years agolavc/mips: temporally disable ac3 downmix
Clément Bœsch [Wed, 22 Mar 2017 10:46:13 +0000 (11:46 +0100)]
lavc/mips: temporally disable ac3 downmix

5 years agodoc/libav-merge: create a special "extra changes" section
Clément Bœsch [Wed, 22 Mar 2017 10:42:42 +0000 (11:42 +0100)]
doc/libav-merge: create a special "extra changes" section

5 years agoMerge commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8'
Clément Bœsch [Wed, 22 Mar 2017 10:30:53 +0000 (11:30 +0100)]
Merge commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8'

* commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8':
  ac3dsp: Add some special-case handling for the C downmix function

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '43717469f9daa402f6acb48997255827a56034e9'
Clément Bœsch [Wed, 22 Mar 2017 10:11:28 +0000 (11:11 +0100)]
Merge commit '43717469f9daa402f6acb48997255827a56034e9'

* commit '43717469f9daa402f6acb48997255827a56034e9':
  ac3dsp: Reverse matrix in/out order in downmix()

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoavformat/rtmpproto: change rtmp_open from url_open to url_open2
Steven Liu [Wed, 22 Mar 2017 10:06:14 +0000 (18:06 +0800)]
avformat/rtmpproto: change rtmp_open from url_open to url_open2

use the option set by user

Reported-by: Lancelot Lai <laihy23@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
5 years agox86/audiodsp: remove an unnecessary movss
James Almer [Wed, 22 Mar 2017 03:14:56 +0000 (00:14 -0300)]
x86/audiodsp: remove an unnecessary movss

5 years agoavdevice/decklink: new option 'format_code' to set video format by fourCC
Matthias Hunstock [Sun, 19 Mar 2017 23:16:37 +0000 (00:16 +0100)]
avdevice/decklink: new option 'format_code' to set video format by fourCC

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavdevice/decklink: add format_code of display mode to list_format output
Matthias Hunstock [Sun, 19 Mar 2017 23:16:36 +0000 (00:16 +0100)]
avdevice/decklink: add format_code of display mode to list_format output

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agohwcontext: fix comments for av_hwdevice_ctx_alloc()
Jun Zhao [Sun, 19 Mar 2017 07:44:46 +0000 (15:44 +0800)]
hwcontext: fix comments for av_hwdevice_ctx_alloc()

fix the wrong comments for av_hwdevice_ctx_alloc()

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
5 years agoavcodec/avcodec.h: clarify decoupled decode/encode API docs
Marton Balint [Wed, 15 Mar 2017 00:00:57 +0000 (01:00 +0100)]
avcodec/avcodec.h: clarify decoupled decode/encode API docs

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavformat/apng: set max_fps to no limit by default
James Almer [Tue, 21 Mar 2017 01:55:11 +0000 (22:55 -0300)]
avformat/apng: set max_fps to no limit by default

Should fix ticket #6252

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavformat/apng: fix setting frame delay when max_fps is set to no limit
James Almer [Tue, 21 Mar 2017 01:53:00 +0000 (22:53 -0300)]
avformat/apng: fix setting frame delay when max_fps is set to no limit

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoavutil/x86util: don't use movss in VBROADCASTSS macro when src and dst args are the...
James Almer [Mon, 20 Mar 2017 22:39:49 +0000 (19:39 -0300)]
avutil/x86util: don't use movss in VBROADCASTSS macro when src and dst args are the same

Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161'
James Almer [Tue, 21 Mar 2017 20:07:44 +0000 (17:07 -0300)]
Merge commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161'

* commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161':
  avio: add a new flag for marking streams seekable by timestamp

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'
James Almer [Tue, 21 Mar 2017 20:04:44 +0000 (17:04 -0300)]
Merge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'

* commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f':
  avio: cosmetics, prettify AVIO_SEEKABLE_NORMAL

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '83548fe894cdb455cc127f754d09905b6d23c173'
James Almer [Tue, 21 Mar 2017 20:02:30 +0000 (17:02 -0300)]
Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'

* commit '83548fe894cdb455cc127f754d09905b6d23c173':
  lavf: fix usage of AVIOContext.seekable

Merged-by: James Almer <jamrial@gmail.com>
5 years agoavcodec/wavpack: Check shift
Michael Niedermayer [Mon, 20 Mar 2017 01:05:23 +0000 (02:05 +0100)]
avcodec/wavpack: Check shift

Fixes: runtime error: shift exponent 255 is too large for 32-bit type 'unsigned int'
Fixes: 894/clusterfuzz-testcase-4841537823309824

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoavcodec/mpegaudiodec_template: Fix 2 runtime error: signed integer overflow
Michael Niedermayer [Mon, 20 Mar 2017 00:55:39 +0000 (01:55 +0100)]
avcodec/mpegaudiodec_template: Fix 2 runtime error: signed integer overflow

Fixes: 873/clusterfuzz-testcase-5714546230558720

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agoMerge commit '8d1267932ca9c2e343ef303349101bab6681d02e'
James Almer [Tue, 21 Mar 2017 19:10:33 +0000 (16:10 -0300)]
Merge commit '8d1267932ca9c2e343ef303349101bab6681d02e'

* commit '8d1267932ca9c2e343ef303349101bab6681d02e':
  x86/h264_weight: use appropriate register size for weight parameters

This commit is a noop, see 5ae0ad001a653e71b14c92a0d7861de87901752c

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '2caa93b813adc5dbb7771dfe615da826a2947d18'
James Almer [Tue, 21 Mar 2017 18:59:31 +0000 (15:59 -0300)]
Merge commit '2caa93b813adc5dbb7771dfe615da826a2947d18'

* commit '2caa93b813adc5dbb7771dfe615da826a2947d18':
  mpegaudiodsp: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '15b4f494fc6bddb8178fdb5aed18b420efc75e22'
James Almer [Tue, 21 Mar 2017 18:57:07 +0000 (15:57 -0300)]
Merge commit '15b4f494fc6bddb8178fdb5aed18b420efc75e22'

* commit '15b4f494fc6bddb8178fdb5aed18b420efc75e22':
  mss*: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89'
James Almer [Tue, 21 Mar 2017 18:55:44 +0000 (15:55 -0300)]
Merge commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89'

* commit 'a339e919cad1ab0125948f0dd9d49f6cb590db89':
  ea: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit 'ba479f3daafc7e4359ec1212164569ebe59f0bb7'
James Almer [Tue, 21 Mar 2017 18:49:09 +0000 (15:49 -0300)]
Merge commit 'ba479f3daafc7e4359ec1212164569ebe59f0bb7'

* commit 'ba479f3daafc7e4359ec1212164569ebe59f0bb7':
  hevc: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit 'e4a94d8b36c48d95a7d412c40d7b558422ff659c'
James Almer [Tue, 21 Mar 2017 18:20:45 +0000 (15:20 -0300)]
Merge commit 'e4a94d8b36c48d95a7d412c40d7b558422ff659c'

* commit 'e4a94d8b36c48d95a7d412c40d7b558422ff659c':
  h264chroma: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428'
James Almer [Tue, 21 Mar 2017 17:29:52 +0000 (14:29 -0300)]
Merge commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428'

* commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428':
  idct: Change type of array stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
5 years agoaacsbr: Turnoff in the event of over read.
Alex Converse [Mon, 20 Mar 2017 19:44:42 +0000 (12:44 -0700)]
aacsbr: Turnoff in the event of over read.

Aliased compressed AAC bytes are almost certainly not meaningful SBR
data. In the wild this causes harsh artifacts switching HE-AAC streams
that don't have SBR headers aligned with segment boundaries.

Turning off SBR falls back to a default set of upsampling parameters
that can function as a sort of error concealment. This is consistent
with how the decoder handles other sorts of errors.

5 years agoswresample/resample: free existing ResampleContext on reinit
James Almer [Tue, 21 Mar 2017 15:03:44 +0000 (12:03 -0300)]
swresample/resample: free existing ResampleContext on reinit

Fixes memleak.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoswresample/resample: move resample_free() higher in the file
James Almer [Tue, 21 Mar 2017 15:02:35 +0000 (12:02 -0300)]
swresample/resample: move resample_free() higher in the file

Also make it more readable while at it.

Signed-off-by: James Almer <jamrial@gmail.com>
5 years agoMerge commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c'
Clément Bœsch [Tue, 21 Mar 2017 14:19:17 +0000 (15:19 +0100)]
Merge commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c'

* commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c':
  blockdsp: Change type of array stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '3281d823cdc7601c4900eb103958c05f59f65555'
Clément Bœsch [Tue, 21 Mar 2017 14:13:36 +0000 (15:13 +0100)]
Merge commit '3281d823cdc7601c4900eb103958c05f59f65555'

* commit '3281d823cdc7601c4900eb103958c05f59f65555':
  intrax8: Change type of array stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '92c5755a185086067fe49e7e64c23a8e7011be31'
Clément Bœsch [Tue, 21 Mar 2017 14:10:46 +0000 (15:10 +0100)]
Merge commit '92c5755a185086067fe49e7e64c23a8e7011be31'

* commit '92c5755a185086067fe49e7e64c23a8e7011be31':
  hpeldsp: arm: Update comments left behind in 25841dfe806a13de526ae09c11149ab1f83555a8

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '009adfd4fbdd78a890a4a65d6f141c467bb027fa'
Clément Bœsch [Tue, 21 Mar 2017 14:02:31 +0000 (15:02 +0100)]
Merge commit '009adfd4fbdd78a890a4a65d6f141c467bb027fa'

* commit '009adfd4fbdd78a890a4a65d6f141c467bb027fa':
  x86: fpel: Remove unnecessary sign extend

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '956a54129db522998a5abae869568dae2c9774cb'
Clément Bœsch [Tue, 21 Mar 2017 13:58:03 +0000 (14:58 +0100)]
Merge commit '956a54129db522998a5abae869568dae2c9774cb'

* commit '956a54129db522998a5abae869568dae2c9774cb':
  vaapi_h264: Set max_num_ref_frames to 1 when not using B frames
  vaapi_encode: Sync to input surface rather than output
  vaapi_encode: Check packed header capabilities
  vaapi_encode: Refactor initialisation

This merge is a noop, see:

ee1d04f970 vaapi_h264: Set max_num_ref_frames to 1 when not using B frames
94f446c628 vaapi_encode: Sync to input surface rather than output
478a4b7e6d vaapi_encode: Check packed header capabilities
c8241e730f vaapi_encode: Refactor initialisation

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'
Clément Bœsch [Tue, 21 Mar 2017 13:51:38 +0000 (14:51 +0100)]
Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'

* commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb':
  examples/output: switch to the new encoding API

This commit is a noop, our examples are different. Still, we need to
update them to the new API, so doc/libav-merge.txt is updated.

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '7bf8db4db61eb09fac00eb665d8ec58de8817da6'
Clément Bœsch [Tue, 21 Mar 2017 13:44:44 +0000 (14:44 +0100)]
Merge commit '7bf8db4db61eb09fac00eb665d8ec58de8817da6'

* commit '7bf8db4db61eb09fac00eb665d8ec58de8817da6':
  tdsc: use the new decoding API

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0'
Clément Bœsch [Tue, 21 Mar 2017 12:09:26 +0000 (13:09 +0100)]
Merge commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0'

* commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0':
  lavc: add clobber tests for the new encoding/decoding API

The merge only re-order what we already have.

Merged-by: Clément Bœsch <u@pkh.me>
5 years agovf_drawtext: Fix memory leak
Kieran Kunhya [Mon, 20 Mar 2017 19:40:29 +0000 (19:40 +0000)]
vf_drawtext: Fix memory leak

5 years agoMerge commit '68811a41c70f019bde6df2a4f289674228c48958'
Clément Bœsch [Tue, 21 Mar 2017 12:01:46 +0000 (13:01 +0100)]
Merge commit '68811a41c70f019bde6df2a4f289674228c48958'

* commit '68811a41c70f019bde6df2a4f289674228c48958':
  mpegvideo_enc: use the new encoding API for b_strategy=2

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9'
Clément Bœsch [Tue, 21 Mar 2017 11:57:02 +0000 (12:57 +0100)]
Merge commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9'

* commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9':
  mpegvideo_enc: handle encoding errors with b_strategy=2

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b'
Clément Bœsch [Tue, 21 Mar 2017 11:55:40 +0000 (12:55 +0100)]
Merge commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b'

* commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b':
  mpegvideo_enc: add const to the AVCodec instance

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '6c09af7e46a5a1ada67ffe832f7895cf2749130b'
Clément Bœsch [Tue, 21 Mar 2017 11:52:54 +0000 (12:52 +0100)]
Merge commit '6c09af7e46a5a1ada67ffe832f7895cf2749130b'

* commit '6c09af7e46a5a1ada67ffe832f7895cf2749130b':
  APIchanges: fix a typo in the version number

This commit is a noop (typo is not present in FFmpeg).

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit '0e8d1fc1f013eb805a7b66656d9452bcbca36d22'
Clément Bœsch [Tue, 21 Mar 2017 11:50:30 +0000 (12:50 +0100)]
Merge commit '0e8d1fc1f013eb805a7b66656d9452bcbca36d22'

* commit '0e8d1fc1f013eb805a7b66656d9452bcbca36d22':
  lavu: Bump version for the 12bit Planar YUV support
  pixfmt: Add yuv444p12 pixel format
  pixfmt: Add yuv422p12 pixel format
  pixfmt: Add yuv420p12 pixel format

This merge is a noop, we already have all these pixel formats.

Merged-by: Clément Bœsch <u@pkh.me>
5 years agolavc/hwaccel: fix header copyright
Clément Bœsch [Tue, 21 Mar 2017 11:34:50 +0000 (12:34 +0100)]
lavc/hwaccel: fix header copyright

It was done on a whim because of the FATE header check and was actually
meant to be removed before pushing.

Also, nobody in review spotted it.

Reviewed-by: wm4
5 years agoMerge commit '2b5b1e1e9b89063d352e2efed014f9d761b85032'
Clément Bœsch [Tue, 21 Mar 2017 11:19:25 +0000 (12:19 +0100)]
Merge commit '2b5b1e1e9b89063d352e2efed014f9d761b85032'

* commit '2b5b1e1e9b89063d352e2efed014f9d761b85032':
  swscale: Rename is9_OR_10 to match what it does

This commit is a noop. We use isNBPS() in these places instead since
d736b52a04. is9_15BPS() wouldn't be a good name in our codebase due to
supporting only up to 14 (see 2ea585b8e3).

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoMerge commit 'e87a501e7d03ac68b58520108fe24ad9d0b36765'
Clément Bœsch [Tue, 21 Mar 2017 11:17:05 +0000 (12:17 +0100)]
Merge commit 'e87a501e7d03ac68b58520108fe24ad9d0b36765'

* commit 'e87a501e7d03ac68b58520108fe24ad9d0b36765':
  swscale: Update bitdepth range check

This commit is a noop.

Up to 14 bits is supported since fa36f33422. This commits pushes the
limit to 15 bits but we don't seem to have pixel formats that enters in
that category.

12:03 <ubitux> so what's your opinion? should we move to 15 even if unused currently to make it consistent with libav and the function names, or keep our 14 suggesting there might be an issue with 15?
12:05 <ubitux> (functions are called hScale8To15_c, hScale16To15_c, ff_hscale8to15, ...)
12:06 <michaelni> I prefer to keep 14 until theres a case that allows us to test this and i suspect it will not work with 15 at least not all the code

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoavcodec/fmvc: small refactoring in decode_type1()
Diego Biurrun [Tue, 21 Mar 2017 10:46:43 +0000 (11:46 +0100)]
avcodec/fmvc: small refactoring in decode_type1()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414'
Clément Bœsch [Tue, 21 Mar 2017 07:24:34 +0000 (08:24 +0100)]
Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414'

* commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414':
  swscale: Consistently order input YUV pixel formats

Merged-by: Clément Bœsch <u@pkh.me>
5 years agoffmpeg: Initialize two stack variables.
Carl Eugen Hoyos [Tue, 21 Mar 2017 07:03:49 +0000 (08:03 +0100)]
ffmpeg: Initialize two stack variables.

Avoids reading from uninitialized memory, regression since af1761f7

5 years agoavcodec: remove warning against using frame threading with hwaccels
wm4 [Sat, 18 Mar 2017 08:49:20 +0000 (09:49 +0100)]
avcodec: remove warning against using frame threading with hwaccels

libavcodec now automatically serializes decoding for hwaccels which
are not thread-safe. This means API users, which rely on the libavcodec
native software fallback mechanism, can now simply enable threading
without running into problems.

5 years agopthread_frame: remove some dead code
wm4 [Sat, 18 Mar 2017 08:36:20 +0000 (09:36 +0100)]
pthread_frame: remove some dead code

Whatever it was supposed to do.

5 years agopthread_frame: do not run hwaccel decoding asynchronously unless it's safe
Anton Khirnov [Thu, 24 Nov 2016 14:14:22 +0000 (15:14 +0100)]
pthread_frame: do not run hwaccel decoding asynchronously unless it's safe

Certain hardware decoding APIs are not guaranteed to be thread-safe, so
having the user access decoded hardware surfaces while the decoder is
running in another thread can cause failures (this is mainly known to
happen with DXVA2).

For such hwaccels, only allow the decoding thread to run while the user
is inside a lavc decode call (avcodec_send_packet/receive_frame).

Merges Libav commit d4a91e65.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
5 years agopthread_frame: ensure the threads don't run simultaneously with hwaccel
Anton Khirnov [Sat, 3 Dec 2016 14:21:40 +0000 (15:21 +0100)]
pthread_frame: ensure the threads don't run simultaneously with hwaccel

Merges Libav commit 8dfba25c.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
5 years agopthread_frame: use better memory orders for frame progress
Wan-Teh Chang [Fri, 9 Dec 2016 17:54:47 +0000 (09:54 -0800)]
pthread_frame: use better memory orders for frame progress

This improves commit 59c70227405c214b29971e6272f3a3ff6fcce3d0.

In ff_thread_report_progress(), the fast code path can load
progress[field] with the relaxed memory order, and the slow code path
can store progress[field] with the release memory order. These changes
are mainly intended to avoid confusion when one inspects the source code.
They are unlikely to have measurable performance improvement.

ff_thread_report_progress() and ff_thread_await_progress() form a pair.
ff_thread_await_progress() reads progress[field] with the acquire memory
order (in the fast code path). Therefore, one expects to see
ff_thread_report_progress() write progress[field] with the matching
release memory order.

In the fast code path in ff_thread_report_progress(), the atomic load of
progress[field] doesn't need the acquire memory order because the
calling thread is trying to make the data it just decoded visible to the
other threads, rather than trying to read the data decoded by other
threads.

In ff_thread_get_buffer(), initialize progress[0] and progress[1] using
atomic_init().

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Merges Libav commit 343e2833.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
5 years agopthread_frame: Unreference hw_frames_ctx on per-thread codec contexts
Mark Thompson [Thu, 3 Nov 2016 00:13:35 +0000 (00:13 +0000)]
pthread_frame: Unreference hw_frames_ctx on per-thread codec contexts

When decoding with threads enabled, the get_format callback will be
called with one of the per-thread codec contexts rather than with the
outer context.  If a hwaccel is in use too, this will add a reference
to the hardware frames context on that codec context, which will then
propagate to all of the other per-thread contexts for decoding.  Once
the decoder finishes, however, the per-thread contexts are not freed
normally, so these references leak.

Merges Libav commit fd0fae60.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
5 years agopthread_frame: properly propagate the hw frame context across frame threads
Anton Khirnov [Mon, 7 Nov 2016 13:21:18 +0000 (14:21 +0100)]
pthread_frame: properly propagate the hw frame context across frame threads

Merges Libav commit 84f22568.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
5 years agopthread_frame: use atomics for frame progress
Anton Khirnov [Sun, 17 Jul 2016 22:04:16 +0000 (00:04 +0200)]
pthread_frame: use atomics for frame progress

Merges Libav commit 59c70227.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
5 years agopthread_frame: use atomics for PerThreadContext.state
Anton Khirnov [Sun, 17 Jul 2016 22:04:16 +0000 (00:04 +0200)]
pthread_frame: use atomics for PerThreadContext.state

Merges Libav commit 64a31b28.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
5 years agoffmpeg: don't unnecessarily use a deprecated API function
wm4 [Thu, 16 Mar 2017 04:18:59 +0000 (05:18 +0100)]
ffmpeg: don't unnecessarily use a deprecated API function

Since we've disabled side data merging in ffmpeg.c, this really changes
nothing.