Commit Graph
100 Commits
Author SHA1 Message Date
Clément BœschandClément Bœsch f61379cbd4 lavu/timer.h: add Linux Perf API support
Refer to "checkasm: use perf API on Linux ARM*" commit for the
rationale.

The implementation is somehow duplicated with checkasm, but so is the
current usage of AV_READ_TIME(). Until these implementations and
heuristics are made consistent, I don't see a way of sharing that code.

Note: when using libavutil/timer.h, it is now important to include
before any other include due to the _GNU_SOURCE requirement.
2017-09-08 18:51:05 +02:00
Clément BœschandClément Bœsch e0b9b3e60e lavu/tests: move timer.h include earlier
In the next commit, timer.h will require a _GNU_SOURCE to be set before
including system headers. This commit prevents compilation failures.
2017-09-08 18:51:05 +02:00
Clément BœschandClément Bœsch dc27df47ff lavu/tests/des: rename crypt to crypt_ref
This will prevent a symbol clash with crypt(3) after unistd.h is
included.
2017-09-08 18:51:05 +02:00
Clément BœschandClément Bœsch 9c0d823a7c lavu/timer.h: factor out timer report
This commit is meant to reduce the diff in the following one.
2017-09-08 18:51:05 +02:00
Clément BœschandClément Bœsch e0d56f097f checkasm: use perf API on Linux ARM*
On ARM platforms, accessing the PMU registers requires special user
access permissions. Since there is no other way to get accurate timers,
the current implementation of timers in FFmpeg rely on these registers.
Unfortunately, enabling user access to these registers on Linux is not
trivial, and generally involve compiling a random and unreliable github
kernel module, or patching somehow your kernel.

Such module is very unlikely to reach the upstream anytime soon. Quoting
Robin Murphin from ARM:

> Say you do give userspace direct access to the PMU; now run two or more
> programs at once that believe they can use the counters for their own
> "minimal-overhead" profiling. Have fun interpreting those results...
>
> And that's not even getting into the implications of scheduling across
> different CPUs, CPUidle, etc. where the PMU state is completely beyond
> userspace's control. In general, the plan to provide userspace with
> something which might happen to just about work in a few corner cases,
> but is meaningless, misleading or downright broken in all others, is to
> never do so.

As a result, the alternative is to use the Performance Monitoring Linux
API which makes use of these registers internally (assuming the PMU of
your ARM board is supported in the kernel, which is definitely not a
given...).

While the Linux API is obviously cross platform, it does have a
significant overhead which needs to be taken into account. As a result,
that mode is only weakly enabled on ARM platforms exclusively.

Note on the non flexibility of the implementation: the timers (native
FFmpeg vs Linux API) are selected at compilation time to prevent the
need of function calls, which would result in a negative impact on the
cycle counters.
2017-09-08 18:51:05 +02:00
Clément Bœsch 516ac7bcc7 build: consistent spacing between lists (cosmetics) 2017-09-05 12:45:25 +02:00
Clément Bœsch ca7dc3ee90 lavd: drop QTKit indev
QTKit has been deprecated in favor of AVFoundation for years, and we
have an avfoundation input device.

