James Almer [Fri, 7 Apr 2017 03:01:00 +0000 (00:01 -0300)]
Merge commit '
d30719e62de68975cbc7ffd318df03a183037563'
* commit '
d30719e62de68975cbc7ffd318df03a183037563':
hwcontext_vaapi: Don't abort on failing to allocate from a fixed-size pool
This commit is a noop, see
2b8151c80690a71db2cf8009855b4ae1a6abdd4c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 7 Apr 2017 02:45:20 +0000 (23:45 -0300)]
Merge commit '
4adbb44ad154cec05e87de60bb827a13c0fe87df'
* commit '
4adbb44ad154cec05e87de60bb827a13c0fe87df':
tta: avoid undefined shifts
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 7 Apr 2017 02:43:56 +0000 (23:43 -0300)]
Merge commit '
dc4b62502876c0ebeeba317233cd1348c5b0b2b7'
* commit '
dc4b62502876c0ebeeba317233cd1348c5b0b2b7':
tta: use get_unary() instead of a custom implementation
This commit is a noop, see
58b36959dd095c38ffd181e2b1f647b6df61773c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 7 Apr 2017 02:36:16 +0000 (23:36 -0300)]
Merge commit '
e122b12c88487ac8766ff4eb071856b0666f0134'
* commit '
e122b12c88487ac8766ff4eb071856b0666f0134':
build: Drop gcrypt support
This commit is a noop. GCrypt support is exposed in configure as a
command line option, and it's independent of GnuTLS.
Merged-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 7 Apr 2017 01:36:17 +0000 (03:36 +0200)]
avcodec/dvdsubdec: Fixes 2 runtime error: left shift of 170 by 24 places cannot be represented in type 'int'
Fixes: 619/clusterfuzz-testcase-
5803914534322176
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 6 Apr 2017 22:43:46 +0000 (00:43 +0200)]
avcodec/bitpacked: Fix mixed declarations and statement
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 6 Apr 2017 20:46:47 +0000 (22:46 +0200)]
ffmpeg: Change duration to int64_t
It is assigned from 64bit input in some branches and used with 64bit timestamps
This thus fixes a potential integer truncation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
wm4 [Thu, 6 Apr 2017 15:35:32 +0000 (17:35 +0200)]
pthread_frame: don't return stale error codes after flush
Consider the following sequence of events:
- open a codec without AV_CODEC_CAP_DELAY
- decode call fails with an error
- ff_thread_flush() is called
- drain packet is sent
Then the last step would make ff_thread_decode_frame() return an error,
because p->result can still be set to an error value. This is because
submit_packet returns immediately if AV_CODEC_CAP_DELAY is not set, and
no worker thread gets the chance to reset p->result, yet its value is
trusted by ff_thread_decode_frame().
Fix this by clearing the error fields on flush.
James Almer [Thu, 6 Apr 2017 14:45:58 +0000 (11:45 -0300)]
avcodec: fix containts typo
Steve Lhomme [Sun, 2 Apr 2017 08:08:25 +0000 (10:08 +0200)]
avformat/dump : Display Content Light Level metadata
Signed-off-by: James Almer <jamrial@gmail.com>
Steve Lhomme [Mon, 3 Apr 2017 07:29:46 +0000 (09:29 +0200)]
lavc: Add Content Light Level side metadata found in HEVC
These data are necessary when transmitting HDR over HDMI.
Signed-off-by: James Almer <jamrial@gmail.com>
Steve Lhomme [Mon, 3 Apr 2017 07:29:45 +0000 (09:29 +0200)]
lavu: add support for Content Light Level side metadata
As found in HEVC.
Signed-off-by: James Almer <jamrial@gmail.com>
Shivraj Patil [Tue, 4 Apr 2017 13:26:01 +0000 (18:56 +0530)]
build fix for mips
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Wed, 5 Apr 2017 20:19:55 +0000 (16:19 -0400)]
vp8: make mv_min/max thread-local if using partition threading.
Fixes tsan warnings like this in fate-vp8-test-vector-007:
WARNING: ThreadSanitizer: data race (pid=65909)
Write of size 4 at 0x7d8c0000e088 by thread T1:
#0 vp8_decode_mb_row_sliced vp8.c:2519 (ffmpeg:x86_64+0x100995ede)
[..]
Previous write of size 4 at 0x7d8c0000e088 by thread T2:
#0 vp8_decode_mb_row_sliced vp8.c:2519 (ffmpeg:x86_64+0x100995ede)
Ronald S. Bultje [Wed, 5 Apr 2017 20:18:54 +0000 (16:18 -0400)]
vp8: make wait/thread_mb_pos atomic.
Fixes tsan warnings like this in fate-vp8-test-vector-007:
WARNING: ThreadSanitizer: data race (pid=3590)
Write of size 4 at 0x7d8c0000e07c by thread T2:
#0 decode_mb_row_no_filter src/libavcodec/vp8.c:2330 (ffmpeg+0x000000ffb59e)
[..]
Previous write of size 4 at 0x7d8c0000e07c by thread T1:
#0 decode_mb_row_no_filter src/libavcodec/vp8.c:2330 (ffmpeg+0x000000ffb59e)
Ronald S. Bultje [Wed, 5 Apr 2017 11:49:14 +0000 (07:49 -0400)]
x86/idctdsp_init: reindent.
Ronald S. Bultje [Tue, 4 Apr 2017 16:45:51 +0000 (12:45 -0400)]
jrev/xvid: hardcode use of C put/add_pixels_clamped.
This removes the last use of the ff_put/add_pixels_clamped global
function pointers, and as such they are removed.
This patch has a negative effect on performance on MIPS, since there's
a SIMD-optimized put/add_pixels_clamped, but no xvid or jrev. From a
code maintenance point of view, that is probably acceptable.
Because the global function pointers are removed, this fixes the following
tsan warnings when running e.g. fate-dnxhr-parse:
WARNING: ThreadSanitizer: data race (pid=29917)
Write of size 8 at 0x0000025b12d8 by thread T2 (mutexes: write M1543):
#0 ff_idctdsp_init src/libavcodec/idctdsp.c:313 (ffmpeg+0x00000044b68e)
[..]
Previous write of size 8 at 0x0000025b12d8 by thread T1 (mutexes: write M1541):
#0 ff_idctdsp_init src/libavcodec/idctdsp.c:313 (ffmpeg+0x00000044b68e)
Ronald S. Bultje [Tue, 4 Apr 2017 16:42:58 +0000 (12:42 -0400)]
x86/simple_idct: add explicit sse2 simple_idct_put/add versions.
These use the mmx IDCT, but sse2 put/add_pixels_clamped implementations.
This way we don't need to use the ff_put/add_pixels_clamped function
pointers.
Ronald S. Bultje [Tue, 4 Apr 2017 16:17:08 +0000 (12:17 -0400)]
cavs: add a sse2 idct implementation.
This makes using the function pointer ff_add_pixels_clamped() unnecessary,
since we always know what the best implementation is at compile-time.
Ronald S. Bultje [Tue, 4 Apr 2017 15:55:16 +0000 (11:55 -0400)]
cavs: convert idct from inline asm to yasm.
Ronald S. Bultje [Tue, 4 Apr 2017 15:21:43 +0000 (11:21 -0400)]
x86/xvididct: remove use of ff_put/add_pixels_clamped function pointer.
Since there's separate SSE2 implementations of xvid_idct_put/add, this
patch has no practical impact on performance.
Ronald S. Bultje [Tue, 4 Apr 2017 15:20:39 +0000 (11:20 -0400)]
idct_arm: remove use of ff_put/add_pixels_clamped function pointer.
Instead, hardcode the use of the _arm implementation of add_pixels,
and use the C version for put_pixels (as no arm-optimized version
exists). Since there's separate implementations of idct{,_put,_add}
for neon, this has no practical impact on performance.
Ronald S. Bultje [Mon, 3 Apr 2017 14:24:05 +0000 (10:24 -0400)]
pthread_frame: allow per-field ThreadFrame owners.
This tries to handle cases where separate invocations of decode_frame()
(each running in separate threads) write to respective fields in the
same AVFrame->data[]. Having per-field owners makes interaction between
readers (the referencing thread) and writers (the decoding thread)
slightly more optimal if both accesses are field-based, since they will
use the respective producer's thread objects (mutex/cond) instead of
sharing the thread objects of the first field's producer.
In practice, this fixes the following tsan-warning in fate-h264:
WARNING: ThreadSanitizer: data race (pid=21615)
Read of size 4 at 0x7d640000d9fc by thread T2 (mutexes: write M1006):
#0 ff_thread_report_progress pthread_frame.c:569 (ffmpeg:x86_64+0x100f7cf54)
[..]
Previous write of size 4 at 0x7d640000d9fc by main thread (mutexes: write M1004):
#0 update_context_from_user pthread_frame.c:335 (ffmpeg:x86_64+0x100f81abb)
Thierry Foucu [Wed, 5 Apr 2017 20:23:31 +0000 (13:23 -0700)]
libavformat/mov: Fix memory leak, need to free the chapter tracks array
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tiejun.peng@foxmail.com [Tue, 4 Apr 2017 14:12:19 +0000 (22:12 +0800)]
avformat/ftp: Solve a crash bug when network occur a exception
This fixes a proble where ffmpeg would cause crash to do a seek when the network disconnect.
The log like this:
01-01 10:53:03.441 6580 6580 F DEBUG : backtrace:
01-01 10:53:03.441 6580 6580 F DEBUG : #00 pc
0002942e /system/lib/libavformat.so (ffurl_write+9)
Signed-off-by: tiejun.peng <tiejun.peng@foxmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 3 Apr 2017 20:18:14 +0000 (22:18 +0200)]
avcodec/dvbsubdec: Replace fprintf(stderr) by av_log()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rostislav Pehlivanov [Wed, 5 Apr 2017 19:51:13 +0000 (20:51 +0100)]
bitpacked: fix potential overflow
Fixes: CID1404842
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Ronald S. Bultje [Tue, 4 Apr 2017 02:28:22 +0000 (22:28 -0400)]
huffyuv: assign correct per-thread avctx pointer to HYuvContext::avctx.
Fixes the following tsan warning when running fate-vsynth_lena-ffvhuff:
WARNING: ThreadSanitizer: data race (pid=6484)
Write of size 8 at 0x7d64000154b8 by main thread (mutexes: write M1331):
#0 update_context_from_user src/libavcodec/pthread_frame.c:331 (ffmpeg+0x000000dca887)
[..]
Previous read of size 8 at 0x7d64000154b8 by thread T2 (mutexes: write M1334):
#0 draw_slice src/libavcodec/huffyuvdec.c:857 (ffmpeg+0x000000bcc86f)
Kyle Swanson [Wed, 5 Apr 2017 16:43:12 +0000 (11:43 -0500)]
avfilter/af_loudnorm: do not upsample during second-pass linear normalization
Signed-off-by: Kyle Swanson <k@ylo.ph>
Clément Bœsch [Wed, 5 Apr 2017 16:38:33 +0000 (18:38 +0200)]
doc/general: fix project name after
2b1a6b1ae
Damien Riegel [Fri, 31 Mar 2017 15:36:16 +0000 (11:36 -0400)]
rtp: rfc4175: add handler for YCbCr-4:2:2
This adds partial support for the RFC 4175 (raw video over RTP). The
only supported formats are the YCbCr-4:2:2 8 bit because it's natively
supported by FFmpeg with pixel format UYVY, and 10 bit which requires
the vrawdepay codec to convert the payload in a format handled by
FFmpeg.
Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Damien Riegel [Fri, 31 Mar 2017 15:36:15 +0000 (11:36 -0400)]
codec: bitpacked: add decoder
Add a codec capable of decoding some formats of the RFC4175. For now
it's only capable of handling YCbCr-4:2:2 with 8-bit or 10-bit depth.
For 8-bit it's a simple pass-through, for 10-bit it depacks the stream
in the AV_PIX_FMT_YUV422P10 pixel format.
Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
James Almer [Tue, 4 Apr 2017 19:16:57 +0000 (16:16 -0300)]
Merge commit '
bf2f748fc74fff5272075e1fe1c07b4152421526'
* commit '
bf2f748fc74fff5272075e1fe1c07b4152421526':
configure: Use correct libm linker flag during math function checks
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 19:15:02 +0000 (16:15 -0300)]
Merge commit '
ce6f780bc6656ad3895f81a988b239ad3c8af4b8'
* commit '
ce6f780bc6656ad3895f81a988b239ad3c8af4b8':
configure: Add missing asyncts filter, movie filter, and output example deps
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 19:08:21 +0000 (16:08 -0300)]
Merge commit '
04698d528cac334b6b5cabd3384f01406a766285'
* commit '
04698d528cac334b6b5cabd3384f01406a766285':
configure: Use correct variable name in libsnappy test
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 19:06:02 +0000 (16:06 -0300)]
Merge commit '
30f0d1b997f15d667c05feab0b54f0b2814ba7a9'
* commit '
30f0d1b997f15d667c05feab0b54f0b2814ba7a9':
configure: Remove old avisynth support leftover
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 19:04:29 +0000 (16:04 -0300)]
Merge commit '
6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f'
* commit '
6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f':
arm: warn/error on movrelx usage problematic with PIC on ELF
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 19:03:05 +0000 (16:03 -0300)]
Merge commit '
5bcc6f76f180d0f88269018727c92fc562fb8abb'
* commit '
5bcc6f76f180d0f88269018727c92fc562fb8abb':
configure: Disable warning C4703 with MSVC
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:59:56 +0000 (15:59 -0300)]
Merge commit '
bd9cd04626a98a752c5771d057a6b86779359904'
* commit '
bd9cd04626a98a752c5771d057a6b86779359904':
w32pthreads: Fix function pointer casts
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:58:11 +0000 (15:58 -0300)]
Merge commit '
233d50b275dd7cf6cc0656851e670e1b2dfba56f'
* commit '
233d50b275dd7cf6cc0656851e670e1b2dfba56f':
qt-faststart: Do not try to use fancy 64-bit seeking functions on mingw32ce
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:56:36 +0000 (15:56 -0300)]
Merge commit '
537b5b773b317af79d3a5b576ee9683e15ed84f6'
* commit '
537b5b773b317af79d3a5b576ee9683e15ed84f6':
rtmpdh: Do global initialization before running the test
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:53:58 +0000 (15:53 -0300)]
Merge commit '
2f99117f6ff24ce5be2abb9e014cb8b86c2aa0e0'
* commit '
2f99117f6ff24ce5be2abb9e014cb8b86c2aa0e0':
aarch64: vp9itxfm: Don't repeatedly set x9 when nothing overwrites it
This commit is a noop, see
37cb224e3e65b92eb6d77f1a788d882fbee972c3
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:51:14 +0000 (15:51 -0300)]
Merge commit '
2dbe2aa2c2d4f02d2669feae45dee4fc45414813'
* commit '
2dbe2aa2c2d4f02d2669feae45dee4fc45414813':
rdt: Convert to the new bitstream reader
ogg: Convert to the new bitstream reader
mpegts: Convert to the new bitstream reader
xsubdec: Convert to the new bitstream reader
xan: Convert to the new bitstream reader
wnv1: Convert to the new bitstream reader
vima: Convert to the new bitstream reader
vble: Convert to the new bitstream reader
utvideodec: Convert to the new bitstream reader
twinvq: Convert to the new bitstream reader
tscc2: Convert to the new bitstream reader
truespeech: Convert to the new bitstream reader
tiertex: Convert to the new bitstream reader
truemotion2: Convert to the new bitstream reader
svq1dec: Convert to the new bitstream reader
smacker: Convert to the new bitstream reader
sipr: Convert to the new bitstream reader
rtjpeg: Convert to the new bitstream reader
ra288: Convert to the new bitstream reader
ra144: Convert to the new bitstream reader
This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:42:18 +0000 (15:42 -0300)]
Merge commit '
79566ec8c77969d5f9be533de04b1349834cca62'
* commit '
79566ec8c77969d5f9be533de04b1349834cca62':
arm: vp9itxfm: Rename a macro parameter to fit better
This commit is a noop, see
f69dd26df55539072dc2fa340384f808b5b3d3e1
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:38:15 +0000 (15:38 -0300)]
Merge commit '
721bc37522c5c1d6a8c3cea5e9c3fcde8d256c05'
* commit '
721bc37522c5c1d6a8c3cea5e9c3fcde8d256c05':
arm/aarch64: vp9itxfm: Fix indentation of macro arguments
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:28:56 +0000 (15:28 -0300)]
Merge commit '
06fec74cacbb0ef7f3e5ea0e6c9ced1b6fd7565d'
* commit '
06fec74cacbb0ef7f3e5ea0e6c9ced1b6fd7565d':
checkasm: vp9dsp: benchmark all sub-IDCTs (but not WHT or ADST).
This commit is a noop, see
1c8fbd7b90469f69fe3a3f78ba7886195d97c34f
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:26:18 +0000 (15:26 -0300)]
Merge commit '
effc1430b2fe5997d9d55bf28dc507c27125eb27'
* commit '
effc1430b2fe5997d9d55bf28dc507c27125eb27':
Revert "checkasm: vp9dsp: Benchmark the dc-only version of idct_idct separately"
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:07:57 +0000 (15:07 -0300)]
Merge commit '
12ab667e219e7fbf8e9aef3731039b75c822df25'
* commit '
12ab667e219e7fbf8e9aef3731039b75c822df25':
matroska: use av_stream_add_side_data() for stereo3d side data
mov: Use av_stream_add_side_data() for displaymatrix side data
utils: Add av_stream_add_side_data()
This is a noop, see
2ab50647ff653ab45d9d78203b6a671124609991
77f033eb98d0d7d05f3aa238409d87fb1f6096b3
2343f23e4d7e0d0f6adfd83d7d769a7a115dbd17
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 18:03:34 +0000 (15:03 -0300)]
Merge commit '
286ab878bd39b56008035638227b3ecb8ec5bbb7'
* commit '
286ab878bd39b56008035638227b3ecb8ec5bbb7':
fate.sh: Allow setting other make flags for running tests
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 17:51:46 +0000 (14:51 -0300)]
Merge commit '
aa498c3183236a93206b4a0e8225b9db0660b50d'
* commit '
aa498c3183236a93206b4a0e8225b9db0660b50d':
avpacket: fix leak on realloc in av_packet_add_side_data()
This commit is a noop, see
574929d8b6de32ae712fcca7ab09f01a3e4616be
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 17:47:09 +0000 (14:47 -0300)]
Merge commit '
c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65'
* commit '
c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65':
examples/decode_video: allocate the packet dynamically
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 17:41:23 +0000 (14:41 -0300)]
Merge commit '
728ea23cce07467b732f538c87c13da13dd6dcf3'
* commit '
728ea23cce07467b732f538c87c13da13dd6dcf3':
examples/decode_video: switch to the new decoding API
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 4 Apr 2017 17:34:52 +0000 (14:34 -0300)]
Merge commit '
f78d360bba6dcfb585847a49a84e89c25950fbdb'
* commit '
f78d360bba6dcfb585847a49a84e89c25950fbdb':
examples/decode_video: use a parser for splitting the input
Merged-by: James Almer <jamrial@gmail.com>
Matthieu Bouron [Mon, 3 Apr 2017 14:32:50 +0000 (16:32 +0200)]
doc/examples/extract_mvs: re-indent after previous commit
Matthieu Bouron [Mon, 3 Apr 2017 14:15:58 +0000 (16:15 +0200)]
doc/examples/extract_mvs: make pkt local to the main function
Matthieu Bouron [Mon, 3 Apr 2017 13:25:09 +0000 (15:25 +0200)]
doc/examples/extract_mvs: switch to new decoding API
Clément Bœsch [Tue, 4 Apr 2017 09:48:23 +0000 (11:48 +0200)]
Merge commit '
59ab9e8ba1df7e3347a4cd2bd56c32e74aede802'
* commit '
59ab9e8ba1df7e3347a4cd2bd56c32e74aede802':
examples/encode_video: allocate the packet dynamically
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 4 Apr 2017 09:44:45 +0000 (11:44 +0200)]
Merge commit '
5f102a9559099429826e84758b8b5182244c52db'
* commit '
5f102a9559099429826e84758b8b5182244c52db':
examples/encode_video: switch to the new encoding API
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 4 Apr 2017 09:40:34 +0000 (11:40 +0200)]
Merge commit '
fee0f1de2c6a9924acb74013436dbea8f2bd1ecb'
* commit '
fee0f1de2c6a9924acb74013436dbea8f2bd1ecb':
examples/decode_audio: flush the decoder
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 4 Apr 2017 09:38:56 +0000 (11:38 +0200)]
Merge commit '
9a38184a143a1560814b084aebe628f8df46e666'
* commit '
9a38184a143a1560814b084aebe628f8df46e666':
examples/decode_audio: allocate the packet dynamically
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 4 Apr 2017 09:37:11 +0000 (11:37 +0200)]
Merge commit '
45a1ce2ff7688656aacd53c27de5815a7ec13afe'
* commit '
45a1ce2ff7688656aacd53c27de5815a7ec13afe':
examples/decode_audio: handle planar audio now produced by the MP2 decoder
This commit is a noop, we use a simpler and more generic method to write
the samples.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 4 Apr 2017 09:33:04 +0000 (11:33 +0200)]
Merge commit '
3d66717f7cb5555257244be8f5bce172ed3af7ac'
* commit '
3d66717f7cb5555257244be8f5bce172ed3af7ac':
examples/decode_audio: use the new audio decoding API
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 4 Apr 2017 09:27:37 +0000 (11:27 +0200)]
Merge commit '
0946c754d99c05413e813ee515039adcf0f9232a'
* commit '
0946c754d99c05413e813ee515039adcf0f9232a':
examples/decode_audio: use a parser for splitting the input
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Tue, 4 Apr 2017 09:17:35 +0000 (11:17 +0200)]
examples/decode_audio: reduce the scope of 2 variables
Clément Bœsch [Tue, 4 Apr 2017 07:58:29 +0000 (09:58 +0200)]
lavc: add AV_ prefix to CODEC_CAP_DELAY in doxy
Matthieu Bouron [Tue, 4 Apr 2017 07:12:42 +0000 (09:12 +0200)]
lavc/mediacodecdec: set AV_CODEC_CAP_AVOID_PROBING capability
Matthieu Bouron [Tue, 4 Apr 2017 07:07:54 +0000 (09:07 +0200)]
lavc/mediacodecdec: switch to AV_CODEC_CAP_DELAY
Hendrik Leppkes [Tue, 4 Apr 2017 07:33:23 +0000 (09:33 +0200)]
stdatomic/win32: only include the lean windows headers to avoid conflicts
Nicolas George [Mon, 3 Apr 2017 10:13:30 +0000 (12:13 +0200)]
doc/muxers: fix default value for image2 option start_number.
wm4 [Thu, 30 Mar 2017 14:58:04 +0000 (16:58 +0200)]
ffprobe: port to new decode API
Not sure if it behaves ideally in presence of decoding errors.
Thomas Turner [Sun, 2 Apr 2017 22:27:57 +0000 (15:27 -0700)]
tests/fate/filter-video: add owdenoise test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 1 Apr 2017 17:18:36 +0000 (19:18 +0200)]
avformat/mov: Check creation_time for overflow
Fixes integer overflow
Fixes: 701640
Found-by: Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 3 Apr 2017 21:08:43 +0000 (18:08 -0300)]
avcodec/Makefile: fix truehd encoder dependencies
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Sun, 2 Apr 2017 20:07:04 +0000 (22:07 +0200)]
avfilter/vf_pad: add aspect option
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Mon, 3 Apr 2017 19:12:15 +0000 (21:12 +0200)]
Merge commit '
f27e262dbdea1991b22e08b639ac03e642a3482c'
* commit '
f27e262dbdea1991b22e08b639ac03e642a3482c':
examples/encode_audio: switch to the new audio encoding API
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 19:10:07 +0000 (21:10 +0200)]
Merge commit '
44c9f374f188f92927b7a4aad2101289d446b814'
* commit '
44c9f374f188f92927b7a4aad2101289d446b814':
examples/qsvdec: convert to the new decoding API
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 19:07:59 +0000 (21:07 +0200)]
Merge commit '
1dd2b6c91ca5f26207805720d4f5564de60b241b'
* commit '
1dd2b6c91ca5f26207805720d4f5564de60b241b':
examples/qsvdec: switch to the hwcontext API
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 19:05:03 +0000 (21:05 +0200)]
Merge commit '
f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d'
* commit '
f92d7bdfddfaac04b3bb31f2749d173ca1d8ba6d':
libopusdec: default to stereo for invalid number of channels
This commit is a noop, see
8c8f543b81aa2b50bb6a6cfd370a0061281492a3
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 19:02:54 +0000 (21:02 +0200)]
Merge commit '
b34c6cd57a2e8aad5f773aea933f77883de320ec'
* commit '
b34c6cd57a2e8aad5f773aea933f77883de320ec':
dvbsub: cosmetics: Group all debug code together
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:57:03 +0000 (20:57 +0200)]
Merge commit '
b8cd7a3c8df2c3aac8d7a0b5a02d83caf61bd769'
* commit '
b8cd7a3c8df2c3aac8d7a0b5a02d83caf61bd769':
dvbsub: Check for errors from system()
printf(...) replaced with fprintf(stderr, ...) for logging errors.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:54:04 +0000 (20:54 +0200)]
Merge commit '
6427379f23eb4d2b82d8d274c616f68b65a2f723'
* commit '
6427379f23eb4d2b82d8d274c616f68b65a2f723':
als: Restructure DEBUG ifdefs to avoid unused function parameter warnings
ac3enc: Restructure DEBUG ifdefs to avoid unused function parameter warnings
ape: Restructure DEBUG ifdefs to avoid unused function parameter warnings
These 3 commits are not merged.
These commits were actually controversial in Libav. A good rationale can
be found here:
https://lists.libav.org/pipermail/libav-devel/2016-November/080698.htm
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:50:03 +0000 (20:50 +0200)]
Merge commit '
bdbb8c68668b7610f5a310f5bbb246d2b950426d'
* commit '
bdbb8c68668b7610f5a310f5bbb246d2b950426d':
doc: Add libxavs section
Merged-by: Clément Bœsch <u@pkh.me>
Ronald S. Bultje [Mon, 3 Apr 2017 18:43:40 +0000 (14:43 -0400)]
png: set AVFrame flags/fields before calling setup_finished().
Fixes tsan warnings in fate-apng:
WARNING: ThreadSanitizer: data race (pid=51230)
Read of size 4 at 0x7d50000042fc by main thread (mutexes: write M1000):
#0 frame_copy_props frame.c:302 (ffmpeg:x86_64+0x1019a35d6)
[..]
Previous write of size 4 at 0x7d50000042fc by thread T1 (mutexes: write M997):
#0 decode_idat_chunk pngdec.c:708 (ffmpeg:x86_64+0x100f5562a)
Clément Bœsch [Mon, 3 Apr 2017 18:45:35 +0000 (20:45 +0200)]
Merge commit '
97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21'
* commit '
97cd7a3dc005a0ad1656dbb2af92e9c5d0731f21':
rtpdec_mpeg4: const correctness for parse_fmtp_config()
This commit is a noop, see
ed491db3e506c0e1ee6b9281ce898c4a79298e0f
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:43:45 +0000 (20:43 +0200)]
Clément Bœsch [Mon, 3 Apr 2017 18:41:16 +0000 (20:41 +0200)]
Merge commit '
a1d9de304fe63614e3aa8117fef17491fa80093d'
* commit '
a1d9de304fe63614e3aa8117fef17491fa80093d':
Fix some mismatches between function parameter and doxygen parameter names.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:40:36 +0000 (20:40 +0200)]
Merge commit '
4d960a11855f4212eb3a4e470ce890db7f01df29'
* commit '
4d960a11855f4212eb3a4e470ce890db7f01df29':
aarch64: vp9itxfm: Use w3 instead of x3 for the int eob parameter
This commit is a noop, see
a95e7de41dc3f5c8b4738582111f9470e674742a
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:40:16 +0000 (20:40 +0200)]
Merge commit '
e5b0fc170f85b00f7dd0ac514918fb5c95253d39'
* commit '
e5b0fc170f85b00f7dd0ac514918fb5c95253d39':
arm: vp9itxfm: Simplify the stack alignment code
This commit is a noop, see
a71cd8439fd32fd83b7a9b9ac8d6f861846770c7
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:39:05 +0000 (20:39 +0200)]
Merge commit '
3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8'
* commit '
3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8':
hlsenc: Fix the openssl support
This commit is a noop, see
edc43c571d66b07315f99d00b5ada667fc77b932
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 3 Apr 2017 18:36:31 +0000 (20:36 +0200)]
Merge commit '
0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'
* commit '
0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9': (35 commits)
qdm2: Convert to the new bitstream reader
qcelp: Convert to the new bitstream reader
pcx: Convert to the new bitstream reader
opus: Convert to the new bitstream reader
nellymoser: Convert to the new bitstream reader
jvdec: Convert to the new bitstream reader
hqx: Convert to the new bitstream header
hq_hqa: Convert to the new bitstream reader
gsm: Convert to the new bitstream reader
g72x: Convert to the new bitstream reader
g2meet: Convert to the new bitstream reader
fraps: Convert to the new bitstream reader
flashsv: Convert to the new bitstream reader
faxcompr: Convert to the new bitstream reader
exr: Convert to the new bitstream reader
escape130: Convert to the new bitstream reader
escape124: Convert to the new bitstream reader
dvdsubdec: Convert to the new bitstream reader
dss_sp: Convert to the new bitstream reader
cook: Convert to the new bitstream reader
...
This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: Clément Bœsch <u@pkh.me>
Ronald S. Bultje [Mon, 3 Apr 2017 14:08:29 +0000 (10:08 -0400)]
png: split header state and data state in two separate variables.
Fixes a reported (but false) race condition in tsan for fate-apng:
WARNING: ThreadSanitizer: data race (pid=6274)
Read of size 4 at 0x7d680001ec78 by main thread (mutexes: write M1338):
#0 update_thread_context src/libavcodec/pngdec.c:1456 (ffmpeg+0x000000dacf0c)
[..]
Previous write of size 4 at 0x7d680001ec78 by thread T1 (mutexes: write M1335):
#0 decode_idat_chunk src/libavcodec/pngdec.c:737 (ffmpeg+0x000000dae951)
Ronald S. Bultje [Mon, 3 Apr 2017 13:51:10 +0000 (09:51 -0400)]
hevc: only write to max_ra and pocTid0 in the first slice.
Values from subsequent values are guaranteed to be identical (since
poc and nal_unit_type are checked to be the same between slices), so
this doesn't affect output in any way, but does resolve the remaining
reported race conditions (by tsan) in fate-hevc.
In practice, this fixes tsan warnings like this:
WARNING: ThreadSanitizer: data race (pid=25334)
Read of size 4 at 0x7d9c0001adcc by main thread (mutexes: write M1386):
#0 hevc_update_thread_context src/libavcodec/hevcdec.c:3310 (ffmpeg+0x000000b41c7c)
[..]
Previous write of size 4 at 0x7d9c0001adcc by thread T1 (mutexes: write M1383):
#0 hls_slice_header src/libavcodec/hevcdec.c:596 (ffmpeg+0x000000b43a22)
Ronald S. Bultje [Mon, 3 Apr 2017 13:48:53 +0000 (09:48 -0400)]
pthread_frame: call update_context_from_user() after acquiring lock.
Otherwise the thread may still be in the middle of decoding a previous
frame, which would effectively trigger a race condition on any field
concurrently read and written.
In practice, this fixes tsan warnings like the following:
WARNING: ThreadSanitizer: data race (pid=17380)
Write of size 4 at 0x7d64000160fc by main thread:
#0 update_context_from_user src/libavcodec/pthread_frame.c:335 (ffmpeg+0x000000dca515)
[..]
Previous read of size 4 at 0x7d64000160fc by thread T2 (mutexes: write M1821):
#0 ff_thread_report_progress src/libavcodec/pthread_frame.c:565 (ffmpeg+0x000000dcb08a)
Ronald S. Bultje [Fri, 31 Mar 2017 15:27:20 +0000 (11:27 -0400)]
ffmpeg: make transcode_init_done atomic.
Should fix tsan warnings in fate-fifo-muxer-h264/wav:
WARNING: ThreadSanitizer: data race (pid=26552)
Write of size 4 at 0x000001e0d7c0 by main thread:
#0 transcode_init src/ffmpeg.c:3761 (ffmpeg+0x00000050ca1c)
[..]
Previous read of size 4 at 0x000001e0d7c0 by thread T1:
#0 decode_interrupt_cb src/ffmpeg.c:460 (ffmpeg+0x0000004fde19)
Ronald S. Bultje [Mon, 3 Apr 2017 13:36:32 +0000 (09:36 -0400)]
codec_desc: mark some lossless audio codecs as intraonly.
Fixes tsan warnings in several audio codecs (flac, alac, wavpack, tta
and tak) that look like this:
WARNING: ThreadSanitizer: data race (pid=14340)
Read of size 4 at 0x7d64000169d8 by main thread (mutexes: write M1335):
#0 update_context_from_thread src/libavcodec/pthread_frame.c:284 (ffmpeg+0x000000dc795f)
[..]
Previous write of size 4 at 0x7d64000169d8 by thread T1 (mutexes: write M1333):
#0 wavpack_decode_block src/libavcodec/wavpack.c:1012 (ffmpeg+0x00000112b175)
Ronald S. Bultje [Mon, 3 Apr 2017 13:25:15 +0000 (09:25 -0400)]
h264: don't sync pic_id between threads.
This is how the ref list manager links bitstream IDs to H264Picture/Ref
objects, and is local to the producer thread. There is no need for the
consumer thread to know the bitstream IDs of its references in their
respective producer threads.
In practice, this fixes tsan warnings when running fate-h264:
WARNING: ThreadSanitizer: data race (pid=19295)
Read of size 4 at 0x7dbc0000e614 by main thread (mutexes: write M1914):
#0 ff_h264_ref_picture src/libavcodec/h264_picture.c:112 (ffmpeg+0x0000013b3709)
[..]
Previous write of size 4 at 0x7dbc0000e614 by thread T2 (mutexes: write M1917):
#0 build_def_list src/libavcodec/h264_refs.c:91 (ffmpeg+0x0000013b46cf)
Martin Vignali [Sun, 2 Apr 2017 19:13:01 +0000 (21:13 +0200)]
fate : add test for exr with offset table set to 0
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sun, 2 Apr 2017 19:11:32 +0000 (21:11 +0200)]
libavcodec/exr : fix scanline offset table recreation on big endian
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jun Zhao [Wed, 29 Mar 2017 09:18:59 +0000 (17:18 +0800)]
lavc/vaapi_encode: fix p_per_i calculate issue.
now gop_size <= (max_b_frames + 1) * p_per_i + 1 (IDR frame),
so celing p_per_i = (gop_size - 1 + max_b_frames) / (max_b_frames + 1)
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Leilei <leilei.shang@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
Mark Thompson [Sun, 2 Apr 2017 21:55:33 +0000 (22:55 +0100)]
Changelog: fix position of VAAPI MPEG-2/VP8 encode entry
This was merged in the wrong place.