ffmpeg.git
4 years agoMerge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'
Michael Niedermayer [Thu, 30 Jul 2015 10:14:13 +0000 (12:14 +0200)]
Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'

* commit '9487ffd4c02b9e261562d43735490068c0df0d4b':
  rtmpproto: free hmac context properly

See: 6ce3d9fc4a70958680b93c6995cc87f34630a7e3
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agortmpproto: free hmac context properly
James Almer [Thu, 30 Jul 2015 03:00:01 +0000 (00:00 -0300)]
rtmpproto: free hmac context properly

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceeded
Michael Niedermayer [Thu, 30 Jul 2015 02:56:06 +0000 (04:56 +0200)]
avcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceeded

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpeg12enc: extend QP range to 28 for non linear quantizers
Michael Niedermayer [Thu, 30 Jul 2015 02:42:16 +0000 (04:42 +0200)]
avcodec/mpeg12enc: extend QP range to 28 for non linear quantizers

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibvpxenc: report pict_type/error via side-data
James Zern [Wed, 29 Jul 2015 05:59:42 +0000 (22:59 -0700)]
libvpxenc: report pict_type/error via side-data

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
4 years agolibvpxenc: quiet coded_frame deprecation warnings
James Zern [Wed, 29 Jul 2015 05:44:54 +0000 (22:44 -0700)]
libvpxenc: quiet coded_frame deprecation warnings

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
4 years agoavformat/rtmpproto: free hmac context properly
James Almer [Thu, 30 Jul 2015 02:56:22 +0000 (23:56 -0300)]
avformat/rtmpproto: free hmac context properly

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavfilter/vf_pnsr: fix author name
James Almer [Thu, 30 Jul 2015 01:28:09 +0000 (22:28 -0300)]
avfilter/vf_pnsr: fix author name

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agodoc/APIchanges: fill in some missing things
Michael Niedermayer [Thu, 30 Jul 2015 01:08:40 +0000 (03:08 +0200)]
doc/APIchanges: fill in some missing things

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/hmac: fix API/ABI compatibility with the fork
James Almer [Thu, 30 Jul 2015 00:05:15 +0000 (21:05 -0300)]
avutil/hmac: fix API/ABI compatibility with the fork

The test code is updated with some cosmetics to avoid the loop
using undefined AVHMACType values.
The old enum values will be removed in the next major bump, effectively
making both projects synced and without API or ABI issues.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31'
Michael Niedermayer [Wed, 29 Jul 2015 23:35:41 +0000 (01:35 +0200)]
Merge commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31'

* commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31':
  rtmpproto: use AVHMAC instead of a custom implementation

See: 6c87b866285fae0a45ab4d7162088428f60bd332
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'
Michael Niedermayer [Wed, 29 Jul 2015 23:27:36 +0000 (01:27 +0200)]
Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083'

* commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083':
  fate: add test vectors for HMAC SHA and SHA-2

Conflicts:
libavutil/hmac.c
tests/ref/fate/hmac

See: 1163910a00595f01f5f6aabd5d69b01925429401
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/hmac: support another ABI difference to the fork
Michael Niedermayer [Wed, 29 Jul 2015 23:03:35 +0000 (01:03 +0200)]
avutil/hmac: support another ABI difference to the fork

spotted this and so adding it.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '7e38340b831af8e3271f22bd66b9da14953c02af'
Michael Niedermayer [Wed, 29 Jul 2015 22:23:32 +0000 (00:23 +0200)]
Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af'

* commit '7e38340b831af8e3271f22bd66b9da14953c02af':
  hmac: add support for SHA-2

Conflicts:
libavutil/hmac.c
libavutil/hmac.h

See: 82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agorawdec: fix mjpeg probing buffer size check
wm4 [Wed, 29 Jul 2015 20:33:44 +0000 (22:33 +0200)]
rawdec: fix mjpeg probing buffer size check

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agorawdec: fix mjpeg probing
wm4 [Wed, 29 Jul 2015 20:11:18 +0000 (22:11 +0200)]
rawdec: fix mjpeg probing