See https://developer.apple.com/documentation/qtkit
2017-09-04 17:19:58 +02:00
Clément Bœsch b4b1285fa1 lavd: drop disabled v4l code
This code is disabled since 2012. V4L1 was dropped from the kernel more
than 10 years ago.
2017-09-03 09:55:30 +02:00
Clément BœschandClément Bœsch 69e6877de8 build: drop unused sndio_h and asoundlib_h 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch e090e750ba build: make sndio part of the autodetected libraries
sndio is already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-sndio is
specified.
2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch b7fbb3516a build: make jack part of the autodetected libraries
jack is already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-jack is
specified.
2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch b447629093 build: make alsa part of the autodetected libraries
alsa libs are already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-alsa is
specified.
2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch fe9c85e4e2 build: make sure a disabled autodetect still pick the libc's iconv 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch e3c1219c7c build: add --disable-autodetect switch 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch 9ef5a2f5f3 build: simplify weak-enabling of autodetected libraries 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch 7e98c3cbb3 build: remove vda_framework from enable_weak
vda_framework is already pulled by the weakly enabled vda and
videotoolbox.
2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch 353c2e384c build: replace use of HAVE_SDL2 with existing CONFIG_SDL2
There is no need for duplication.
2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch b802971d6d build: treat sdl2 like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch 778fa6350e build: isolate sdl-to-sdl2 aliasing
This simplifies incoming SDL related changes by removing potential
mismatching states of sdl and sdl2 variables. Since a component can have
all kind of states (such as unset, enabled, disabled or requested),
keeping these variables in sync manually in random places is not robust.
2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch 72655616d9 build: treat securetransport and schannel like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch 1c08ff08ad build: treat libxcb like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch c9075d2c65 build: treat iconv like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch 55fdfc88b8 build: treat crystalhd like other hwaccels 2017-09-02 16:14:15 +02:00
Clément BœschandClément Bœsch e70e2a7abd build: group z libs with other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément Bœsch 1193301758 lavc/htmlsubtitles: reindent after previous commits 2017-08-01 15:50:00 +02:00
Clément Bœsch 479ab8c3f8 lavc/htmlsubtitles: handle colors starting with many '#' 2017-08-01 15:50:00 +02:00
Clément Bœsch e800371863 lavc/htmlsubtitles: improve line breaks handling 2017-08-01 15:50:00 +02:00
Clément Bœsch 55949e3e51 lavc/tests: add htmlsubtitles 2017-08-01 15:50:00 +02:00
Clément Bœsch f0f8da545d lavc/htmlsubtitles: improve handling broken garbage
This commit switches off forced correct nesting of tags and only keeps
it for font tags. See long explanations in the code for the rationale.

This results in various FATE changes which I'll explain here:

- various swapping in font attributes, this is mostly noise due to the
  old reverse stack way of printing them. The new one is more correct as
  the last attribute takes over the previous ones.

- unrecognized tags disappears

- invalid tags that were previously displayed aren't anymore (instead,
  we have a warning). This is better for the end user

The main benefit of this commit is to be more tolerant to error, leading
to a better handling of badly nested tags or random wrong formatting for
the end user.
2017-08-01 15:50:00 +02:00
Clément Bœsch 797c232ef8 sws/tests/pixdesc_query: fix use of free() instead of av_free()
Fix CID 1415949
2017-07-30 20:48:57 +02:00
Clément Bœsch 4158fba3cd sws/tests/pixdesc_query: replace rgb based pix fmts with endianess agnostic names
Fixes ticket #6554
2017-07-30 16:05:32 +02:00
Clément Bœsch d2c70fc887 sws/tests/pixdesc_query: sort pixel formats 2017-07-30 16:04:36 +02:00
Clément Bœsch ca23d3491d sws/tests/pixdesc_query: save every pix fmts in a list
This will be required for the next commit.
2017-07-30 16:04:36 +02:00
Clément Bœsch 2ba20d799a lavc/htmlsubtitles: simplify 1-char tags case insensitive test 2017-07-26 19:56:28 +02:00
Clément BœschandClément Bœsch 850a45aef1 lavf/movenc: support GPMF track (gpmd) remuxing
See https://github.com/gopro/gpmf-parser for more information on the
data stream itself.
2017-07-24 14:43:40 +02:00
Clément BœschandClément Bœsch dad54e3c29 ffprobe: reindent after previous commit 2017-07-18 10:39:46 +02:00
Clément BœschandClément Bœsch 8e0d5b354e ffprobe: add -(no)find_stream_info expert option 2017-07-18 10:39:45 +02:00
Clément BœschandClément Bœsch af50fbaaeb ffplay: reindent after previous commit 2017-07-18 10:39:43 +02:00
Clément BœschandClément Bœsch 998687f1b2 ffplay: add -(no)find_stream_info expert option 2017-07-18 10:39:42 +02:00
Clément BœschandClément Bœsch d7ea14c5e2 ffmpeg: reindent after previous commit 2017-07-18 10:39:38 +02:00
Clément BœschandClément Bœsch b7a741223d ffmpeg: add -(no)find_stream_info expert option 2017-07-18 10:23:29 +02:00
Clément Bœsch 2658e66cd1 lavu/cpu: disable MMX warning on non x86 platforms
We have AV_CPU_FLAG_ARMV8 == AV_CPU_FLAG_SSE3 which causes a trigger of
this MMX warning on AArch64.
2017-06-29 18:00:58 +02:00
Clément BœschandClément Bœsch b12a36170b lavc/aacpsdsp: use ptrdiff_t for stride in hybrid_analysis 2017-06-28 12:22:39 +02:00
Clément BœschandClément Bœsch ff0ecef624 lavc/aarch64: add a few SIMD functions for AAC PS
☭ tests/checkasm/checkasm --bench --test=aacpsdsp
checkasm: using random seed 3318985180
MMX implied by specified flags
MMX implied by specified flags
NEON:
 - aacpsdsp.add_squares        [OK]
 - aacpsdsp.mul_pair_single    [OK]
 - aacpsdsp.hybrid_analysis    [OK]
 - aacpsdsp.stereo_interpolate [OK]
