ffmpeg.git
3 years agoMerge commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b'
Derek Buitenhuis [Thu, 12 May 2016 13:17:08 +0000 (14:17 +0100)]
Merge commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b'

* commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b':
  pixfmt: fix wrong comment

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'
Derek Buitenhuis [Thu, 12 May 2016 13:04:02 +0000 (14:04 +0100)]
Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'

* commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477':
  Generate the lists of enabled protocols/bsfs from configure.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolavc/libutvideoenc: Cast an unsigned constant to int.
Carl Eugen Hoyos [Thu, 12 May 2016 07:07:02 +0000 (09:07 +0200)]
lavc/libutvideoenc: Cast an unsigned constant to int.

Fixes the following warning / error:
libavcodec/libutvideoenc.cpp:281:1: warning: narrowing conversion of ‘3221258240u’ from ‘unsigned int’ to ‘int’ inside { } is ill-formed in C++11 [-Wnarrowing]

Fixes ticket #5542.

3 years agoavutil/cpu-test: Fix includes (needed for HAVE_*)
James Almer [Wed, 11 May 2016 20:03:21 +0000 (22:03 +0200)]
avutil/cpu-test: Fix includes (needed for HAVE_*)

Commit message by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavutil/float_dsp-test: Add include config.h for HAVE_*
Michael Niedermayer [Wed, 11 May 2016 20:03:03 +0000 (22:03 +0200)]
avutil/float_dsp-test: Add include config.h for HAVE_*

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavutil: make crypto testprogs include headers only
James Almer [Wed, 11 May 2016 21:16:56 +0000 (18:16 -0300)]
avutil: make crypto testprogs include headers only

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoSplit drawutils test out into separate file
Derek Buitenhuis [Wed, 11 May 2016 19:43:19 +0000 (20:43 +0100)]
Split drawutils test out into separate file

This was missed during 96d616052b3d39678e477fa10610ca688f46fff9 because
it is not included in FATE.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavfft-test: Add missing mem.h include
Derek Buitenhuis [Wed, 11 May 2016 19:42:55 +0000 (20:42 +0100)]
avfft-test: Add missing mem.h include

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolossless audio dsp: unroll
Christophe Gisquet [Sun, 1 May 2016 13:33:47 +0000 (15:33 +0200)]
lossless audio dsp: unroll

The loops are guaranteed to be at least multiples of 8, so this
unrolling is safe but allows exploiting execution ports.

For int32 version: 68 -> 58c.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dca_lbr: Fix "warning: missing braces around initializer"
Michael Niedermayer [Wed, 11 May 2016 16:49:57 +0000 (18:49 +0200)]
avcodec/dca_lbr: Fix "warning: missing braces around initializer"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'
Derek Buitenhuis [Wed, 11 May 2016 18:46:13 +0000 (19:46 +0100)]
Merge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'

* commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5':
  hwcontext: initialize sw_format in av_hwframe_ctx_alloc()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'
Derek Buitenhuis [Wed, 11 May 2016 18:43:59 +0000 (19:43 +0100)]
Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'

* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
  lavc: move the vaapi encoders further down in the list of codecs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'
Derek Buitenhuis [Wed, 11 May 2016 18:40:30 +0000 (19:40 +0100)]
Merge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'

These are all trivial to merge.

* commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12':
  vaapi_h265: Add -qp option, use it to replace use of -global_quality
  vaapi_h265: Add constant-bitrate encode support
  vaapi_h264: Add encode quality option (for quality-speed tradeoff)
  vaapi_h264: Add -qp option, use it to replace use of -global_quality
  vaapi_encode: Add support for codec-local options
  vaapi_h264: Add constant-bitrate encode support
  vaapi_encode: Refactor slightly to allow easier setting of global options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '18019f8cb9663dd1032c65aa453eaec18d641905'
Derek Buitenhuis [Wed, 11 May 2016 18:28:12 +0000 (19:28 +0100)]
Merge commit '18019f8cb9663dd1032c65aa453eaec18d641905'

