ffmpeg.git
12 months agoavdevice/decklink_dec: make some function static
James Almer [Thu, 9 Nov 2017 03:18:32 +0000 (00:18 -0300)]
avdevice/decklink_dec: make some function static

Reviewed-by: Aaron Levinson <alevinsn_dev@levland.net>
Signed-off-by: James Almer <jamrial@gmail.com>
12 months agolavc/pngdec: fix av_bprint_finalize() usage.
Nicolas George [Thu, 9 Nov 2017 08:21:05 +0000 (09:21 +0100)]
lavc/pngdec: fix av_bprint_finalize() usage.

12 months agoaacenc: mark the preset 5.0/5.1 layouts correctly with back speakers
Rostislav Pehlivanov [Thu, 9 Nov 2017 12:51:54 +0000 (12:51 +0000)]
aacenc: mark the preset 5.0/5.1 layouts correctly with back speakers

The spec is correct, it does list these layouts as having rear speakers.
Questionable how many decoders correctly interpret those correctly since
side is way more popular.
Also fixes fate-aac-yoraw-encode.

Reported-by: pkviet <pkv.stream@gmail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
12 months agoaacenc: use the PCE comment field for encoder ID
Rostislav Pehlivanov [Thu, 9 Nov 2017 04:30:07 +0000 (04:30 +0000)]
aacenc: use the PCE comment field for encoder ID