checkasm: all 5 tests passed
nop: 10.0
ps_add_squares_c: 63221.2
ps_add_squares_neon: 22311.7
ps_hybrid_analysis_c: 2466.6
ps_hybrid_analysis_neon: 1521.9
ps_mul_pair_single_c: 68592.0
ps_mul_pair_single_neon: 17426.6
ps_stereo_interpolate_c: 72344.3
ps_stereo_interpolate_neon: 72308.8
ps_stereo_interpolate_ipdopd_c: 117415.2
ps_stereo_interpolate_ipdopd_neon: 113386.3
2017-06-28 12:22:39 +02:00
Clément BœschandClément Bœsch 9bbb0fbd31 lavc/aacpsdsp: fix a few spaces (cosmetics) 2017-06-28 12:22:39 +02:00
Clément BœschandClément Bœsch edd041e64c checkasm: add AAC PS tests
This includes various fixes and improvements from James Almer.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-06-28 12:22:39 +02:00
Clément BœschandClément Bœsch e4a27e2f2d lavc/arm: fix lack of precision in ff_ps_stereo_interpolate_neon
The code originally pre-multiply by 2 the steps, causing the running sum
of the h factors to drift away due to the lack of precision. It quickly
causes an inaccuracy > 0.01.

I tried diverse approaches such as multiply by 2.0 (instead of adding
the value itself) without success.

I'm unable to bench the impact of this change, feel free to compare.

This commit fixes the incoming aacpsdsp tests.

Following is an alternative simplified function (matching the incoming
AArch64 code) that may be used:

function ff_ps_stereo_interpolate_neon, export=1
        vld1.32         {q0}, [r2]
        vld1.32         {q1}, [r3]
        ldr             r12, [sp]
        vmov.f32        q8, q0
        vmov.f32        q9, q1
        vzip.32         q8, q0
        vzip.32         q9, q1
1:
        vld1.32         {d4}, [r0,:64]
        vld1.32         {d6}, [r1,:64]
        vadd.f32        q8, q8, q9
        vadd.f32        q0, q0, q1
        vmov.f32        d5, d4
        vmov.f32        d7, d6
        vmul.f32        q2, q2, q8
        vmla.f32        q2, q3, q0
        vst1.32         {d4}, [r0,:64]!
        vst1.32         {d5}, [r1,:64]!
        subs            r12, r12, #1
        bgt             1b
        bx              lr
endfunc
2017-06-28 11:59:34 +02:00
Clément Bœsch ef01061225 lavf/hls: do not transfer custom IO flag
See 0dcac9c3f0
2017-05-22 17:31:32 +02:00
Clément Bœsch 0dcac9c3f0 lavf/concatdec: do not transfer custom IO flag
If the source is using a custom IO, setting this flag causes heavy leaks
since the segments will not have their avio context closed.