There can be other headers than "Content-Type:" (in this case, a
"Content-Length:" header was following), so checking for a trailing
newline is wrong.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/oggdec: ogg_read_seek: reset ogg after seeking
Michael Niedermayer [Wed, 29 Jul 2015 21:17:15 +0000 (23:17 +0200)]
avformat/oggdec: ogg_read_seek: reset ogg after seeking

Fixes Ticket4743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agortmpproto: use AVHMAC instead of a custom implementation
James Almer [Wed, 29 Jul 2015 03:23:43 +0000 (00:23 -0300)]
rtmpproto: use AVHMAC instead of a custom implementation

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agofate: add test vectors for HMAC SHA and SHA-2
James Almer [Tue, 28 Jul 2015 18:36:15 +0000 (15:36 -0300)]
fate: add test vectors for HMAC SHA and SHA-2

Also replace custom tests for MD5 with those published in RFC 2202

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agohmac: add support for SHA-2
James Almer [Tue, 28 Jul 2015 18:36:14 +0000 (15:36 -0300)]
hmac: add support for SHA-2

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat/rtmpproto: use AVHMAC instead of a custom implementation
James Almer [Wed, 29 Jul 2015 02:56:42 +0000 (23:56 -0300)]
avformat/rtmpproto: use AVHMAC instead of a custom implementation

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoffmpeg_op: Print warning if duration isnt known when -sseof is used
Michael Niedermayer [Wed, 29 Jul 2015 16:58:57 +0000 (18:58 +0200)]
ffmpeg_op: Print warning if duration isnt known when -sseof is used

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodoc/ffmpeg: Use @code
Michael Niedermayer [Wed, 29 Jul 2015 16:58:40 +0000 (18:58 +0200)]
doc/ffmpeg: Use @code

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dvbsubdec: Implement display definition segment fallback from ETSI EN 300...
Michael Niedermayer [Wed, 29 Jul 2015 15:59:51 +0000 (17:59 +0200)]
avcodec/dvbsubdec: Implement display definition segment fallback from  ETSI EN 300 743 V1.3.1

Fixes: subtitles.ts
Fixes: Ticket679

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg: Implement support for seeking relative to EOF
Michael Niedermayer [Mon, 27 Jul 2015 02:30:26 +0000 (04:30 +0200)]
ffmpeg: Implement support for seeking relative to EOF

Fixes Ticket227

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aacdec_fixed: Fix preparation for resampler
Nedeljko Babic [Wed, 29 Jul 2015 14:46:18 +0000 (16:46 +0200)]
avcodec/aacdec_fixed: Fix preparation for resampler

2nd channel makes sense only for CPE type.

Skip 2nd channel in preparation for resampler (in spectral_to _sample())
depending on block type.

Fixes fate failure with clang ftrapv.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffplay: Use sws_scale to scale subtitles
Michael Niedermayer [Sun, 26 Jul 2015 19:25:21 +0000 (21:25 +0200)]
ffplay: Use sws_scale to scale subtitles

Fixes some files from Ticket679

This also changes subtitles to 4:2:0 matching the output format and thus
simplifying the blend code.
This restricts placement to the chroma sample resolution though, speak up
if you consider this a problem, say so, the code could be changed to use
YUV444 for subtitles and scaling them down while blending, this would be
slower though.
The current code only uses a single swscale context and reinitializes it
as needed, this could be changed as well if needed

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/wavdec: Check for data_size overflow
Michael Niedermayer [Wed, 29 Jul 2015 11:34:50 +0000 (13:34 +0200)]
avformat/wavdec: Check for data_size overflow

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agowavdec: make sample count check more precise
Ganesh Ajjanagadde [Wed, 29 Jul 2015 04:28:15 +0000 (00:28 -0400)]
wavdec: make sample count check more precise