Also handle extradata of variable size (for bitexact/if PCEs aren't used).

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
12 months agoaacenc: support extended channel layouts using PCEs
Rostislav Pehlivanov [Mon, 3 Oct 2016 18:53:11 +0000 (19:53 +0100)]
aacenc: support extended channel layouts using PCEs

This commit implements support for PCE (Program Configuration Elements) in the
AAC encoder, and as such allows for encoding of channel layouts not present
in the presets defined by the spec (which only lists the 8 most common ones).

This has been a highly requested feature and is also the first open source encoder
to support this many layouts.

Many thanks to pkviet <pkv.stream@gmail.com> who implemented support for and
verified all channel layouts.

12 months agopngdec: expose gAMA and cHRM chunks as side/meta data
Rostislav Pehlivanov [Mon, 25 Sep 2017 19:28:08 +0000 (20:28 +0100)]
pngdec: expose gAMA and cHRM chunks as side/meta data

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
12 months agopngdec: check for bprint finalization sucess on icc data parsing
Rostislav Pehlivanov [Thu, 9 Nov 2017 02:34:54 +0000 (02:34 +0000)]
pngdec: check for bprint finalization sucess on icc data parsing

It can fail in case of OOM.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
12 months agovc2enc_dwt: pad the temporary buffer by the slice size
Rostislav Pehlivanov [Wed, 8 Nov 2017 23:50:04 +0000 (23:50 +0000)]
vc2enc_dwt: pad the temporary buffer by the slice size

Since non-Haar wavelets need to look into pixels outside the frame, we
need to pad the buffer. The old factor of two seemed to be a workaround
that fact and only padded to the left and bottom. This correctly pads
by the slice size and as such reduces memory usage and potential
exploits.
Reported by Liu Bingchang.

Ideally, there should be no temporary buffer but the encoder is designed
to deinterleave the coefficients into the classical wavelet structure
with the lower frequency values in the top left corner.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
12 months agoconfigure: add missing avutil deps for hwcontext modules
James Almer [Wed, 8 Nov 2017 22:32:09 +0000 (19:32 -0300)]
configure: add missing avutil deps for hwcontext modules

Fixes ticket #6812

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agolavfi/scale2ref: Set output frame rate to main input frame rate.
Carl Eugen Hoyos [Wed, 8 Nov 2017 08:15:29 +0000 (09:15 +0100)]
lavfi/scale2ref: Set output frame rate to main input frame rate.

Fixes ticket #6817.

12 months agoavformat/ty: fix format specifiers in debug log messages
James Almer [Wed, 8 Nov 2017 20:01:44 +0000 (17:01 -0300)]
avformat/ty: fix format specifiers in debug log messages

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoavcodec/mips: Improve hevc non-uni hv mc msa functions
Kaustubh Raste [Mon, 6 Nov 2017 12:36:53 +0000 (18:06 +0530)]
avcodec/mips: Improve hevc non-uni hv mc msa functions

Use mask buffer.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve hevc uni weighted 4 tap vt mc msa functions
Kaustubh Raste [Mon, 6 Nov 2017 10:58:44 +0000 (16:28 +0530)]
avcodec/mips: Improve hevc uni weighted 4 tap vt mc msa functions

Use global mask buffer for appropriate mask load.
Use immediate unsigned saturation for clip to max saving one vector register.
Remove unused macro.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve hevc uni 4 tap hv mc msa functions
Kaustubh Raste [Mon, 6 Nov 2017 10:50:51 +0000 (16:20 +0530)]
avcodec/mips: Improve hevc uni 4 tap hv mc msa functions

Use global mask buffer for appropriate mask load.
Remove unused macro and table.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve hevc bi wgt 4 tap hv mc msa functions
Kaustubh Raste [Mon, 6 Nov 2017 06:02:57 +0000 (11:32 +0530)]
avcodec/mips: Improve hevc bi wgt 4 tap hv mc msa functions

Use global mask buffer for appropriate mask load.
Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/qsvenc_jpeg: fix copyright header
James Almer [Wed, 8 Nov 2017 17:58:36 +0000 (14:58 -0300)]
avcodec/qsvenc_jpeg: fix copyright header

Fixes fate-source after 1926f13a206bfbd99abf536e7424e2b321f2e2ad.

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agocheckasm/llviddsp: fix warnings about mixed declaration and code
James Almer [Wed, 8 Nov 2017 17:53:27 +0000 (14:53 -0300)]
checkasm/llviddsp: fix warnings about mixed declaration and code

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '70946e605924e2108c39f96faa369c220177f301'
James Almer [Wed, 8 Nov 2017 17:25:31 +0000 (14:25 -0300)]
Merge commit '70946e605924e2108c39f96faa369c220177f301'

* commit '70946e605924e2108c39f96faa369c220177f301':
  h264dec: Fix mix of lossless and lossy MBs decoding
  h264_cabac: Fix CABAC+8x8dct in 4:4:4
  h264dec: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction

This commit is a noop, see
6f7ca1f55be1270e0d7c33409de4473e4dd00add
840b41b2a643fc8f0617c0370125a19c02c6b586
cf231b68da1150c100114f2c5671b7ed740f917a

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4'
James Almer [Wed, 8 Nov 2017 17:15:16 +0000 (14:15 -0300)]
Merge commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4'

* commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4':
  h264dec: track the last seen value of x264_build

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '45df7adc1d9b7e8fbae5af9328baa6ab3562002b'
James Almer [Wed, 8 Nov 2017 16:53:26 +0000 (13:53 -0300)]
Merge commit '45df7adc1d9b7e8fbae5af9328baa6ab3562002b'

* commit '45df7adc1d9b7e8fbae5af9328baa6ab3562002b':
  imgutils: add function to clear an image to black
  lavc, lavu: move frame cropping to a convenience function
  rmdec: add missing brackets to compound statement

This commit is a noop, see
65b83ce01b94eae944290c11257799a9288f2d4c
caa12027baf1180453846c58da08fc87accc0ff6
463b81de2b252691d75417643597c42684bf830d

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '550cb6a85d0f7211289f7a789527d48cb29460ff'
James Almer [Wed, 8 Nov 2017 16:47:42 +0000 (13:47 -0300)]
Merge commit '550cb6a85d0f7211289f7a789527d48cb29460ff'

* commit '550cb6a85d0f7211289f7a789527d48cb29460ff':
  lavf/vf_deinterlace_qsv: Enable the qsv deinterlace vpp

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2'
James Almer [Wed, 8 Nov 2017 16:45:09 +0000 (13:45 -0300)]
Merge commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2'

* commit '2fd6e7d077f590e4d7195356f9baeb271f8b9ae2':
  libavcodec/mjpeg_qsv: Add QSV MJPEG encoder

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '2b1324bd167553f49736e4eaa94f96da9982925e'
James Almer [Wed, 8 Nov 2017 16:39:58 +0000 (13:39 -0300)]
Merge commit '2b1324bd167553f49736e4eaa94f96da9982925e'

* commit '2b1324bd167553f49736e4eaa94f96da9982925e':
  lavf: allow avformat_close_input() with NULL
  dxva: DXVA2_ModeHEVC_VLD_Main10 does not support Main
  caf: add an Opus tag
  hevc: Make sure to update the current frame transfer characteristic

This commit is a noop, see
dc9735eb67ca696d926922735a9bf01776d5c328
b4093e60c51af493a6dad7819264ef769736227f
5a3b602acda68fe5ca09082dc753179450a97a13
c64da19bbc1d3b405703ef3b705dba39a450504f
36cd017acd9cac0e6695124c052a59fb1fc13145

Merged-by: James Almer <jamrial@gmail.com>
12 months agolavc/dnxhddata: Do not print frame rates with supported profiles.
Carl Eugen Hoyos [Tue, 31 Oct 2017 01:56:31 +0000 (02:56 +0100)]
lavc/dnxhddata: Do not print frame rates with supported profiles.

The list is unmaintained, misleading and the frame rates are
ignored by all compatible players.

12 months agoavformat: move priv_pts from AVStream to an internal struct
James Almer [Sun, 5 Nov 2017 17:59:47 +0000 (14:59 -0300)]
avformat: move priv_pts from AVStream to an internal struct

It has no reason to be in a public header, even if defined as private.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoavutil/hwcontext_d3d11va: Fix leak when wrapping texture in AVD3D11FrameDescriptor
Greg Wessels [Sun, 5 Nov 2017 04:43:09 +0000 (23:43 -0500)]
avutil/hwcontext_d3d11va: Fix leak when wrapping texture in AVD3D11FrameDescriptor

Reviewed-by: Aaron Levinson <alevinsn_dev@levland.net>
Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '95ce02b35d3d1bb16111031df1d82a6e4d894d36'
James Almer [Tue, 7 Nov 2017 22:15:16 +0000 (19:15 -0300)]
Merge commit '95ce02b35d3d1bb16111031df1d82a6e4d894d36'

* commit '95ce02b35d3d1bb16111031df1d82a6e4d894d36':
  rmdec: don't ignore the return value of av_get_packet()

See 65b83ce01b94eae944290c11257799a9288f2d4c

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '825e463a170c7004c63030dc484b2b2de869227b'
James Almer [Tue, 7 Nov 2017 22:09:11 +0000 (19:09 -0300)]
Merge commit '825e463a170c7004c63030dc484b2b2de869227b'

* commit '825e463a170c7004c63030dc484b2b2de869227b':
  build: Add feature test macros for glibc 2.19+

This commit is a noop, see
26e8895b7395ed180dcb7e30465058c45050b5e2
af1818276ef271af98e2e2bbabb4dc875b4fa7d8

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '0f5ad12ba2b538cb329c507ecc914e06bfa70194'
James Almer [Tue, 7 Nov 2017 22:08:46 +0000 (19:08 -0300)]
Merge commit '0f5ad12ba2b538cb329c507ecc914e06bfa70194'

* commit '0f5ad12ba2b538cb329c507ecc914e06bfa70194':
  flac: Use a local cache for decode_residual()

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '15f1cc09a406cf6296818d475a256902235eefc4'
James Almer [Tue, 7 Nov 2017 21:55:18 +0000 (18:55 -0300)]
Merge commit '15f1cc09a406cf6296818d475a256902235eefc4'

* commit '15f1cc09a406cf6296818d475a256902235eefc4':
  flac: Postpone unlikely condition checks

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '9c1e111406bd4cbb04d8e8611b71bebf203bec5e'
James Almer [Tue, 7 Nov 2017 21:50:59 +0000 (18:50 -0300)]
Merge commit '9c1e111406bd4cbb04d8e8611b71bebf203bec5e'

* commit '9c1e111406bd4cbb04d8e8611b71bebf203bec5e':
  flac: Convert to the new bitstream reader
  bitstream: Avoid undefined behavior in bitstream_skip()

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

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit 'fd92dafaff8844b5fedf94679b93d953939a7f7b'
James Almer [Tue, 7 Nov 2017 21:44:44 +0000 (18:44 -0300)]
Merge commit 'fd92dafaff8844b5fedf94679b93d953939a7f7b'

* commit 'fd92dafaff8844b5fedf94679b93d953939a7f7b':
  bink: Split read_dct_coeffs()

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '5be9939b46a6a4d3860a1b1a872aa50897095970'
James Almer [Tue, 7 Nov 2017 21:35:34 +0000 (18:35 -0300)]
Merge commit '5be9939b46a6a4d3860a1b1a872aa50897095970'

* commit '5be9939b46a6a4d3860a1b1a872aa50897095970':
  fate: Add cinepak encoder vsynth tests

See d7f62f033c214f3863acfd8e0672407b0bf91a3b

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

* commit 'ed3b2a999d189771c9b0ada9a9200117595fa474':
  cinepakenc: misc small changes
  cinepakenc: K&R formatting cosmetics
  cinepakenc: Stop using AVPicture
  cinepakenc: Drop broken debug code
  cinepakenc: add option handling for flexibility
  cinepakenc: fixes and improvements
  Add Cinepak encoder

See
59dbc36f49db5cfd9d2ad4b00ef2e3336173ee8d
762c4dc082764896e27f3c53c14a65871d8fe910
bf23642dcc86890fa2e32697c3b930b3f1ac0d88
0ab25dac2f0b170ecc0e37530cf15f83b9f9e56d

Merged-by: James Almer <jamrial@gmail.com>
12 months agocompat/w32dlfcn: add missing config.h include
James Almer [Tue, 7 Nov 2017 19:38:59 +0000 (16:38 -0300)]
compat/w32dlfcn: add missing config.h include

Fixes warnings about undefined HAVE_WINRT

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '4d330da006fe48178a4c8047f06270925eaedf63'
James Almer [Tue, 7 Nov 2017 19:29:02 +0000 (16:29 -0300)]
Merge commit '4d330da006fe48178a4c8047f06270925eaedf63'

* commit '4d330da006fe48178a4c8047f06270925eaedf63':
  os_support: Use HAVE_UWP instead of manually checking WINAPI_FAMILY
  d3d11va: Check WINAPI_FAMILY instead of HAVE_LOADLIBRARY
  lavf: Remove codec_tag from dashenc and smoothstreamingenc
  hevc: Add support for alternative transfer characterics SEI

Merged-by: James Almer <jamrial@gmail.com>
12 months agoconfigure: libvmaf is not GPLv2-compatible.
Carl Eugen Hoyos [Mon, 6 Nov 2017 13:15:31 +0000 (14:15 +0100)]
configure: libvmaf is not GPLv2-compatible.

It is licensed under Apache 2.0.

12 months agoavcodec/mips: Improve hevc bi 4 tap hv mc msa functions
Kaustubh Raste [Mon, 6 Nov 2017 05:45:04 +0000 (11:15 +0530)]
avcodec/mips: Improve hevc bi 4 tap hv mc msa functions

Use global mask buffer for appropriate mask load.
Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve avc avg mc 10, 30, 01 and 03 msa functions
Kaustubh Raste [Mon, 6 Nov 2017 05:19:23 +0000 (10:49 +0530)]
avcodec/mips: Improve avc avg mc 10, 30, 01 and 03 msa functions

Align the mask buffer to 64 bytes.
Load the specific destination bytes instead of MSA load and pack.
Remove unused macros and functions.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agolibavcodec/mepgvideo : remove warning introduce by previous patch
Martin Vignali [Mon, 6 Nov 2017 22:59:00 +0000 (23:59 +0100)]
libavcodec/mepgvideo : remove warning introduce by previous patch

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agolibavcodec/lossless_video_dsp : cosmetic add better separator for each function,...
Martin Vignali [Mon, 6 Nov 2017 20:52:37 +0000 (21:52 +0100)]
libavcodec/lossless_video_dsp : cosmetic add better separator for each function, in order to make reading of the asm file easier

12 months agolibavcodec/lossless_videodsp : add add_bytes avx2 version
Martin Vignali [Mon, 6 Nov 2017 20:51:54 +0000 (21:51 +0100)]
libavcodec/lossless_videodsp : add add_bytes avx2 version

12 months agocheckasm/llviddsp : add test for other dsp func
Martin Vignali [Sun, 29 Oct 2017 17:01:30 +0000 (18:01 +0100)]
checkasm/llviddsp : add test for other dsp func

add_median_pred
add_left_pred : add two func one with acc 0, and one with random acc
add_left_pred16

12 months agofate/utvideo : add test for decoding and encoding
Martin Vignali [Sat, 28 Oct 2017 12:06:22 +0000 (14:06 +0200)]
fate/utvideo : add test for decoding and encoding

12 months agolibavcodec/utvideo : simplify decode_plane
Martin Vignali [Sat, 28 Oct 2017 15:12:58 +0000 (17:12 +0200)]
libavcodec/utvideo : simplify decode_plane

the func is only call with step = 1
no need to pass it in the func

12 months agolibavcodec/blockdsp : fix comment. clear_block need 32 aligned now
Martin Vignali [Sat, 21 Oct 2017 16:47:49 +0000 (18:47 +0200)]
libavcodec/blockdsp : fix comment. clear_block need 32 aligned now

12 months agoavutil/pixdesc: remove reference to avcodec_get_chroma_sub_sample
Martin Vignali [Mon, 6 Nov 2017 21:39:17 +0000 (22:39 +0100)]
avutil/pixdesc: remove reference to avcodec_get_chroma_sub_sample

Don't recommend to use deprecated functions.

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoavcodec: remove remaining uses of avcodec_get_chroma_sub_sample
Martin Vignali [Mon, 6 Nov 2017 21:39:16 +0000 (22:39 +0100)]
avcodec: remove remaining uses of avcodec_get_chroma_sub_sample

Replace them with av_pix_fmt_get_chroma_sub_sample.

Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit 'a594f17f83a1ffdc1eec18818208fe39487dd5d7'
James Almer [Mon, 6 Nov 2017 21:46:05 +0000 (18:46 -0300)]
Merge commit 'a594f17f83a1ffdc1eec18818208fe39487dd5d7'

* commit 'a594f17f83a1ffdc1eec18818208fe39487dd5d7':
  dvbsubdec: Free subrect memory on allocation error
  dvbsubdec: Fixed segfault when decoding subtitles

See
fbb59a3bf4c8668197521b3db5f26d0e93aed1a6
39dfe6801a3f67c2964a829b65e8e38e3cb22217

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '3fdf50f9e864c88da2139cf066832944de81acaa'
James Almer [Mon, 6 Nov 2017 21:30:48 +0000 (18:30 -0300)]
Merge commit '3fdf50f9e864c88da2139cf066832944de81acaa'

* commit '3fdf50f9e864c88da2139cf066832944de81acaa':
  hwframe: Allow hwaccel frame allocators to align surface sizes
  dxva: verbose-log decoder GUID list
  hwcontext_d3d11va: add option to enable debug mode
  dxva: support DXGI_FORMAT_420_OPAQUE decoding
  hwcontext_d3d11va: allocate staging texture lazily
  hwcontext_d3d11va: fix crash on frames_init failure
  dxva: fix some warnings
  dxva: add declarative profile checks

This commit is a noop, see
e2afcc33e0bcba92ab6c767f09f17a67911a4928
39f201a0ec7913f7509a01fb0fa6634a24e52203
1509d739a036b9838e12f28dac9f09ac37bc3928
6f5ff3269b12776a32b12887128ba034ad86e08b
8d7fdba7b8670db9dd5023dde6fe3a06674933c4
289d387330d8a0a07ff98c9e09215627a70ace2d
f0bcedaf37ed4fdb082c88826b8bd3a5dd26382a
d14179e3d49eb0f2533db16151e01abb0018b165

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '0e83e95c60892747f2f1bd8382f915f2397f99a5'
James Almer [Mon, 6 Nov 2017 21:14:15 +0000 (18:14 -0300)]
Merge commit '0e83e95c60892747f2f1bd8382f915f2397f99a5'

* commit '0e83e95c60892747f2f1bd8382f915f2397f99a5':
  configure: Reset X86ASM_DEP(FLAGS) when probing for the assembler program

See f66086adac5eb9b964c89ea0480487f48875f690

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '7cb053e4ddf258e2dbf52ccc586548680742d758'
James Almer [Mon, 6 Nov 2017 21:10:49 +0000 (18:10 -0300)]
Merge commit '7cb053e4ddf258e2dbf52ccc586548680742d758'

* commit '7cb053e4ddf258e2dbf52ccc586548680742d758':
  nvenc: Minimize the surface allocation
  nvenc: Use a fifo to manage the free surface pool
  nvenc: Add an explicit auto alias

This commit is a noop, see
7b0689c55f1f8ee3abca58e1e3522f1c33beb60b
8de3458a07376b0a96772e586b6dba5e93432f52
de2faec2faf34ee948d400101299d4ccdc1f3a50

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '857e26b655a769e5a56bada1a0d9adb44cc176b7'
James Almer [Mon, 6 Nov 2017 20:55:26 +0000 (17:55 -0300)]
Merge commit '857e26b655a769e5a56bada1a0d9adb44cc176b7'

* commit '857e26b655a769e5a56bada1a0d9adb44cc176b7':
  build: Add an option for passing linker flags to the shared library build

See e34a3468f294f21878875e0f6ad5564cd52af70e.

--extra-ldlibflags is left in place for compatibility reasons.

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'
James Almer [Mon, 6 Nov 2017 20:50:00 +0000 (17:50 -0300)]
Merge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'

* commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c':
  configure: Automatically add -isysroot for darwin if --sysroot is specified

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit 'f519e131c101ae3948dabf1f7f598efbff5fb536'
James Almer [Mon, 6 Nov 2017 20:45:31 +0000 (17:45 -0300)]
Merge commit 'f519e131c101ae3948dabf1f7f598efbff5fb536'

* commit 'f519e131c101ae3948dabf1f7f598efbff5fb536':
  af_bs2b: Add missing casts to complex pointer assignments

Merged-by: James Almer <jamrial@gmail.com>
12 months agoavformat/ty: do not overread chunk
Paul B Mahol [Mon, 6 Nov 2017 20:00:08 +0000 (21:00 +0100)]
avformat/ty: do not overread chunk

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 months agoavformat/ty: try harder to find stream signature
Paul B Mahol [Mon, 6 Nov 2017 19:50:16 +0000 (20:50 +0100)]
avformat/ty: try harder to find stream signature

Search all chunks, not just first one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 months agoavformat/rtpdec_asf: free the buffer pointed by the AVIOContext
James Almer [Mon, 6 Nov 2017 16:25:18 +0000 (13:25 -0300)]
avformat/rtpdec_asf: free the buffer pointed by the AVIOContext

Don't free the buffer allocated in ff_wms_parse_sdp_a_line() after
calling avformat_open_input(), as it may free it and replace it with
another one.

Should fix ticket #6808

Tested-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoavformat: add TiVo ty demuxer
Paul B Mahol [Sun, 29 Oct 2017 20:20:10 +0000 (21:20 +0100)]
avformat: add TiVo ty demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 months agoavfilter:vf_libvmaf: improve docs.
Ashish Pratap Singh [Mon, 6 Nov 2017 12:49:33 +0000 (07:49 -0500)]
avfilter:vf_libvmaf: improve docs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 months agoavfilter/vf_libvmaf: fix errors while running with psnr=1.
Ashish Pratap Singh [Mon, 6 Nov 2017 12:49:19 +0000 (07:49 -0500)]
avfilter/vf_libvmaf: fix errors while running with psnr=1.

This patch fixes the seg fault which ocuured while running libvmaf filter
with option psnr=1.

Signed-off-by: ashk43712 <ashk43712@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 months agolavf/amr: Do not set codec_tag for raw amr_nb and raw amr_wb.
Carl Eugen Hoyos [Mon, 6 Nov 2017 12:36:40 +0000 (13:36 +0100)]
lavf/amr: Do not set codec_tag for raw amr_nb and raw amr_wb.

12 months agoffplay: use SDL2 audio API
Marton Balint [Sat, 4 Nov 2017 18:31:54 +0000 (19:31 +0100)]
ffplay: use SDL2 audio API

It allows us to specify what kind of audio parameter changes are allowed.

Should fix ticket #6721.

Signed-off-by: Marton Balint <cus@passwd.hu>
12 months agoMaintainers : add myself for exr
Martin Vignali [Sat, 4 Nov 2017 14:17:28 +0000 (15:17 +0100)]
Maintainers : add myself for exr

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/sbrdsp_fixed: Fix integer overflow in shift in sbr_hf_g_filt_c()
Michael Niedermayer [Wed, 1 Nov 2017 13:00:20 +0000 (14:00 +0100)]
avcodec/sbrdsp_fixed: Fix integer overflow in shift in sbr_hf_g_filt_c()

Fixes: runtime error: shift exponent 66 is too large for 64-bit type 'long long'
Fixes: 3642/clusterfuzz-testcase-minimized-5443853801750528

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/aacsbr_fixed: Fix division by zero in sbr_gain_calc()
Michael Niedermayer [Wed, 1 Nov 2017 13:00:19 +0000 (14:00 +0100)]
avcodec/aacsbr_fixed: Fix division by zero in sbr_gain_calc()

Fixes: 3642/clusterfuzz-testcase-minimized-5443853801750528

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavutil/softfloat: Add FLOAT_MIN
Michael Niedermayer [Wed, 1 Nov 2017 13:00:18 +0000 (14:00 +0100)]
avutil/softfloat: Add FLOAT_MIN

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()
Michael Niedermayer [Sat, 4 Nov 2017 00:19:20 +0000 (01:19 +0100)]
avcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()

Fixes: runtime error: signed integer overflow: -503316480 + -2013265038 cannot be represented in type 'int'
Fixes: 3805/clusterfuzz-testcase-minimized-6578427831255040

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agolavf/amr: Add amrnb and amrwb demuxers.
Carl Eugen Hoyos [Sun, 5 Nov 2017 19:51:03 +0000 (20:51 +0100)]
lavf/amr: Add amrnb and amrwb demuxers.

Fixes ticket #6678.

12 months agolavc/v4l2_context: Change the type of the ioctl cmd to uint32_t.
Carl Eugen Hoyos [Sun, 5 Nov 2017 00:53:49 +0000 (01:53 +0100)]
lavc/v4l2_context: Change the type of the ioctl cmd to uint32_t.

Fixes a warning on recent Linux:
libavcodec/v4l2_context.c: In function 'ff_v4l2_context_set_status':
libavcodec/v4l2_context.c:496:26: warning: comparison is always false due to limited range of data type

12 months agoavcodec/qdrw: support 16bpp files with bppcnt == 2 && bpp == 8
Piotr Bandurski [Wed, 22 Mar 2017 19:34:28 +0000 (20:34 +0100)]
avcodec/qdrw: support 16bpp files with bppcnt == 2 && bpp == 8

12 months agoavformat/mvdec: check for EOF
Paul B Mahol [Sun, 5 Nov 2017 09:39:23 +0000 (10:39 +0100)]
avformat/mvdec: check for EOF

Fixes #6805.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 months agoffmpeg.c: fix code style in seek_to_start
Peter Große [Sun, 29 Oct 2017 14:07:12 +0000 (15:07 +0100)]
ffmpeg.c: fix code style in seek_to_start

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoffmpeg.c: fix calculation of input file duration in seek_to_start()
Peter Große [Sun, 29 Oct 2017 11:08:05 +0000 (12:08 +0100)]
ffmpeg.c: fix calculation of input file duration in seek_to_start()

Fixes looping files without audio or when using stream_copy, where
ist->nb_samples is not set since no decoding is done.

This fixes ticket #5719 and also fixes an endless loop with the sample
in ticket #6139.

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve hevc uni weighted 4 tap hz mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 07:35:23 +0000 (13:05 +0530)]
avcodec/mips: Improve hevc uni weighted 4 tap hz mc msa functions