Regression since f5da453b06.
2017-05-22 16:55:30 +02:00
Clément Bœsch 1a950f32ab Merge commit 'e519dcd937c7c98815ba9884867590e302272016'
* commit 'e519dcd937c7c98815ba9884867590e302272016':
  dashenc: separate segments based on current segment duration

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:55:22 +02:00
Clément Bœsch e815111367 Merge commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92'
* commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92':
  dashenc: add option to provide UTC timing source

Also use E instead of AV_OPT_FLAG_ENCODING_PARAM to be consistent with
the other AVOption.

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:53:36 +02:00
Clément Bœsch a8ad127a63 Merge commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc'
* commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc':
  configure: Clean up temporary files on interrupt

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:50:28 +02:00
Clément Bœsch 091c986055 Merge commit '78489822074096e3ae0f3c3b70accace955086f6'
* commit '78489822074096e3ae0f3c3b70accace955086f6':
  configure: Place all temporary files in one separate directory

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:47:20 +02:00
Clément Bœsch e78dc57888 Merge commit '11e225db31dcad57e2219ad8dfae2ac027af53d6'
* commit '11e225db31dcad57e2219ad8dfae2ac027af53d6':
  rtmp: Account for bytes_read wraparound

This commit is a noop, see 0849a0ebb2

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:42:48 +02:00
Clément Bœsch 1ff55e12f7 Merge commit 'ca6ae3b77a7e6600e517723b90e57527a47809de'
* commit 'ca6ae3b77a7e6600e517723b90e57527a47809de':
  vaapi_encode: Add MPEG-2 support

This commit is a noop, see 3b95c7c17d

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:40:36 +02:00
Clément Bœsch ba3adea957 Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'
* commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee':
  dashenc: increase buffer time hint in the manifest

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:39:10 +02:00
Clément Bœsch 77a20cff36 Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'
* commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18':
  dashenc: add mandatory id to AdaptationSet and Period in manifest

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:37:04 +02:00
Clément Bœsch 93bf0480c2 Merge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'
* commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a':
  dashenc: fix ISO8601 UTC parsing

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:32:20 +02:00
Clément Bœsch 068d91885f Merge commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce'
* commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce':
  build: Map -Wall compiler flag to -W3 for MSVC and -Wextra to -W4

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:31:37 +02:00
Clément Bœsch d1da0fc4b9 Merge commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4'
* commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4':
  build: Detect blocks C language extension and add it as VDA dependency

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:28:43 +02:00
Clément Bœsch 55b56a8d6a Merge commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07'
* commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07':
  configure: Add quotes around a variable which might be empty

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 12:01:43 +02:00
Clément Bœsch c909b77fe3 Merge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'
* commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b':
  fifo: Return the correct AVERROR value

This commit is a noop, see 2e81bb5e92

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 12:01:04 +02:00
Clément Bœsch 2fbeb42df3 Merge commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f'
* commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f':
  configure: Use proper compiler-specific speed flags for hostcc

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:59:35 +02:00
Clément Bœsch f78f3df7e0 Merge commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be'
* commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be':
  configure: Move optflags checks to a more sensible place

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:54:30 +02:00
Clément Bœsch 89d277af00 Merge commit '381a4e31a6b801a046e38b0e2b08fb61499157a7'
* commit '381a4e31a6b801a046e38b0e2b08fb61499157a7':
  tak: Convert to the new bitstream reader
  magicyuv: Convert to the new bitstream reader
  truemotion2rt: Convert to the new bitstream reader
  wavpack: Convert to the new bitstream reader
  mpc: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:52:32 +02:00
Clément Bœsch 6a3538bb23 Merge commit 'b83aea73404f6f9314e72fe5d6238deaffa12b2c'
* commit 'b83aea73404f6f9314e72fe5d6238deaffa12b2c':
  des-test: Pass the proper types to av_des_*() functions