May be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_refs: Allow slightly larger pps_ref_count[0] in PAFF RAP detection heuristic
Michael Niedermayer [Wed, 29 Jul 2015 01:03:52 +0000 (03:03 +0200)]
avcodec/h264_refs: Allow slightly larger pps_ref_count[0] in PAFF RAP detection heuristic

Fixes Ticket4738

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_refs: extend RAP heuristic to multiple PPS
Michael Niedermayer [Wed, 29 Jul 2015 00:51:19 +0000 (02:51 +0200)]
avcodec/h264_refs: extend RAP heuristic to multiple PPS

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/utils: Set coded_frame.pict_type in generic code
Michael Niedermayer [Tue, 28 Jul 2015 23:20:14 +0000 (01:20 +0200)]
avcodec/utils: Set coded_frame.pict_type in generic code

This makes it possible to remove more coded_frame usage without breaking the
publically visible coded_frame

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/proresenc_anatoliy: remove coded_frame use
Michael Niedermayer [Tue, 28 Jul 2015 23:16:30 +0000 (01:16 +0200)]
avcodec/proresenc_anatoliy: remove coded_frame use

coded_frame.key_frame should be set by the core already

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/avcodec: define CODEC_FLAG based on AV_CODEC_FLAG instead of duplicating...
Michael Niedermayer [Tue, 28 Jul 2015 20:53:54 +0000 (22:53 +0200)]
avcodec/avcodec: define CODEC_FLAG based on AV_CODEC_FLAG instead of duplicating the numbers and comments

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2'
Michael Niedermayer [Tue, 28 Jul 2015 20:30:18 +0000 (22:30 +0200)]
Merge commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2'

* commit 'c6e0829e3696c894d24c8088c3ee30a9c17534c2':
  configure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'd75b55635a02444c2f188c26e431a1cec992babe'
Michael Niedermayer [Tue, 28 Jul 2015 20:22:06 +0000 (22:22 +0200)]
Merge commit 'd75b55635a02444c2f188c26e431a1cec992babe'

* commit 'd75b55635a02444c2f188c26e431a1cec992babe':
  dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 microseconds
Ivan Uskov [Fri, 24 Jul 2015 11:45:38 +0000 (07:45 -0400)]
libavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 microseconds

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/qsvenc.c delay in 1 microsecond replaced to more appropriate 500 microseconds
Ivan Uskov [Tue, 28 Jul 2015 15:30:56 +0000 (18:30 +0300)]
libavcodec/qsvenc.c delay in 1 microsecond replaced to more appropriate 500 microseconds

This commit replaces the 1 microsecond delay by 500 microsecond for the
case when the MFX library does return MFX_WRN_DEVICE_BUSY status.
In general this warning never appears for simple encoding or
transcoding session because the GPU is so fast so it almost always is not busy and
any delay value just does not executes.
But for heavy transcoding tasks for example, when several QSV sessions
are running simultaneously then using a 1-microsecond delay may
result in 1000 iterations per each frame.
So here possible a paradoxical case when GPU loading also loads CPU by dummy tasks.
Official MFX/QSV samples by Intel are using 1 millisecond (i.e. 1000
microseconds) everywhere where MFX_WRN_DEVICE_BUSY does appear.
So 500us is a much more optimal value than 1us.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aac_fixed: Fix a bug in spectral_to_sample()
Nedeljko Babic [Tue, 28 Jul 2015 15:40:23 +0000 (17:40 +0200)]
avcodec/aac_fixed: Fix a bug in spectral_to_sample()

There was fixed number of loops (2048) in preparation for resampler, so
when number of samples is smaller than this, there would be an overflow on
ret_buf.

For some reason this behavior popped out only under valgrind with
--disable-memory-poisoning option.

This is now fixed and number of loops depends on actual number of samples.