* commit '18019f8cb9663dd1032c65aa453eaec18d641905':
  FATE: add an H.264 test with unescaped extradata
  FATE: add an H.264 test with invalid reference lists

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'
Derek Buitenhuis [Wed, 11 May 2016 18:26:18 +0000 (19:26 +0100)]
Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'

* commit '9d4d9be538faa537440fff37d3b7ecf322911a55':
  libavcodec: Document that encoders may use the framerate field in AVCodecContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '1bb56abb9b37bd208a66164339c92cad59b1087b'
Derek Buitenhuis [Wed, 11 May 2016 18:24:26 +0000 (19:24 +0100)]
Merge commit '1bb56abb9b37bd208a66164339c92cad59b1087b'

* commit '1bb56abb9b37bd208a66164339c92cad59b1087b':
  omx: Add support for zerocopy input of frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658'
Derek Buitenhuis [Wed, 11 May 2016 18:23:15 +0000 (19:23 +0100)]
Merge commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658'

* commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658':
  omx: Add support for broadcom OMX on raspberry pi

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'e8919ec486a5559fdcf366e347be0656d904a87f'
Derek Buitenhuis [Wed, 11 May 2016 18:19:05 +0000 (19:19 +0100)]
Merge commit 'e8919ec486a5559fdcf366e347be0656d904a87f'

* commit 'e8919ec486a5559fdcf366e347be0656d904a87f':
  libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf'
Derek Buitenhuis [Wed, 11 May 2016 18:15:06 +0000 (19:15 +0100)]
Merge commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf'

* commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf':
  mmaldec: Use imgutils.h for copying frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f'
Derek Buitenhuis [Wed, 11 May 2016 18:14:26 +0000 (19:14 +0100)]
Merge commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f'

* commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f':
  testprogs: Add missing libm.h includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
Derek Buitenhuis [Wed, 11 May 2016 18:10:10 +0000 (19:10 +0100)]
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'

* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13':
  build: Split test programs off into separate files

Some conversions done by: James Almer <jamrial@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavcodec/dca_lbr: explicitly initialize structs with zero
Hendrik Leppkes [Wed, 11 May 2016 14:34:57 +0000 (16:34 +0200)]
avcodec/dca_lbr: explicitly initialize structs with zero

This fixes build on MSVC and conforms to the usual init style used.

3 years agoMerge commit '330177b508420a553083df94f22cbd5142de0f4a'
Derek Buitenhuis [Wed, 11 May 2016 14:11:46 +0000 (15:11 +0100)]
Merge commit '330177b508420a553083df94f22cbd5142de0f4a'

* commit '330177b508420a553083df94f22cbd5142de0f4a':
  build: Group declarations for hw-accelerated de-/encoding separately

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavcodec/nvenc: Write buffPeriod/picTime SEI in both CBR modes
Timo Rothenpieler [Wed, 11 May 2016 09:52:25 +0000 (11:52 +0200)]
avcodec/nvenc: Write buffPeriod/picTime SEI in both CBR modes

3 years agoavcodec/nvenc: Generate bufferingPeriod/pictureTiming SEI
Timo Rothenpieler [Wed, 11 May 2016 08:34:31 +0000 (10:34 +0200)]
avcodec/nvenc: Generate bufferingPeriod/pictureTiming SEI

For some unknown reason enabling these causes propper CBR padding,
so as there are no known downsides just always enable them in CBR mode.

3 years agoaarch64/synth_filter: fix compilation
James Almer [Wed, 11 May 2016 02:33:12 +0000 (23:33 -0300)]
aarch64/synth_filter: fix compilation

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavformat/oggdec: Free stream private when header parsing fails.
Chris Cunningham [Mon, 9 May 2016 22:27:29 +0000 (15:27 -0700)]
libavformat/oggdec: Free stream private when header parsing fails.

Leaking this private structure opens up the possibility that it may
be re-used when parsing later packets in the stream. This is
problematic if the later packets are not the same codec type (e.g.
private allocated during Vorbis parsing, but later packets are Opus
and the private is assumed to be the oggopus_private type in
opus_header()).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavfi/drawutils: support NV12 and NV21
Rodger Combs [Tue, 10 May 2016 01:52:06 +0000 (20:52 -0500)]
lavfi/drawutils: support NV12 and NV21