Use global mask buffer for appropriate mask load.
Use immediate unsigned saturation for clip to max saving one vector register.
Remove unused macro.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve hevc uni 4 tap hz and vt mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 06:59:58 +0000 (12:29 +0530)]
avcodec/mips: Improve hevc uni 4 tap hz and vt mc msa functions

Use global mask buffer for appropriate mask load.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/xan: Check for bitstream end in xan_huffman_decode()
Michael Niedermayer [Fri, 3 Nov 2017 16:48:29 +0000 (17:48 +0100)]
avcodec/xan: Check for bitstream end in xan_huffman_decode()

Fixes: Timeout
Fixes: 3707/clusterfuzz-testcase-6465922706440192

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/exr: fix undefined shift in pxr24_uncompress()
Michael Niedermayer [Sat, 4 Nov 2017 00:19:19 +0000 (01:19 +0100)]
avcodec/exr: fix undefined shift in pxr24_uncompress()

Fixes: runtime error: left shift of 255 by 24 places cannot be represented in type 'int'
Fixes: 3787/clusterfuzz-testcase-minimized-5728764920070144

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoRevert "vc2enc: Calculate average slice quantiser correctly"
Kieran Kunhya [Sat, 4 Nov 2017 18:31:59 +0000 (18:31 +0000)]
Revert "vc2enc: Calculate average slice quantiser correctly"