Signed-off-by: Nedeljko Babic <nedeljko.babic@rt-rk.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg.c: remove all remaining coded_frame uses
Michael Niedermayer [Tue, 28 Jul 2015 17:42:00 +0000 (19:42 +0200)]
ffmpeg.c: remove all remaining coded_frame uses

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt
Martin Storsjö [Fri, 24 Jul 2015 20:12:43 +0000 (23:12 +0300)]
configure: Don't force _WIN32_WINNT to an older version if targeting winphone/winrt

This avoids having to manually set _WIN32_WINNT in --extra-cflags
when targeting these API families, which only was necessary to
work around configure setting _WIN32_WINNT to an older version
by default.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600
Martin Storsjö [Sat, 25 Jul 2015 17:30:31 +0000 (20:30 +0300)]
dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600

If _WIN32_WINNT is unset, we force it to a new enough value to
make sure the necessary definitions are visible.

When targeting Windows Phone or Windows RT, _WIN32_WINNT should
be at least 0x0602 - otherwise the windows headers themselves
can cause errors (which technically are bugs in the headers).

Raising this value here shouldn't hurt; the alternative would
be to not touch it at all if WINAPI_FAMILY is set to phone/app,
or to force setting it to 0x0602 in configure if unset (for phone/app).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibavcodec/hevc_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid...
Ivan Uskov [Tue, 28 Jul 2015 13:33:43 +0000 (09:33 -0400)]
libavcodec/hevc_mp4toannexb_bsf.c: Optional argument "private_spspps_buf" to avoid extradata modification.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libdcadec: exss is used only under ifdef, thus mark it as potentially unused
Michael Niedermayer [Tue, 28 Jul 2015 11:35:47 +0000 (13:35 +0200)]
avcodec/libdcadec: exss is used only under ifdef, thus mark it as potentially unused

avoids a compiler warning

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_slice: Also check sei_recovery_frame_cnt for skip_frame nokey
Michael Niedermayer [Tue, 28 Jul 2015 11:27:16 +0000 (13:27 +0200)]
avcodec/h264_slice: Also check sei_recovery_frame_cnt for skip_frame nokey

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_slice: do not skip 2nd field if first was not skipped
Michael Niedermayer [Tue, 28 Jul 2015 09:40:57 +0000 (11:40 +0200)]
avcodec/h264_slice: do not skip 2nd field if first was not skipped

Found-by: John Högberg <john.hogberg@ericsson.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavdevice/decklink: Fix build error caused by a change in the SDK.
Chris Spencer [Sun, 19 Jul 2015 19:32:49 +0000 (20:32 +0100)]
avdevice/decklink: Fix build error caused by a change in the SDK.

In version 10.4 of the DeckLink SDK, GetBufferedAudioSampleFrameCount() was changed to take an unsigned int instead of an unsigned long.

Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffmpeg: Use side data instead of coded_frame for error[] values
Michael Niedermayer [Mon, 27 Jul 2015 23:28:34 +0000 (01:28 +0200)]
ffmpeg: Use side data instead of coded_frame for error[] values

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/snowenc: Export quality/pict_type/PSNR stats through side data
Michael Niedermayer [Tue, 28 Jul 2015 00:17:39 +0000 (02:17 +0200)]
avcodec/snowenc: Export quality/pict_type/PSNR stats through side data

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mpegvideo_enc: export per frame PSNR through side data
Michael Niedermayer [Tue, 28 Jul 2015 00:13:39 +0000 (02:13 +0200)]
avcodec/mpegvideo_enc: export per frame PSNR through side data

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavocdec/mpeg12dec: fix mpeg_xvmc hwaccel flag
James Almer [Tue, 28 Jul 2015 00:09:53 +0000 (21:09 -0300)]
avocdec/mpeg12dec: fix mpeg_xvmc hwaccel flag

The flag is deprecated and as such didn't get a new AV_ prefixed version

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/mpegvideo_enc: move ff_side_data_set_encoder_stats() call to after the vbv...
Michael Niedermayer [Mon, 27 Jul 2015 23:04:55 +0000 (01:04 +0200)]
avcodec/mpegvideo_enc: move ff_side_data_set_encoder_stats() call to after the vbv retry code

