1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

84790 Commits

Author SHA1 Message Date
Clément Bœsch
76e21e83ac Merge commit '497c087939e32b26b792515d2dbc7e22561203f7'
* commit '497c087939e32b26b792515d2dbc7e22561203f7':
  avidec: Set palette alpha as fully opaque

This commit is a noop, see 64cafe340b

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:27:12 +01:00
Clément Bœsch
554cc43ac6 Merge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'
* commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4':
  avidec: Do not special case palette on big-endian

This commit is a noop, see 64cafe340b

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:26:32 +01:00
Clément Bœsch
a1f6b1d9d8 Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'
* commit '310c55f1799deab395319471a75c528d0fa7b30d':
  pixfmt: Document alternative names for smpte 431 and 432

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:22:32 +01:00
Clément Bœsch
1a5631dc71 Merge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'
* commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e':
  vaapi_h265: Add main 10 encode support

This commit is a noop, see b9514756ba

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:20:34 +01:00
Clément Bœsch
c4f613fe51 Merge commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07'
* commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07':
  hwcontext_vaapi: Enable P010 support

This commit is a noop, see 7e0623b70b

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:19:25 +01:00
Clément Bœsch
553d8a9ecf 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>
2017-03-23 11:16:11 +01:00
Clément Bœsch
d521258b19 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>
2017-03-23 11:14:13 +01:00
wm4
7e4ba776a2 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>
2017-03-23 09:36:42 +01:00
wm4
156bd8278f 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>
2017-03-23 09:34:21 +01:00
James Almer
30cadfe071 avcodec/lossless_videodsp: use ptrdiff_t for length parameters
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-22 18:38:35 -03:00
Mark Thompson
9560766a61 vaapi_vp9: Mark as async-safe 2017-03-22 19:07:32 +00:00
Mark Thompson
14c1101518 vaapi_hevc: Mark as async-safe 2017-03-22 19:07:32 +00:00
Mark Thompson
81b7deab82 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 5dd9a4b88b)
2017-03-22 19:07:32 +00:00
Diego Biurrun
6ff3da4f6a 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 ed6a891c36)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2017-03-22 19:07:32 +00:00
Clément Bœsch
e28bd75f7c lavc/hevc: use atomics for wpp_err 2017-03-22 18:38:27 +01:00
Rostislav Pehlivanov
38d7cc22f7 mdct15: fix left shift of a negative value
Should fix Chromium issue 704064.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-03-22 17:21:34 +00:00
Clément Bœsch
cf1c8a379e lavc/bitstream_filter: remove unused atomic.h include 2017-03-22 18:17:44 +01:00
Clément Bœsch
cb763a9ba8 lavc/bitstream: remove unused atomic.h include 2017-03-22 18:16:58 +01:00
Clément Bœsch
9ce031c37f Merge commit '59c70227405c214b29971e6272f3a3ff6fcce3d0'
* commit '59c70227405c214b29971e6272f3a3ff6fcce3d0':
  pthread_frame: use atomics for frame progress

This commit is a noop, see b6587421c7

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 18:13:47 +01:00
Clément Bœsch
5aee649919 Merge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5'
* commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5':
  pthread_frame: use atomics for PerThreadContext.state

This commit is a noop, see 7492626932

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 18:12:21 +01:00
Clément Bœsch
e6c868befa Merge commit 'db2733256db323e4b88a34b135320f33274148e2'
* commit 'db2733256db323e4b88a34b135320f33274148e2':
  pthread_frame: use a thread-safe way for signalling threads to die

This commit is a noop, see 4845f0720e

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 18:09:54 +01:00
Clément Bœsch
82d6179a88 Merge commit '8385ba53f115401a67a4748c0d107769ebfb2941'
* commit '8385ba53f115401a67a4748c0d107769ebfb2941':
  mmaldec: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 18:01:51 +01:00
Clément Bœsch
b7336faa39 Merge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f'
* commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f':
  v4l2: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 17:55:18 +01:00
Clément Bœsch
443e969293 Merge commit '27079a426c9d3db918b158976e44b9b143d78e1c'
* commit '27079a426c9d3db918b158976e44b9b143d78e1c':
  buffer: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 17:46:01 +01:00