3 years agoavcodec/rscc: check input buffer size for deflate mode
James Almer [Wed, 11 May 2016 01:07:19 +0000 (22:07 -0300)]
avcodec/rscc: check input buffer size for deflate mode

Fixes overreads.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/dca: add DTS Express (LBR) decoder
foo86 [Sun, 1 May 2016 15:43:00 +0000 (18:43 +0300)]
avcodec/dca: add DTS Express (LBR) decoder

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavdevice/decklink_dec: Convert decklink input module to use codecpar
Felt, Patrick [Sun, 8 May 2016 04:02:24 +0000 (04:02 +0000)]
avdevice/decklink_dec: Convert decklink input module to use codecpar

There are still a couple of deprecated calls that I’m not sure what to do with.
They are both related to some logic around AVCodecContext.coded_frame.
I couldn’t find anywhere that really documented what that was, or where it was intended to move to.
I left the warnings on.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/utils: Check bps before using it in a shift in ff_get_pcm_codec_id()
Michael Niedermayer [Tue, 10 May 2016 22:00:52 +0000 (00:00 +0200)]
avformat/utils: Check bps before using it in a shift in ff_get_pcm_codec_id()

Fixes undefined shift
Fixes: usan_shift

Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/oggparseopus: Check that granule pos is within the supported range
Michael Niedermayer [Tue, 10 May 2016 21:12:58 +0000 (23:12 +0200)]
avformat/oggparseopus: Check that granule pos is within the supported range

Larger values would imply file durations of astronomic proportions and cause
overflows

Fixes integer overflow
Fixes: usan_int64_overflow

Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/delogo: Check that logo area is inside the picture
Jean Delvare [Tue, 10 May 2016 12:50:38 +0000 (14:50 +0200)]
avfilter/delogo: Check that logo area is inside the picture

We can only remove the logo if it is inside the picture. We need at
least one pixel around the logo area for interpolation.

Fixes ticket #5527 (Delogo crash with x=0 and/or y=0).

Signed-off-by: Jean Delvare <jdelvare@suse.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agovf_colorspace: don't enable passthrough if bitdepth doesn't match.
Ronald S. Bultje [Fri, 6 May 2016 16:26:55 +0000 (12:26 -0400)]
vf_colorspace: don't enable passthrough if bitdepth doesn't match.