This ensures the data matches the final values

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'
Michael Niedermayer [Mon, 27 Jul 2015 22:27:37 +0000 (00:27 +0200)]
Merge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'

* commit 'b7040e67ec18259ca634a0e29d98469b3484a87c':
  h264: fix AVDISCARD_NONKEY for some interlaced content

Conflicts:
libavcodec/h264.c

Not merged, the used field is not initialized where it is used

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'
Michael Niedermayer [Mon, 27 Jul 2015 22:13:51 +0000 (00:13 +0200)]
Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'

* commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf':
  asfdec: do not align Data Object when Broadcast Flag is set

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'db21dde3f72c2331653399bdb8745350f015d847'
Michael Niedermayer [Mon, 27 Jul 2015 22:13:14 +0000 (00:13 +0200)]
Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'

* commit 'db21dde3f72c2331653399bdb8745350f015d847':
  qsvdec_mpeg2: drop an incorrect comment

Conflicts:
libavcodec/qsvdec_mpeg2.c

No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'
Michael Niedermayer [Mon, 27 Jul 2015 22:04:02 +0000 (00:04 +0200)]
Merge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'

* commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead':
  fate: Add hap-chunk ref file

Conflicts:
tests/ref/fate/hap-chunk

See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'
Michael Niedermayer [Mon, 27 Jul 2015 22:02:37 +0000 (00:02 +0200)]
Merge commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7'

* commit 'aaf937ee3557bfb99c2ad298591b22a7f22ecbf7':
  hap: Add utility functions file

Conflicts:
libavcodec/hap.c

No change, no files are/where missing in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '3ee217853a6741b829a2683f49c590618891b1ab'
Michael Niedermayer [Mon, 27 Jul 2015 21:47:01 +0000 (23:47 +0200)]
Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'

* commit '3ee217853a6741b829a2683f49c590618891b1ab':
  Support the Hap chunked frame format

Conflicts:
libavcodec/hap.h
libavcodec/hapdec.c
libavcodec/version.h

See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '43dd004747fa697396b47d034a80e069facbea09'
Michael Niedermayer [Mon, 27 Jul 2015 21:36:37 +0000 (23:36 +0200)]
Merge commit '43dd004747fa697396b47d034a80e069facbea09'

* commit '43dd004747fa697396b47d034a80e069facbea09':
  hap: Move some per-stream setup into decoder init rather than per-frame

Conflicts:
libavcodec/hapdec.c

See: 6074956fa1d2617ac602e49931b06df0a751370e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'b94ec30428b9696f99b08055735689623fe63954'
Michael Niedermayer [Mon, 27 Jul 2015 21:21:23 +0000 (23:21 +0200)]
Merge commit 'b94ec30428b9696f99b08055735689623fe63954'

* commit 'b94ec30428b9696f99b08055735689623fe63954':
  lavc: Update version and APIchanges

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
Michael Niedermayer [Mon, 27 Jul 2015 20:53:16 +0000 (22:53 +0200)]
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'

* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
  lavc: Consistently prefix input buffer defines

Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'def97856de6021965db86c25a732d78689bd6bb0'
Michael Niedermayer [Mon, 27 Jul 2015 20:21:19 +0000 (22:21 +0200)]
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'

* commit 'def97856de6021965db86c25a732d78689bd6bb0':
  lavc: AV-prefix all codec capabilities