Clément Bœsch
67d8eabdbb 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.
2017-03-22 17:40:03 +01:00
Clément Bœsch
f015711ed1 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>
2017-03-22 16:42:53 +01:00
Clément Bœsch
2d6f7e6c74 Merge commit '13f5d2bf75b95a0bfdb9940a5e359a719e242bed'
* commit '13f5d2bf75b95a0bfdb9940a5e359a719e242bed':
  configure: check for stdatomic.h

This commit is a noop, see 6a4e24280d

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 16:41:29 +01:00
Clément Bœsch
34389e8472 Merge commit 'b015872c0d0823e70776e98b865509ec1287e2f6'
* commit 'b015872c0d0823e70776e98b865509ec1287e2f6':
  huffyuvdsp: Enable the altivec code for PPC little-endian as well

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

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 16:37:37 +01:00
Clément Bœsch
7a11e6b2fd Merge commit '1d25a86902946dbc80bb3a38e61755181ca3af7b'
* commit '1d25a86902946dbc80bb3a38e61755181ca3af7b':
  huffyuvdsp: Reenable PPC optimizations

This commit is a noop, see 6596b34954

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 16:35:13 +01:00
Clément Bœsch
7c2a7f9c11 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>
2017-03-22 16:31:38 +01:00
Clément Bœsch
af607b7e07 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.
2017-03-22 16:22:20 +01:00
Clément Bœsch
c7904af057 lavc/huffyuvdsp: remove unused ppc init prototype 2017-03-22 16:15:42 +01:00
Clément Bœsch
928db51344 Merge commit '27085d1b47c3741cc0fac284c916127c4066d049'
* commit '27085d1b47c3741cc0fac284c916127c4066d049':
  avconv: only retry decoding on actual decoding errors

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 16:05:06 +01:00
Clément Bœsch
204b4a7ee2 Merge commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af'
* commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af':
  avconv: make sure the filtergraph is freed on init failure

This commit is a noop, see 16abc10b09

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 15:53:38 +01:00
Clément Bœsch
97c17cafab Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'
* commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6':
  avconv: set the encoding framerate when the output is CFR

This commit is a noop, see 8db301dead

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 15:50:37 +01:00
Clément Bœsch
17f2c0abea Merge commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36'
* commit '5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36':
  h264dec: support broken files with mp4 extradata/annex b data

This commit is a noop, see 93b89868e1

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>
2017-03-22 15:49:13 +01:00
James Almer
0dbfed08d0 fate: update ref file for apng-clock test 2017-03-22 10:27:46 -03:00
Clément Bœsch
4205010240 Merge commit '2124711b950b03c582a119c75f52a87acc32d6ec'
* commit '2124711b950b03c582a119c75f52a87acc32d6ec':
  hwcontext_vaapi: add a quirk for the missing MemoryType attribute

This commit is a noop, see 775a8477b7

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 12:59:20 +01:00
Clément Bœsch
c66bd8f3ff 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>
2017-03-22 12:49:29 +01:00
Clément Bœsch
9dc57688c8 lavc/mips: temporally disable ac3 downmix 2017-03-22 11:46:13 +01:00
Clément Bœsch
ce10e4cb1f doc/libav-merge: create a special "extra changes" section 2017-03-22 11:43:00 +01:00
Clément Bœsch
fd5e1d132b 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>
2017-03-22 11:30:53 +01:00
Clément Bœsch
e39d4ff150 Merge commit '43717469f9daa402f6acb48997255827a56034e9'
* commit '43717469f9daa402f6acb48997255827a56034e9':
  ac3dsp: Reverse matrix in/out order in downmix()

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 11:29:46 +01:00
Steven Liu
8ddadf56f6 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>
2017-03-22 18:06:14 +08:00
James Almer
aee046a895 x86/audiodsp: remove an unnecessary movss 2017-03-22 00:14:56 -03:00
Matthias Hunstock
b3a2adaac6 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>
2017-03-22 02:07:50 +01:00
Matthias Hunstock
607bffbed2 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>
2017-03-22 02:07:47 +01:00
Jun Zhao
9365dfcbf6 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>
2017-03-22 00:58:42 +00:00
Marton Balint
5154650413 avcodec/avcodec.h: clarify decoupled decode/encode API docs
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-03-22 00:43:06 +01:00
James Almer
7bfbb72299 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>
2017-03-21 19:15:19 -03:00