This reverts commit 626d200e76e15487cff20992256a55919432b0b3.

12 months agoffplay: only use hardware accelerated SDL texture formats
Marton Balint [Sat, 28 Oct 2017 20:46:08 +0000 (22:46 +0200)]
ffplay: only use hardware accelerated SDL texture formats

Typically only a small subset of the SDL texture formats are supported directly
by the SDL renderer drivers, the rest is software emulated. It's better if
libswscale does the format conversion to a hardware-accelerated texture format
instead of SDL.

This should fix video render slowdowns with some texture formats after
3bd2228d05a05eab5f91ac00b01efac9cb07649b.

Signed-off-by: Marton Balint <cus@passwd.hu>
12 months agoffplay: create the window and the renderer before starting playback
Marton Balint [Sat, 28 Oct 2017 20:06:22 +0000 (22:06 +0200)]
ffplay: create the window and the renderer before starting playback

Signed-off-by: Marton Balint <cus@passwd.hu>
12 months agovc2enc: Calculate average slice quantiser correctly
Kieran Kunhya [Mon, 24 Jul 2017 18:25:41 +0000 (19:25 +0100)]
vc2enc: Calculate average slice quantiser correctly

12 months agoh264: Make Truncating SPS/PPS message debug.
Kieran Kunhya [Wed, 30 Aug 2017 13:38:46 +0000 (14:38 +0100)]
h264: Make Truncating SPS/PPS message debug.