Conflicts:
cmdutils.c
ffmpeg.c
ffplay.c
libavcodec/8svx.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/adpcm.c
libavcodec/alac.c
libavcodec/atrac3plusdec.c
libavcodec/bink.c
libavcodec/dnxhddec.c
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/fic.c
libavcodec/flacdec.c
libavcodec/flacenc.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/hevc.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopenjpegdec.c
libavcodec/libvo-aacenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec_float.c
libavcodec/msmpeg4dec.c
libavcodec/mxpegdec.c
libavcodec/nvenc_h264.c
libavcodec/nvenc_hevc.c
libavcodec/pngdec.c
libavcodec/qpeg.c
libavcodec/ra288.c
libavcodec/rv10.c
libavcodec/s302m.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tiff.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/vp9.c
libavcodec/wavpack.c
libavcodec/yop.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
Michael Niedermayer [Mon, 27 Jul 2015 19:14:31 +0000 (21:14 +0200)]
Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'

* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
  lavc: AV-prefix all codec flags

Conflicts:
doc/examples/muxing.c
ffmpeg.c
ffmpeg_opt.c
ffplay.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/ac3enc_float.c
libavcodec/atrac1.c
libavcodec/atrac3.c
libavcodec/atrac3plusdec.c
libavcodec/dcadec.c
libavcodec/ffv1enc.c
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/imc.c
libavcodec/libmp3lame.c
libavcodec/libtheoraenc.c
libavcodec/libtwolame.c
libavcodec/libvpxenc.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/nellymoserdec.c
libavcodec/nellymoserenc.c
libavcodec/nvenc.c
libavcodec/on2avc.c
libavcodec/options_table.h
libavcodec/opus_celt.c
libavcodec/pngenc.c
libavcodec/ra288.c
libavcodec/ratecontrol.c
libavcodec/twinvq.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
libavcodec/vorbisdec.c
libavcodec/vp3.c
libavcodec/wma.c
libavcodec/wmaprodec.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoh264: fix AVDISCARD_NONKEY for some interlaced content
John Högberg [Fri, 24 Jul 2015 13:30:38 +0000 (15:30 +0200)]
h264: fix AVDISCARD_NONKEY for some interlaced content

When skip_frame is set to _NONKEY the decoder skips everything except intra
slices, which breaks frames that consist of an intra field together with any
other field type; half the frame becomes garbage. This patch fixes the issue by
letting non-intra slices through if they're part of a keyframe.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoasfdec: do not align Data Object when Broadcast Flag is set
Alexandra Hájková [Thu, 23 Jul 2015 10:33:37 +0000 (12:33 +0200)]
asfdec: do not align Data Object when Broadcast Flag is set

its size is invalid in this case

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoqsvdec_mpeg2: drop an incorrect comment
Anton Khirnov [Mon, 27 Jul 2015 06:01:09 +0000 (08:01 +0200)]
qsvdec_mpeg2: drop an incorrect comment

It got copypasted from the h264 decoder, but it does not apply to mpeg2.

4 years agofate: Add hap-chunk ref file
Vittorio Giovara [Mon, 27 Jul 2015 15:56:12 +0000 (16:56 +0100)]
fate: Add hap-chunk ref file

Missing from the push of 3ee217853a6741b829a2683f49c590618891b1ab.

4 years agohap: Add utility functions file
Vittorio Giovara [Mon, 27 Jul 2015 15:20:29 +0000 (16:20 +0100)]
hap: Add utility functions file

Missing from the push of 3ee217853a6741b829a2683f49c590618891b1ab.

4 years agoSupport the Hap chunked frame format
Tom Butterworth [Thu, 23 Jul 2015 18:39:29 +0000 (14:39 -0400)]
Support the Hap chunked frame format

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agohap: Move some per-stream setup into decoder init rather than per-frame
Tom Butterworth [Thu, 23 Jul 2015 18:37:08 +0000 (14:37 -0400)]
hap: Move some per-stream setup into decoder init rather than per-frame