See 183c3fa48a

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:50:28 +02:00
Clément Bœsch 5d986609ba Merge commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec'
* commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec':
  swscale-test: const correctness for pointer variable

This commit is a noop, see b36745339d

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:23:07 +02:00
Clément Bœsch 42ed79a229 Merge commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a'
* commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a':
  OS/2: Try to commit memory above 1GB

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:21:41 +02:00
Clément Bœsch e5630ce5b1 Merge commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e'
* commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e':
  dxtory: Convert to the new bitstream reader
  apedec: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:19:29 +02:00
Clément Bœsch 584366a436 lavc/mpegvideoenc: reformat inv_zigzag_direct16 so the zigzag pattern is visible 2017-05-19 11:17:58 +02:00
Clément Bœsch 19bb2cade5 Merge commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4'
* commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4':
  mpegvideoenc: make a table const

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:15:16 +02:00
Clément Bœsch 52a4004d8b Merge commit '296eff4d9dc53d441b672319524a051d04f4a8cf'
* commit '296eff4d9dc53d441b672319524a051d04f4a8cf':
  zmbvenc: get rid of a global table

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:12:24 +02:00
Clément Bœsch 426f5e66a6 Merge commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83'
* commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83':
  hevc: Mark as having threadsafe init

This commit is a noop, see 14b9060160

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:09:20 +02:00
Clément Bœsch 545d14f067 Merge commit '54dcd2288546e135986338107ea87db1fcedd633'
* commit '54dcd2288546e135986338107ea87db1fcedd633':
  als: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:07:46 +02:00
Clément Bœsch 917853661f Merge commit 'fb59f87ce72035b940c3f5045884098b9324e1b2'
* commit 'fb59f87ce72035b940c3f5045884098b9324e1b2':
  nvenc: Explicitly push the cuda context on encoding

This commit is a noop, see be74ba648c

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:07:03 +02:00
Clément Bœsch aec4812cb3 Merge commit '4795e4f61f993940c5384044caff56cc15078698'
* commit '4795e4f61f993940c5384044caff56cc15078698':
  alac: Convert to the new bitstream reader
  rtp: Convert to the new bitstream reader
  mov: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:00:29 +02:00
Clément Bœsch 313264ba24 Merge commit '44129e38047b6a27291e487c2084894958c6f399'
* commit '44129e38047b6a27291e487c2084894958c6f399':
  avconv: Do not pass NULL to avio_tell

This commit is a noop. The FFmpeg code handle cases where total_size is
an AVERROR (which avio_tell(NULL) will return) later in the function.

Note: the original commit refers to the null *muxer*. `ffmpeg -lavfi
testsrc -f null -` can be used as a test case.

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 10:58:51 +02:00
Clément Bœsch 8ba1fc2a4a ffprobe: discard non-selected streams 2017-05-11 11:21:26 +02:00
Clément Bœsch 3c085c1ba5 Merge commit 'b68e353136db6f963212c457281d9716516cdc59'
* commit 'b68e353136db6f963212c457281d9716516cdc59':
  qsvdec: do not sync PIX_FMT_QSV surfaces

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 14:11:51 +02:00
Clément Bœsch 86b2c7d422 Merge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'
* commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa':
  dxva2: allow an empty array of ID3D11VideoDecoderOutputView

This commit is a noop, see 8fb4865901

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 14:09:34 +02:00
Clément Bœsch 0ab40e4477 Merge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'
* commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60':
  dxva2: get the slice number directly from the surface in D3D11VA

This commit is a noop, see 153b36fc62

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 14:08:12 +02:00
Clément Bœsch b010843594 Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'
* commit '122de16dd8108a59a55d30543c9f28b5f61b02d1':
  Replace cmdutils_common_opts.h by a macro

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 14:04:30 +02:00
Clément Bœsch cea5e7355c Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'
* commit '2a2889e130fee6d3c11e506328388afb317626ed':
  build: Remove stray duplicate conditional variable declaration