Also check return value of av_frame_copy() in passthrough mode, so that
if a copy fails (as it did here, because bitdepth didn't match), the filter
doesn't return success, which would mean sending an uninitialized framebuffer
further down the filtergraph.

3 years agovf_colorspace: fix range order.
Ronald S. Bultje [Fri, 6 May 2016 15:58:49 +0000 (11:58 -0400)]
vf_colorspace: fix range order.

3 years agovf_colorspace: make whitepoint adaptation mode configurable.
Ronald S. Bultje [Fri, 6 May 2016 13:40:10 +0000 (09:40 -0400)]
vf_colorspace: make whitepoint adaptation mode configurable.

Also add von kries whitepoint adaptation, and add 'identity' to turn
whitepoint adaptation off.

3 years agofate: add matroska-remux test.
Ronald S. Bultje [Fri, 6 May 2016 13:27:13 +0000 (09:27 -0400)]
fate: add matroska-remux test.

This tests automatic insertion of the vp9_superframe BSF as well as
ensuring that the colorspace properties in the video header can be
modified when remuxing (-c:v copy).

3 years agoffmpeg: copy color properties in case of -c:v copy.
Ronald S. Bultje [Tue, 3 May 2016 19:20:48 +0000 (15:20 -0400)]
ffmpeg: copy color properties in case of -c:v copy.

I have no idea why the first hunk uses ost->enc_ctx, because as far as
I understand, that is never used in case of -c:v copy, but this code
block is only entered if encoding_needed=0, which means stream_copy=1.
My point being: review from someone that knows this really well would
be appreciated.

3 years agovf_colorspace: use enums for bpp/subsampling array indices.
Ronald S. Bultje [Fri, 6 May 2016 13:00:14 +0000 (09:00 -0400)]
vf_colorspace: use enums for bpp/subsampling array indices.

Also add some documentation for each function to colorspacedsp.h.

3 years agovf_colorspace: add const to yuv_stride[] argument in DSP functions.
Ronald S. Bultje [Fri, 6 May 2016 12:59:43 +0000 (08:59 -0400)]
vf_colorspace: add const to yuv_stride[] argument in DSP functions.

3 years agovf_colorspace: add floyd-steinberg dithering option to full conversion.
Ronald S. Bultje [Tue, 3 May 2016 17:53:17 +0000 (13:53 -0400)]
vf_colorspace: add floyd-steinberg dithering option to full conversion.

3 years agoavfilter/f_metadata: update print output header line format
Tobias Rapp [Mon, 9 May 2016 09:35:38 +0000 (11:35 +0200)]
avfilter/f_metadata: update print output header line format

Update print mode output header line format to be more consistent with
other log output of FFmpeg. The printf-modifiers have been inspired by
the showinfo filter.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/f_metadata: add pts_time to print output
Tobias Rapp [Mon, 9 May 2016 09:35:37 +0000 (11:35 +0200)]
avfilter/f_metadata: add pts_time to print output

This allows e.g. to correlate signalstats metadata to time position
without having to find out the filter chain timebase first.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
Derek Buitenhuis [Mon, 9 May 2016 14:52:05 +0000 (15:52 +0100)]
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'

* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolibavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption
Przemysław Sobala [Mon, 9 May 2016 09:27:09 +0000 (11:27 +0200)]
libavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_fps: set fps value boundaries
Przemysław Sobala [Mon, 9 May 2016 09:17:23 +0000 (11:17 +0200)]
avfilter/vf_fps: set fps value boundaries

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'
Derek Buitenhuis [Sun, 8 May 2016 22:57:32 +0000 (23:57 +0100)]
Merge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'

* commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330':
  configure: cosmetics: Drop pointless end-of-line semicolons

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '00658253e237ab975ae2d384e02b5936781f103d'
Derek Buitenhuis [Sun, 8 May 2016 22:50:29 +0000 (23:50 +0100)]
Merge commit '00658253e237ab975ae2d384e02b5936781f103d'

* commit '00658253e237ab975ae2d384e02b5936781f103d':
  fate: Update DDS tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '22e49e6edead9c83696f20127988f659b952ce65'
Derek Buitenhuis [Sun, 8 May 2016 22:50:09 +0000 (23:50 +0100)]
Merge commit '22e49e6edead9c83696f20127988f659b952ce65'

* commit '22e49e6edead9c83696f20127988f659b952ce65':
  dds: Simplify postprocessing check

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '02538636261fdec9c70f4185b23147c636f269b4'
Derek Buitenhuis [Sun, 8 May 2016 22:49:20 +0000 (23:49 +0100)]
Merge commit '02538636261fdec9c70f4185b23147c636f269b4'

* commit '02538636261fdec9c70f4185b23147c636f269b4':
  dds: Add support for alpha-only files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'
Derek Buitenhuis [Sun, 8 May 2016 22:48:55 +0000 (23:48 +0100)]
Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'

* commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc':
  dds: Add support for rgb555 files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'
Derek Buitenhuis [Sun, 8 May 2016 22:44:19 +0000 (23:44 +0100)]
Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'

* commit '8dde92b95a197eb809d798aacb34dbe52a0689a8':
  fate: Update Screenpresso tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'
Derek Buitenhuis [Sun, 8 May 2016 22:43:51 +0000 (23:43 +0100)]
Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'

* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
  screenpresso: Correctly handle keyframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '95db8c757cb003a71b040b567f38be74151deb5c'
Derek Buitenhuis [Sun, 8 May 2016 22:43:26 +0000 (23:43 +0100)]
Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'

* commit '95db8c757cb003a71b040b567f38be74151deb5c':
  screenpresso: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'
Derek Buitenhuis [Sun, 8 May 2016 22:33:38 +0000 (23:33 +0100)]
Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'

* commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914':
  fate: Update RSCC tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b'
Derek Buitenhuis [Sun, 8 May 2016 22:31:01 +0000 (23:31 +0100)]
Merge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b'

* commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b':
  rscc: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'
Derek Buitenhuis [Sun, 8 May 2016 22:27:18 +0000 (23:27 +0100)]
Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'

This commit is a no-op.

* commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae':
  nvenc_h264: Fix name of private AVClass

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'e3453fd44480d903338c663238bf280215dd9a07'
Derek Buitenhuis [Sun, 8 May 2016 22:25:58 +0000 (23:25 +0100)]
Merge commit 'e3453fd44480d903338c663238bf280215dd9a07'

* commit 'e3453fd44480d903338c663238bf280215dd9a07':
  matroska: Write the field order information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'
Derek Buitenhuis [Sun, 8 May 2016 22:07:39 +0000 (23:07 +0100)]
Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'

This commit is a no-op. We cherry picked it earlier.

* commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d':
  vaapi_h264: Fix bit offset of slice data.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '33275a0de05e9bc321f2537a2a67921fab81624f'
Derek Buitenhuis [Sun, 8 May 2016 22:06:55 +0000 (23:06 +0100)]
Merge commit '33275a0de05e9bc321f2537a2a67921fab81624f'

* commit '33275a0de05e9bc321f2537a2a67921fab81624f':
  ac3dec: change logging of skipped E-AC-3 substreams.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'fef2147b7a689b80d716c3edb9d4a18904865275'
Derek Buitenhuis [Sun, 8 May 2016 22:05:12 +0000 (23:05 +0100)]
Merge commit 'fef2147b7a689b80d716c3edb9d4a18904865275'

* commit 'fef2147b7a689b80d716c3edb9d4a18904865275':
  eac3dec: don't call avpriv_request_sample every frame.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'
Derek Buitenhuis [Sun, 8 May 2016 22:04:47 +0000 (23:04 +0100)]
Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'

* commit '1db8eb154908cde577477b6ab17430a0cd46b7bd':
  avconv: Drop an unused variable

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'
Derek Buitenhuis [Sun, 8 May 2016 22:01:58 +0000 (23:01 +0100)]
Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'

* commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43':
  jack: Support OSX

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'
Derek Buitenhuis [Sun, 8 May 2016 21:58:18 +0000 (22:58 +0100)]
Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'

* commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1':
  matroska: Support interlaced content correctly

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'
Derek Buitenhuis [Sun, 8 May 2016 21:53:50 +0000 (22:53 +0100)]
Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'

* commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954':
  build: Do not check the vaapi_encode.h header if VAAPI is not enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d'
Derek Buitenhuis [Sun, 8 May 2016 21:52:32 +0000 (22:52 +0100)]
Merge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d'

* commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d':
  Mark tables used only within their files as static

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '061dc20351bf3b8a237216d2b39d3a3b736d1916'
Derek Buitenhuis [Sun, 8 May 2016 21:51:09 +0000 (22:51 +0100)]
Merge commit '061dc20351bf3b8a237216d2b39d3a3b736d1916'

* commit '061dc20351bf3b8a237216d2b39d3a3b736d1916':
  h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'
Derek Buitenhuis [Sun, 8 May 2016 21:50:42 +0000 (22:50 +0100)]
Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'

* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628':
  avconv: fix -frames for video

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '83f230c2445a94fdd94c66504482217fcece5909'
Derek Buitenhuis [Sun, 8 May 2016 21:46:52 +0000 (22:46 +0100)]
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'

* commit '83f230c2445a94fdd94c66504482217fcece5909':
  lavc: VAAPI MJPEG encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'
Derek Buitenhuis [Sun, 8 May 2016 21:45:39 +0000 (22:45 +0100)]
Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'

* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
  lavc: VAAPI H.265 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
Derek Buitenhuis [Sun, 8 May 2016 21:43:52 +0000 (22:43 +0100)]
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'

* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
  lavc: VAAPI H.264 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'
Derek Buitenhuis [Sun, 8 May 2016 21:40:42 +0000 (22:40 +0100)]
Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'

* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
  lavc: VAAPI encode common infrastructure

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'
Derek Buitenhuis [Sun, 8 May 2016 21:39:20 +0000 (22:39 +0100)]
Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'

* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
  avconv: VAAPI hwcontext initialisation and hwaccel helper

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agovc2: fate tests
Christophe Gisquet [Thu, 5 May 2016 09:06:09 +0000 (11:06 +0200)]
vc2: fate tests

3 years agoavcodec/simple_idct_template: Fix strict aliasing violation
Michael Niedermayer [Sun, 8 May 2016 17:19:47 +0000 (19:19 +0200)]
avcodec/simple_idct_template: Fix strict aliasing violation

Fixes intrax8 test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agovc2enc_dwt: use 32 bit coefficients by default
Rostislav Pehlivanov [Sat, 7 May 2016 17:05:25 +0000 (18:05 +0100)]
vc2enc_dwt: use 32 bit coefficients by default

The problem is that with particularly complex images and especially at
high bit depths and 5-level transforms the coefficients would overflow,
causing huge artifacts to appear. This was discovered thanks to the fate
tests, which will have to be redone as this fixes a multitude of
problems and increases PSNR.

There is a slight performance drop associated with this change, making
the encoder slower by 1.15 times, however this is necessary in order to
avoid undefined behavior and overflows.

It would be worth to template the transforms to keep the performance for
8 bit images as 32 bit coefficients are unnecessary for that case, but
the primary use of the encoder is to encode video at 10 bits.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoavcodec/dxva2_h264: fix slice offset in long slice struct after ca2f19b9
Hendrik Leppkes [Sun, 8 May 2016 15:37:30 +0000 (17:37 +0200)]
avcodec/dxva2_h264: fix slice offset in long slice struct after ca2f19b9

The GetBitContext now includes the NAL header, which offsets the slice by
one byte, which needs to be accounted for here.

3 years agovaapi_h264: Fix bit offset of slice data.
Mark Thompson [Sat, 2 Apr 2016 15:48:53 +0000 (16:48 +0100)]
vaapi_h264: Fix bit offset of slice data.

Commit ca2f19b9cc37be509d85f05c8f902860475905f8 modified the meaning of
H264SliceContext.gb: it is now initialised at the start of the NAL unit
header, rather than at the start of the slice header.  The VAAPI slice
decoder uses the offset after parsing to determine the offset of the
slice data in the bitstream, so with the changed meaning we no longer
need to add the extra byte to account for the NAL unit header because
it is now included directly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agofate: Remove duplicate wmv8_x8intra.wmv test
Michael Niedermayer [Sat, 7 May 2016 23:19:37 +0000 (01:19 +0200)]
fate: Remove duplicate wmv8_x8intra.wmv test

Also temporary enable the test so we get updated fate failure statistics

Note, this does not work on all platforms, it fails on MIPS
and ml archives indicate it failed on x86 openbsd with some compilers as well

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agox86: lossless audio: SSE4 madd 32bits
Christophe Gisquet [Sun, 1 May 2016 13:33:46 +0000 (15:33 +0200)]
x86: lossless audio: SSE4 madd 32bits

The unique user so far is wmalossless 24bits. The few samples tested show an
order of 8, so more unrolling or an avx2 version do not make sense.

Timings: 68 -> 49 cycles

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
Derek Buitenhuis [Sat, 7 May 2016 20:41:27 +0000 (21:41 +0100)]
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'

* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
  intrax8: Remove mpegvideo dependency

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b'
Derek Buitenhuis [Sat, 7 May 2016 20:40:16 +0000 (21:40 +0100)]
Merge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b'

* commit '6ebd06a9b2508747a135ee4c880d8f612e08932b':
  intrax8: Drop lots of pointless parentheses

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'
Derek Buitenhuis [Sat, 7 May 2016 20:40:00 +0000 (21:40 +0100)]
Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'

* commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c':
  intrax8: Drop MB emulation code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '9fa888c02801fff2e8817c24068f5296bbe60000'
Derek Buitenhuis [Sat, 7 May 2016 20:38:30 +0000 (21:38 +0100)]
Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'

* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
  intrax8: Keep a reference to the decoder blocks

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'
Derek Buitenhuis [Sat, 7 May 2016 20:37:28 +0000 (21:37 +0100)]
Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'

* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
  intrax8: Use the generic horizband function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'
Derek Buitenhuis [Sat, 7 May 2016 20:36:46 +0000 (21:36 +0100)]
Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'

* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
  intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
Derek Buitenhuis [Sat, 7 May 2016 20:35:20 +0000 (21:35 +0100)]
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'

* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
  intrax8: Pass macroblock size to ff_intrax8_common_init

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'
Derek Buitenhuis [Sat, 7 May 2016 20:23:46 +0000 (21:23 +0100)]
Merge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'

* commit '9f4d99138df434a73b097c997fb4cafc65f4ff54':
  fate: Add test for WMV2 with jframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoh265_parse: skip zero sized NAL units
Hendrik Leppkes [Sat, 7 May 2016 14:28:39 +0000 (16:28 +0200)]
h265_parse: skip zero sized NAL units

Avoids extra error checks later on and/or invalid reads.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoh264: do not return an error when NAL parsing of extradata failed
Hendrik Leppkes [Sat, 7 May 2016 11:28:31 +0000 (13:28 +0200)]
h264: do not return an error when NAL parsing of extradata failed

Fixes AnnexB samples with broken extradata, but proper in-band parameter sets

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'
Hendrik Leppkes [Sat, 7 May 2016 08:31:13 +0000 (10:31 +0200)]
Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'

* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8':
  h264: switch to h2645_parse for NAL parsing

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoh2645_parse: allow partial escaping
Hendrik Leppkes [Fri, 6 May 2016 14:20:13 +0000 (16:20 +0200)]
h2645_parse: allow partial escaping

This ports the fix from 033a533 to the new parser module in prepartion
of using it for the h264 decoder.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoh2645_parse: initialize the GetBitContext to the proper size
Hendrik Leppkes [Fri, 6 May 2016 16:31:05 +0000 (18:31 +0200)]
h2645_parse: initialize the GetBitContext to the proper size

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agohevc: fix size condition in ptl parsing
Hendrik Leppkes [Fri, 6 May 2016 17:09:04 +0000 (19:09 +0200)]
hevc: fix size condition in ptl parsing

When only one sublayer is present, no information is coded. Only when at least two
are present, all 8 sublayers are written.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavformat/tee: Use ref instead copy in write_packet
Jan Sebechlebsky [Sun, 1 May 2016 22:34:46 +0000 (01:34 +0300)]
avformat/tee: Use ref instead copy in write_packet

Replace av_copy_packet and deprecated av_dup_packet by
creating reference using av_packet_ref.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavformat/tee: Fix TeeSlave.bsfs pointer array size
Jan Sebechlebsky [Tue, 3 May 2016 13:21:20 +0000 (16:21 +0300)]
avformat/tee: Fix TeeSlave.bsfs pointer array size

TeeSlave.bsfs is array of pointers to AVBitStreamFilterContext,
so element size should be really size of a pointer, not size
of TeeSlave structure.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoffplay: force setting alsa buffer size
Marton Balint [Wed, 20 Apr 2016 21:50:38 +0000 (23:50 +0200)]
ffplay: force setting alsa buffer size

Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoriff: add comment for g721,g723 codec tags
compn [Sat, 7 May 2016 10:56:43 +0000 (06:56 -0400)]
riff: add comment for g721,g723 codec tags

Signed-off-by: Piotr Bandurski <ami_stuff@o2.pl>
3 years agoavformat/riff: add M102 FourCC
Piotr Bandurski [Fri, 6 May 2016 20:43:00 +0000 (22:43 +0200)]
avformat/riff: add M102 FourCC

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>