12 months agoh2645_parse: Allocate a single buffer per packet
Kieran Kunhya [Sat, 4 Nov 2017 17:41:06 +0000 (17:41 +0000)]
h2645_parse: Allocate a single buffer per packet

Drastically reduces memory usage on pathological streams.
Fixes ticket #6789

12 months agolavc/alac: Avoid allocating huge memory blocks for malicious alac input.
Carl Eugen Hoyos [Wed, 1 Nov 2017 14:14:22 +0000 (15:14 +0100)]
lavc/alac: Avoid allocating huge memory blocks for malicious alac input.

12 months agoavcodec/mips: Improve hevc bi wgt 4 tap hz and vt mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 06:29:08 +0000 (11:59 +0530)]
avcodec/mips: Improve hevc bi wgt 4 tap hz and vt mc msa functions

Use global mask buffer for appropriate mask load.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve hevc bi 4 tap hz and vt mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 05:37:08 +0000 (11:07 +0530)]
avcodec/mips: Improve hevc bi 4 tap hz and vt mc msa functions

Use global mask buffer for appropriate mask load.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve avc avg mc 20, 21 and 23 msa functions
Kaustubh Raste [Fri, 3 Nov 2017 05:09:18 +0000 (10:39 +0530)]
avcodec/mips: Improve avc avg mc 20, 21 and 23 msa functions