This change will reject frames with a texture type which does not match
the stream description.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: Update version and APIchanges
Vittorio Giovara [Thu, 2 Jul 2015 23:50:54 +0000 (00:50 +0100)]
lavc: Update version and APIchanges

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: Consistently prefix input buffer defines
Vittorio Giovara [Mon, 29 Jun 2015 21:48:34 +0000 (23:48 +0200)]
lavc: Consistently prefix input buffer defines

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: AV-prefix all codec capabilities
Vittorio Giovara [Tue, 7 Jul 2015 00:41:27 +0000 (01:41 +0100)]
lavc: AV-prefix all codec capabilities

Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: AV-prefix all codec flags
Vittorio Giovara [Mon, 29 Jun 2015 19:59:37 +0000 (21:59 +0200)]
lavc: AV-prefix all codec flags

Convert doxygen to multiline and express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolavc: Deprecate avctx.me_method
Vittorio Giovara [Tue, 7 Jul 2015 00:20:43 +0000 (01:20 +0100)]
lavc: Deprecate avctx.me_method

This option is extremely codec specific and only a few codecs employ it.
Move it to codec private options instead: mpegenc family supports only 3
values, xavs and x264 use 5, and xvid has a different metric entirely.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agowmv2enc: Check memory allocation
Vittorio Giovara [Fri, 24 Jul 2015 03:24:33 +0000 (04:24 +0100)]
wmv2enc: Check memory allocation

4 years agoac3enc_template: Use the correct context field
Vittorio Giovara [Fri, 24 Jul 2015 04:17:26 +0000 (05:17 +0100)]
ac3enc_template: Use the correct context field

For audio encoders, delay has no effect, use the appropriate one,
initial_padding (see 2df0c32).

4 years agoconfigure: Check for _M_ARMT to detect thumb when using MSVC
Martin Storsjö [Fri, 24 Jul 2015 20:29:17 +0000 (23:29 +0300)]
configure: Check for _M_ARMT to detect thumb when using MSVC

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Check MSVC defines for identifying hardfloat
Martin Storsjö [Fri, 24 Jul 2015 20:25:10 +0000 (23:25 +0300)]
configure: Check MSVC defines for identifying hardfloat

This macro identifies whether VFPv3 is available; MSVC defaults
to hardfloat (except for older MSVC versions for CE, targeting
ARMv4).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Default to armasm for --toolchain=msvc when targeting arm
Martin Storsjö [Fri, 24 Jul 2015 20:23:29 +0000 (23:23 +0300)]
configure: Default to armasm for --toolchain=msvc when targeting arm

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Simplify, remove an unnecessary intermediate variable
Martin Storsjö [Mon, 27 Jul 2015 06:40:28 +0000 (09:40 +0300)]
configure: Simplify, remove an unnecessary intermediate variable

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc: Remove the now unnecessary remark about PATH and link.exe
Martin Storsjö [Sun, 26 Jul 2015 17:23:30 +0000 (20:23 +0300)]
doc: Remove the now unnecessary remark about PATH and link.exe

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoasfdec: interpret the first flag in an asf packet as length flag
Alexandra Hájková [Fri, 24 Jul 2015 09:22:56 +0000 (11:22 +0200)]
asfdec: interpret the first flag in an asf packet as length flag

if the error correction flag is not set, a packet starts with payload

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agocheckasm: Modify report format
Henrik Gramner [Fri, 24 Jul 2015 21:46:20 +0000 (23:46 +0200)]
checkasm: Modify report format

Makes it a bit more clear where each test belongs.

Suggested by Anton Khirnov.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoqsvdec_*: add missing CODEC_CAP_DR1
Anton Khirnov [Sat, 25 Jul 2015 16:03:35 +0000 (18:03 +0200)]
qsvdec_*: add missing CODEC_CAP_DR1

4 years agoavfilter: add acrossfade filter
Paul B Mahol [Thu, 23 Jul 2015 22:13:17 +0000 (22:13 +0000)]
avfilter: add acrossfade filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
Michael Niedermayer [Mon, 27 Jul 2015 19:03:20 +0000 (21:03 +0200)]
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'

* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
  lavc: Deprecate avctx.me_method

Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
Michael Niedermayer [Mon, 27 Jul 2015 18:42:09 +0000 (20:42 +0200)]
Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'

* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
  wmv2enc: Check memory allocation

Conflicts:
libavcodec/wmv2enc.c

See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'
Michael Niedermayer [Mon, 27 Jul 2015 18:32:41 +0000 (20:32 +0200)]
Merge commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09'

* commit 'a67b67944aa9e6e794934d15f9fd9a9cf7173e09':
  ac3enc_template: Use the correct context field

See: 320ce9f284171f8c8d8561cccd2186c27f24898c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/v410enc: do not use internal->byte_buffer
Michael Niedermayer [Sun, 5 Jul 2015 19:13:04 +0000 (21:13 +0200)]
avcodec/v410enc: do not use internal->byte_buffer

it is not optimal when the buffer size is well known at allocation time

This avoids a memcpy()

about 1% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: do not use internal->byte_buffer when little downsizing is expected
Michael Niedermayer [Mon, 27 Jul 2015 18:01:59 +0000 (20:01 +0200)]
avcodec/utils: do not use internal->byte_buffer when little downsizing is expected

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()
Michael Niedermayer [Mon, 6 Jul 2015 09:33:01 +0000 (11:33 +0200)]
avcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: Add a min size parameter to ff_alloc_packet2()
Michael Niedermayer [Mon, 27 Jul 2015 17:36:16 +0000 (19:36 +0200)]
avcodec: Add a min size parameter to  ff_alloc_packet2()

This parameter can be used to inform the allocation code about how much
downsizing might occur, and can be used to optimize how to allocate the
packet

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoAAC Encoder: clipping avoidance
Claudio Freire [Tue, 21 Jul 2015 01:53:24 +0000 (22:53 -0300)]
AAC Encoder: clipping avoidance

Avoid clipping due to quantization noise to produce audible
artifacts, by detecting near-clipping signals and both attenuating
them a little and encoding escape-encoded bands (usually the
loudest) rounding towards zero instead of nearest, which tends to
decrease overall energy and thus clipping.

Currently fate tests measure numerical error so this change makes
tests using asynth (which are near clipping) report higher error
not less, because of window attenuation. Yet, they sound better,
not worse (albeit subtle, other samples aren't subtle at all).
Only measuring psychoacoustically weighted error would make for
a representative test, so that will be left for a future patch.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mpegts: Replace silent cliping of language_count by asserts
Michael Niedermayer [Mon, 27 Jul 2015 16:03:53 +0000 (18:03 +0200)]
avformat/mpegts: Replace silent cliping of language_count by asserts

Failure should not be possible, if it does occur then the code is
buggy and should be fixed not silently clip

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 bilinear functions
Shivraj Patil [Mon, 27 Jul 2015 11:59:34 +0000 (17:29 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 bilinear functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles
Michael Niedermayer [Mon, 27 Jul 2015 13:13:50 +0000 (15:13 +0200)]
avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles

Fixes Ticket4200

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'
Michael Niedermayer [Mon, 27 Jul 2015 11:20:12 +0000 (13:20 +0200)]
Merge commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c'

* commit '60a21b3d81c1a11cf5a08950eadd4e84ca2e597c':
  configure: Check for _M_ARMT to detect thumb when using MSVC

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '616b409c8f1e4fa568908212c01f6530da8d2e71'
Michael Niedermayer [Mon, 27 Jul 2015 11:07:46 +0000 (13:07 +0200)]
Merge commit '616b409c8f1e4fa568908212c01f6530da8d2e71'

* commit '616b409c8f1e4fa568908212c01f6530da8d2e71':
  configure: Check MSVC defines for identifying hardfloat

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'
Michael Niedermayer [Mon, 27 Jul 2015 11:00:03 +0000 (13:00 +0200)]
Merge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'

* commit '2192ff84dd720968108bc1ca54e239f4c94eb61d':
  configure: Default to armasm for --toolchain=msvc when targeting arm

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