This commit is a noop, there is no duplicate in FFmpeg. we have the
tools rules kept in the root Makefile though (see
802d94c36e)

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 13:43:18 +02:00
Clément Bœsch 2ea6310f4a Merge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'
* commit '89725a8512721fffd190021ded2d3f5b42e20e2a':
  vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames

This commit is a noop, see eefa4b76ee

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 13:34:03 +02:00
Clément Bœsch 2eb8fcff0f Merge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'
* commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f':
  vaapi_encode: Support forcing IDR frames via AVFrame.pict_type

This commit is a noop, see c667c0979c

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 13:33:24 +02:00
Clément Bœsch 5786ee3eee Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'
* commit '37fab0661a760b2a9d727939d72e629acee1a6ef':
  vaapi_encode: Fix GOP sizing

This commit is a noop, see 760f1a7727

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 13:32:29 +02:00
Clément Bœsch 18e2a446c5 Merge commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2'
* commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2':
  interplayvideo: Convert to the new bitstream reader
  adx: Convert to the new bitstream reader
  dvbsubdec: Convert to the new bitstream reader
  motionpixels: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-05 13:31:35 +02:00
Clément Bœsch 90fe0800fb Merge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'
* commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14':
  hmac: Explicitly convert types at function pointer assignment

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 13:27:03 +02:00
Clément Bœsch fcc4ed1efa lavu/sha512: update length argument following sha+md5 changes 2017-05-05 13:24:35 +02:00
Clément Bœsch 651ee93461 Merge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'
* commit 'e435beb1ea5380a90774dbf51fdc8c941e486551':
  crypto: consistently use size_t as type for length parameters

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 13:04:38 +02:00
Clément Bœsch 20e72faef6 Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
  h264dec: make ff_h264_decode_init() static

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 11:33:39 +02:00
Clément Bœsch cb0eba71f0 Merge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'
* commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851':
  h264dec: drop a redundant check

This commit is a noop, see 4cc1ce4a91

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 11:32:32 +02:00
Clément Bœsch e584e88c56 Merge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'
* commit '3cba1ad76d362c994fa98fb686e04e20826fb579':
  x86inc: Avoid using eax/rax for storing the stack pointer

This commit is a noop, see cd09e3b349

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 11:31:01 +02:00
Clément Bœsch e0beaff487 Merge commit 'e199a8099411d0992c3ed278287a81f1d791199c'
* commit 'e199a8099411d0992c3ed278287a81f1d791199c':
  Changelog: mention the new avbuild/ directory

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 11:29:45 +02:00
Clément Bœsch 373bfe4fca Merge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'
* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
  fate: Skip the checkasm test if CONFIG_STATIC is disabled

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 11:27:18 +02:00
Clément Bœsch 938e5f57d2 Merge commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428'
* commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428':
  hevcdec: add P010 support for D3D11VA

This commit is a noop, see ccb94789e2

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 11:26:39 +02:00
Clément Bœsch d168fe14e9 Merge commit '0ac2d86c4758e1419934905b6c092910296aa16a'
* commit '0ac2d86c4758e1419934905b6c092910296aa16a':
  dxva2: Factorize DXVA context validity test into a single macro

This commit is (mostly) a noop, see 77742c75c5

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:56:21 +02:00
Clément Bœsch 055d6c2ea9 Merge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'
* commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a':
  dxva2: Make ff_dxva2_get_surface() static and drop its name prefix

This commit is a noop, see fd0716b364

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:48:36 +02:00
Clément Bœsch e6ee42febb Merge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'
* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
  matroskadec: make sure not to leave EbmlBin in an inconsistent state

This commit is a noop, see 5e1bacf2d4

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:46:24 +02:00
Clément Bœsch 730f75a099 Merge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'
* commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20':
  vaapi_h264: Fix POC on IDR frames

This commit is a noop, see e72662e131

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:40:42 +02:00