Load the specific destination bytes instead of MSA load and pack.
Remove unused macros and functions.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agolavf/mov.c: Refine edit list start seek, based on PTS computed from CTTS.
Sasi Inguva [Fri, 3 Nov 2017 00:33:28 +0000 (17:33 -0700)]
lavf/mov.c: Refine edit list start seek, based on PTS computed from CTTS.

Partially fixes t/6699.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agofate: Fix fitsdec-gbrap16 test on big-endian hardware.
Carl Eugen Hoyos [Wed, 1 Nov 2017 20:39:33 +0000 (21:39 +0100)]
fate: Fix fitsdec-gbrap16 test on big-endian hardware.

12 months agoavfilter/vf_tile: remove limit of max tile size
Paul B Mahol [Tue, 10 Oct 2017 19:18:03 +0000 (21:18 +0200)]
avfilter/vf_tile: remove limit of max tile size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 months agosnowenc: fix use of deprecated API
Nicolas Frattaroli [Thu, 2 Nov 2017 19:12:48 +0000 (20:12 +0100)]
snowenc: fix use of deprecated API

Replace avcodec_get_chroma_sub_sample with the recommended
av_pix_fmt_get_chroma_sub_sample, which fixes a compilation warning.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agodiracdec: fix deprecated API usage
Nicolas Frattaroli [Thu, 2 Nov 2017 22:39:53 +0000 (23:39 +0100)]
diracdec: fix deprecated API usage

avcodec_get_chroma_sub_sample is deprecated and generates a warning
during build, so av_pix_fmt_get_chroma_sub_sample is used

Signed-off-by: Nicolas Frattaroli <ffmpeg@fratti.ch>
Signed-off-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'
James Almer [Fri, 3 Nov 2017 02:39:28 +0000 (23:39 -0300)]
Merge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'

* commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888':
  tls_gnutls: Readd support for nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
12 months agoMerge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'
James Almer [Fri, 3 Nov 2017 02:27:53 +0000 (23:27 -0300)]
Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'

* commit '0671eb2346c17e8fb13784cf90ce416661fdea1c':
  tls_openssl: Readd support for nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
12 months agoavformat/tls_openssl: move some functions up in the file
James Almer [Fri, 3 Nov 2017 02:26:46 +0000 (23:26 -0300)]
avformat/tls_openssl: move some functions up in the file

Cosmetic change, reduces differences with libav.

12 months agoMerge commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e'
James Almer [Fri, 3 Nov 2017 00:57:01 +0000 (21:57 -0300)]
Merge commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e'

* commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e':
  movenc: allow alternative hvc1 h.265 codec tag
  movenc: write correct format hvcc when tag is hvc1
  movenc: move tags definitions to where they are used
  movenc: simplify codec_tag lookup
  movenc: use correct tag list for AVOutputFormat.codec_tag
  aarch64: vp9: Fix assembling with Xcode 6.2 and older
  doc: Drop the legacy symlink to README

This commit is a noop, see
998609ddb8884fd0f33abdb74c8bd4e1234032b1
95f3c85976ff79af6fd10ce3f7a90fcb054c3fc0
e199d90da6473abc0d010797b14f2ae2c9811d34
38d808d72e393f9a769ef1543a7eff15fadc1980
974d508e571085dce43e688595da058804169088
369a3e111cb8015c3a3acc5c2c15728c8f37084f

Merged-by: James Almer <jamrial@gmail.com>
12 months agoavcodec/gdv: Check compression before allocating frame
Michael Niedermayer [Wed, 1 Nov 2017 19:02:59 +0000 (20:02 +0100)]
avcodec/gdv: Check compression before allocating frame

Fixes: 2926/clusterfuzz-testcase-4987110014582784

This reduces decoding time from 7 to 4 seconds

The timeout should have been fixed in 0561bd2fc2bff0dbe651d5998e9f129c43d25eb3 but ossfuzz did not close this issue

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve hevc uni weighted hv mc msa functions
Kaustubh Raste [Tue, 31 Oct 2017 13:00:40 +0000 (18:30 +0530)]
avcodec/mips: Improve hevc uni weighted hv mc msa functions

Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12 months agoavcodec/mips: Improve avc avg mc 02, 12 and 32 msa functions
Kaustubh Raste [Wed, 1 Nov 2017 06:06:25 +0000 (11:36 +0530)]
avcodec/mips: Improve avc avg mc 02, 12 and 32 msa functions

Remove loops and unroll as block sizes are known.
Load the specific destination bytes instead of MSA load and pack.
Remove unused macro and functions.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>