]>
git.sesse.net Git - ffmpeg/log
Hendrik Leppkes [Mon, 8 Aug 2016 13:27:41 +0000 (15:27 +0200)]
cmdutils: remove the current working directory from the DLL search path on win32
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Burt P [Mon, 8 Aug 2016 16:14:08 +0000 (11:14 -0500)]
af_hdcd: Don't warn if converting from AV_SAMPLE_FMT_S16P
Also checking AVFilterLink->type is AVMEDIA_TYPE_AUDIO before
calling av_get_sample_fmt_name() on AVFilterLink->format.
Signed-off-by: Burt P <pburt0@gmail.com>
Burt P [Sun, 7 Aug 2016 07:48:21 +0000 (02:48 -0500)]
af_hdcd: Add analyze mode
A new mode, selected by filter option, to aid in analysis of HDCD
encoded audio. In this mode the audio is replaced by a solid tone and
the amplitude is adjusted to signal some specified aspect of the process.
The output file can be loaded in an audio editor alongside the original,
where the user can see where different features or states are present.
Signed-off-by: Burt P <pburt0@gmail.com>
Michael Niedermayer [Sun, 7 Aug 2016 22:00:46 +0000 (00:00 +0200)]
avcodec/ffv1: add AV_PIX_FMT_GBRP16 support
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 7 Aug 2016 21:37:17 +0000 (23:37 +0200)]
avcodec/ffv1: template functions to allow data types different from int16_t
This is required for >= 16bit RGB support
I tried it without templates but its too much duplicated code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 7 Aug 2016 21:47:04 +0000 (23:47 +0200)]
avfilter/af_dynaudnorm: use better check for infinite loop
Apparently due to rounding this happens.
Paul B Mahol [Sun, 7 Aug 2016 18:19:34 +0000 (20:19 +0200)]
avfilter/avf_showspectrum: improve dB scale description
Yuli Khodorkovskiy [Fri, 29 Jul 2016 15:00:44 +0000 (11:00 -0400)]
avcodec/qsvdec: Fix null dereferences in the qsv decoder
This patch fixes the h264_qsv decoder issues mentioned
in https://ffmpeg.zeranoe.com/forum/viewtopic.php?t=2962.
The patch may be tested by specifying h264_qsv as the decoder to ffplay
for an h264 encoded file.
ffplay -vcodec h264_qsv foo.mts
Signed-off-by: Yuli Khodorkovskiy <ykhodo@gmail.com>
Push requested-by: Ivan Uskov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 7 Aug 2016 14:27:31 +0000 (16:27 +0200)]
avcodec/raw: Fix decoding of ilacetest.mov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 7 Aug 2016 13:51:47 +0000 (15:51 +0200)]
doc/filters: reorganize some entries, move scale_npp to right section
Also remove select entry in audio section, probably error in merge.
Paul B Mahol [Sun, 7 Aug 2016 09:22:42 +0000 (11:22 +0200)]
doc/filters: fix typo in extrastereo docs
Vitaly Ostrosablin [Sat, 6 Aug 2016 07:50:35 +0000 (10:50 +0300)]
avfilter: add crystalizer audio filter
Signed-off-by: Vitaly Ostrosablin <tmp6154@yandex.ru>
Chris Moeller [Fri, 5 Aug 2016 22:54:24 +0000 (15:54 -0700)]
avformat: read id3v2 comment tags
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 6 Aug 2016 21:27:01 +0000 (18:27 -0300)]
avcodec/ttadsp: cosmetics
Clean some header includes and use the same naming scheme as
in ttaencdsp
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sat, 16 Jul 2016 21:27:54 +0000 (23:27 +0200)]
avformat/mov: Enable mp3 parsing if a packet needs it
Fixes Ticket5689
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 6 Aug 2016 16:31:12 +0000 (13:31 -0300)]
Merge commit '
90944ee3ab79081845ea1bd97eea475031ce0842 '
* commit '
90944ee3ab79081845ea1bd97eea475031ce0842 ':
avconv: refactor selecting an encoder
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: James Almer <jamrial@gmail.com>
Burt P [Fri, 5 Aug 2016 21:08:46 +0000 (16:08 -0500)]
af_hdcd: convert AVOptions from INT to BOOL
As suggested by Timothy Gu.
Signed-off-by: Burt P <pburt0@gmail.com>
Michael Niedermayer [Fri, 5 Aug 2016 23:53:30 +0000 (01:53 +0200)]
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Tue, 2 Aug 2016 17:02:09 +0000 (19:02 +0200)]
lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.
Fixes Debian bugs #831529, #831909, #832964.
Signed-off-by: Mark Thompson <sw@jkqxz.net>
Matthias Hunstock [Sun, 10 Jul 2016 11:02:37 +0000 (13:02 +0200)]
decklink: enhancement: format selection with AVRational v2
When finding a video mode based on frame size and frame rate,
use AVRational methods instead of simple comparison. Add debug information.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Matthias Hunstock [Sun, 10 Jul 2016 11:02:36 +0000 (13:02 +0200)]
decklink: fix: set fps on video stream v2
Provide the stream with the correct fps information when capturing.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 5 Aug 2016 16:59:21 +0000 (18:59 +0200)]
avformat/teeproto: set forgotten url_close()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Wed, 3 Feb 2016 00:01:34 +0000 (01:01 +0100)]
lavf: forward protocol_whitelist for the remaining cases
Also set a default_whitelist for mmsh and ffrtmphttp.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Fri, 5 Aug 2016 10:14:38 +0000 (12:14 +0200)]
avfilter/avf_showspectrum: add color rotation feature
Mostly useful with channel color scheme.
Shivraj Patil [Fri, 5 Aug 2016 08:12:44 +0000 (13:42 +0530)]
Support for MIPS cpu P6600
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 3 Aug 2016 18:36:14 +0000 (20:36 +0200)]
avformat/img2enc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 3 Aug 2016 18:35:53 +0000 (20:35 +0200)]
avformat/hlsenc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 3 Aug 2016 18:34:20 +0000 (20:34 +0200)]
avformat: Add av_get_frame_filename2() and AV_FRAME_FILENAME_FLAGS_MULTIPLE
This will be used to allow writing file sequences using the tee output onto
multiple places in parallel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Wed, 3 Aug 2016 04:20:52 +0000 (01:20 -0300)]
avcodec/vdpau: clean up vdpau_internal.h
Also don't include it on files that don't need it.
This reduces differences with libav
Tested-by: Timothy Gu <timothygu99@gmail.com>
Reveiwed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 4 Aug 2016 19:21:25 +0000 (16:21 -0300)]
avformat: add a TTA Muxer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 4 Aug 2016 19:17:44 +0000 (16:17 -0300)]
avformat/tta: remove custom crc callback function
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 4 Aug 2016 19:17:09 +0000 (16:17 -0300)]
avformat/avio: add a crc callback function for CRC-32 IEEE-LE
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 18:16:44 +0000 (11:16 -0700)]
h264dec: Fix indentation
Timothy Gu [Thu, 4 Aug 2016 04:29:38 +0000 (21:29 -0700)]
ffmpeg_opt: Remove duplicated initialization of attachment stream
These two fields are already initialized to the same values in
new_attachment_stream().
Timothy Gu [Thu, 4 Aug 2016 04:28:13 +0000 (21:28 -0700)]
Merge commit '
5e1840622ce6e41c57d9c407604863d3f3dcc3ae '
* commit '
5e1840622ce6e41c57d9c407604863d3f3dcc3ae ':
avconv: fix handling attachments in init_output_stream
Conflicts:
avconv.c
This is functionally a no-op, as we don't have the bug this is trying to
fix. See
843be56ee18928ecf80bcb20d235c4f9cab5a8fd .
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 03:53:03 +0000 (20:53 -0700)]
Merge commit '
73c6ec6d659bab11ac424a4ba6ce3a56246295ee ' into merge
* commit '
73c6ec6d659bab11ac424a4ba6ce3a56246295ee ':
avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 03:33:57 +0000 (20:33 -0700)]
Merge commit '
49670e4218d34899a1c37abb7a11615efc16f757 '
* commit '
49670e4218d34899a1c37abb7a11615efc16f757 ':
avconv: add a function for determining whether a filtergraph is simple
Conflicts:
avconv.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 03:07:21 +0000 (20:07 -0700)]
Merge commit '
58640fe89ec4f2a3d67c0a2585fca8de34440857 '
* commit '
58640fe89ec4f2a3d67c0a2585fca8de34440857 ':
h264: handle frame recovery in h264_field_start()
Conflicts:
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 02:46:06 +0000 (19:46 -0700)]
Merge commit '
e26c64148be8a20ace7512d96503172fb5e9753b '
* commit '
e26c64148be8a20ace7512d96503172fb5e9753b ':
h264: discard slices of redundant pictures right after parsing the slice header
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
TODO: fix indentation
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 02:09:19 +0000 (19:09 -0700)]
Merge commit '
6efc4638584e1e14d1a6152186ba28f5d48a80c0 '
* commit '
6efc4638584e1e14d1a6152186ba28f5d48a80c0 ':
h264: always set redundant_pic_count during slice header parsing
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 00:47:06 +0000 (17:47 -0700)]
Merge commit '
606fb6c032fa44d9fa1efd4971308c228f2ebfff '
* commit '
606fb6c032fa44d9fa1efd4971308c228f2ebfff ':
h264: call the hwaccel frame_start() from h264_field_start()
This commit is a noop, as it conflicts with
3e53211a578fc6b042ceff45b2702335294e0464 .
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 4 Aug 2016 00:45:36 +0000 (17:45 -0700)]
Revert "Revert "Merge commit '
d1d7678040cd60148f97b372cb4291bcc45b2e22 '""
This reverts commit
e4af9be0f45c8f2ca148fb971f1e0c6782530e8c and redoes
796027f22154c799e0063e2457b31e0cfd1dddae .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Timothy Gu [Thu, 4 Aug 2016 00:06:43 +0000 (17:06 -0700)]
Revert "Merge commit '
d1d7678040cd60148f97b372cb4291bcc45b2e22 '"
This reverts commit
796027f22154c799e0063e2457b31e0cfd1dddae , reversing
changes made to
bca30ed2b67f095fd31e07319a622ac30ad22978 .
Preemptive revert before further testing has been done.
Timothy Gu [Wed, 3 Aug 2016 22:59:51 +0000 (15:59 -0700)]
Merge commit '
d1d7678040cd60148f97b372cb4291bcc45b2e22 '
* commit '
d1d7678040cd60148f97b372cb4291bcc45b2e22 ':
h264: fix the check for mixed IDR/non-IDR slices
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Wed, 3 Aug 2016 22:41:59 +0000 (15:41 -0700)]
Merge commit '
b13fc1e344011949929975a3451f78f226aa1de3 '
* commit '
b13fc1e344011949929975a3451f78f226aa1de3 ':
h264: do not pass H264Context to h264_slice_header_parse()
Conflicts:
libavcodec/h264dec.h
Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.
Merged-by: Timothy Gu <timothygu99@gmail.com>
Paul B Mahol [Wed, 3 Aug 2016 18:27:28 +0000 (20:27 +0200)]
avfilter/af_astats: extend bitdepth calculation
Michael Niedermayer [Mon, 1 Aug 2016 00:34:23 +0000 (02:34 +0200)]
avformat/teeproto: Support parsing protocol options
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 3 Aug 2016 11:34:40 +0000 (13:34 +0200)]
avformat/oggdec: Fix integer overflow with invalid pts
If negative pts are possible for some codecs in ogg then the code needs to be
changed to use signed values.
Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 3 Aug 2016 11:15:14 +0000 (13:15 +0200)]
ffplay: Fix invalid array index
Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Wed, 3 Aug 2016 13:20:38 +0000 (15:20 +0200)]
doc/filters: Fix option ranges for the sab filter.
Fixes ticket #5751.
Patrick Felt [Wed, 3 Aug 2016 05:46:28 +0000 (22:46 -0700)]
decklink: Remove unneeded spaces in initializers
Burt P [Mon, 1 Aug 2016 15:56:04 +0000 (10:56 -0500)]
af_hdcd: add flags to AVOption defs
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Wed, 3 Aug 2016 03:48:16 +0000 (20:48 -0700)]
mediacodec: Return ENOSYS on unsupported platforms
Timothy Gu [Wed, 3 Aug 2016 03:47:55 +0000 (20:47 -0700)]
jni: Return ENOSYS on unsupported platforms
Timothy Gu [Wed, 3 Aug 2016 05:05:27 +0000 (22:05 -0700)]
doxygen: Standardize root-level modules
Timothy Gu [Sun, 31 Jul 2016 01:56:34 +0000 (18:56 -0700)]
mathematics: Extend and edit Doxygen
Timothy Gu [Sat, 30 Jul 2016 18:43:24 +0000 (11:43 -0700)]
rational: Extend Doxygen
Timothy Gu [Tue, 2 Aug 2016 06:09:04 +0000 (23:09 -0700)]
avutil/hash: Add more detailed Doxygen documentation
James Almer [Wed, 3 Aug 2016 03:36:09 +0000 (00:36 -0300)]
avcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.h
It's the proper place since
8c7932884d09bc580036640453fd6b7ad4dd77b4
Signed-off-by: James Almer <jamrial@gmail.com>
Steven Robertson [Tue, 2 Aug 2016 06:26:12 +0000 (23:26 -0700)]
libavcodec/dnxhd: Enable 12-bit DNxHR support.
10- and 12-bit DNxHR use the same DC coefficient decoding process and
VLC table, just with a different shift value. From SMPTE 2019-1:2016,
8.2.4 DC Coefficient Decoding:
"For 8-bit video sampling, the maximum value of η=11 and for
10-/12-bit video sampling, the maximum value of η=13."
A sample file will be uploaded to show that with this patch, things
decode correctly:
dnxhr_hqx_12bit_1080p_smpte_colorbars_davinci_resolve.mov
Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Timothy Gu [Tue, 2 Aug 2016 22:10:41 +0000 (15:10 -0700)]
Doxyfile: Set STRIP_FROM_INC_PATH to project root
Show proper #include's on struct pages.
Before:
#include <buffer.h>
After
#include <libavutil/buffer.h>
Timothy Gu [Sat, 30 Jul 2016 04:46:06 +0000 (21:46 -0700)]
mem: Order function prototypes semantically
Patrick Felt [Tue, 2 Aug 2016 19:39:22 +0000 (13:39 -0600)]
cosmetics: Correct comments in decklink_dec
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
James Almer [Tue, 2 Aug 2016 17:54:06 +0000 (14:54 -0300)]
x86/ttaenc: add ff_ttaenc_filter_process_{ssse3,sse4}
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 2 Aug 2016 17:46:55 +0000 (14:46 -0300)]
avcodec/ttaenc: split off hybrid filter processing as ttaencdsp
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 1 Aug 2016 00:51:56 +0000 (02:51 +0200)]
avformat/tee: Factor parse_slave_options() out
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
LoRd_MuldeR [Tue, 2 Aug 2016 17:50:26 +0000 (19:50 +0200)]
avfilter/af_dynaudnorm: improve pre-filling code
In order to avoid possible clipping at the very
beginning. Especially apparent when "alternative"
boundary mode is used.
Adopted from original commit by committer.
Paul B Mahol [Fri, 29 Jul 2016 13:05:52 +0000 (15:05 +0200)]
avcodec/alacenc: allocate bigger packets
Timothy Gu [Sat, 30 Jul 2016 19:02:20 +0000 (12:02 -0700)]
mathematics: Make function prototypes identical to definitions
Doxygen gets confused by this.
Carl Eugen Hoyos [Tue, 2 Aug 2016 15:07:41 +0000 (17:07 +0200)]
lavu/hwcontext_vaapi: Fix compilation if VA_FOURCC_ABGR is not defined.
Fixes ticket #5484.
Timothy Gu [Tue, 2 Aug 2016 06:03:24 +0000 (23:03 -0700)]
murmur3: Add Doxygen documentation
The interface has been stable for some time now.
Timothy Gu [Tue, 2 Aug 2016 02:53:50 +0000 (19:53 -0700)]
avutil: Add detailed Doxygen description to a few hashes
Timothy Gu [Tue, 2 Aug 2016 02:18:44 +0000 (19:18 -0700)]
avutil: Group hash functions separately in Doxygen
Timothy Gu [Sat, 30 Jul 2016 01:57:49 +0000 (18:57 -0700)]
build: Make API documentation depend on config.mak
The Doxygen command is generated from the list of installed headers,
which may change per configuration (e.g. `--enable-gpl` results in
libpostproc to be built and installed).
Carl Eugen Hoyos [Tue, 2 Aug 2016 14:16:31 +0000 (16:16 +0200)]
lavf/rmdec: Do not return EIO on EOF.
Reported-by: applemax82
Lucas Cooper [Mon, 1 Aug 2016 16:50:59 +0000 (09:50 -0700)]
doc/filters: Add stats_version documentation to PSNR filter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Petru Rares Sincraian [Tue, 2 Aug 2016 07:38:17 +0000 (09:38 +0200)]
fate: add test for tremolo filter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 1 Aug 2016 22:11:08 +0000 (19:11 -0300)]
Merge commit '
996f13413b0415097e2a184d161462ffb3ceb647 '
* commit '
996f13413b0415097e2a184d161462ffb3ceb647 ':
h264: fix warnings in fill_filter_caches_inter()
Conflicts:
libavcodec/h264_slice.c
See
ef8f6464a55db730cab8c48a1a51fa4e6ca12107
Merged-by: James Almer <jamrial@gmail.com>
Burt P [Fri, 29 Jul 2016 17:36:22 +0000 (12:36 -0500)]
af_hdcd: Warn if there is any resampling or format conversion in the link chain
HDCD is only encoded in s16@44100Hz. Scan the chain of AVFilterLinks
for any resampling or format conversion/truncation that might cause
problems for the filter and issue warnings.
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Burt P [Mon, 1 Aug 2016 19:28:39 +0000 (14:28 -0500)]
af_hdcd: Process stereo channels together, fix #5727
Issue #5727: gain adjustment should only be applied if matching
gain value from a valid packet in both channels. The existing functions process
each channel separately, so it was not possible.
* New versions of hdcd_process(), hdcd_scan(), hdcd_integrate() named
hdcd_*_stereo() that process both channels together.
* target_gain applied will be the last matching target_gain.
* The old single channel functions remain as an option. They can be
used by: -af hdcd=process_stereo=0.
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 1 Aug 2016 21:15:07 +0000 (18:15 -0300)]
Merge commit '
bc7f4268514624e1286ea76d27a89a56b4ee18e1 '
* commit '
bc7f4268514624e1286ea76d27a89a56b4ee18e1 ':
h264: drop tests whether the codec id is AV_CODEC_ID_H264
Conflicts:
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 1 Aug 2016 19:46:57 +0000 (16:46 -0300)]
Merge commit '
8281cd5cb80582d668ce0848e0e035b383f161f6 '
* commit '
8281cd5cb80582d668ce0848e0e035b383f161f6 ':
h264_cabac: drop an always true condition
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 1 Aug 2016 18:11:05 +0000 (15:11 -0300)]
Merge commit '
5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c '
* commit '
5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c ':
h264: add H264_ prefix to the NAL unit types
Conflicts:
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com>
Burt P [Fri, 29 Jul 2016 17:36:20 +0000 (12:36 -0500)]
af_hdcd: Move code detect/check into own function
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Burt P [Fri, 29 Jul 2016 17:36:19 +0000 (12:36 -0500)]
af_hdcd: add force_pe filter option
Used to attempt replication of some results from
http://www.audiomisc.co.uk/HFN/HDCD/Examined.html
May not be generally useful, defaults to off.
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Burt P [Fri, 29 Jul 2016 17:36:18 +0000 (12:36 -0500)]
af_hdcd: Improve error detection logging
* Moves the filter context member out of state and into HDCDContext
* More useful information when an error is detected
* Gives a location near where the error was detected
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Burt P [Sun, 31 Jul 2016 15:47:20 +0000 (10:47 -0500)]
MAINTAINERS: Add myself for af_hdcd
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 1 Aug 2016 16:04:30 +0000 (13:04 -0300)]
Merge commit '
1cf2f3d334f52849aae2be868bad1e5fa5f59aa0 '
* commit '
1cf2f3d334f52849aae2be868bad1e5fa5f59aa0 ':
h264_sei: drop an unnecessary h264dec.h include
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 1 Aug 2016 16:03:15 +0000 (13:03 -0300)]
Merge commit '
b24dafe10572254ff0decc18b0d7c3d3707d5a29 '
* commit '
b24dafe10572254ff0decc18b0d7c3d3707d5a29 ':
lavc: drop unnecessary h264dec.h includes
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 1 Aug 2016 16:02:20 +0000 (13:02 -0300)]
Merge commit '
70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4 '
* commit '
70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4 ':
h264: tighten the valid range for ref_frame_count
Conflicts:
libavcodec/h264_ps.c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 1 Aug 2016 15:58:09 +0000 (12:58 -0300)]
Merge commit '
f638b67e5790735f34620bf82025c9b9d6fc7216 '
* commit '
f638b67e5790735f34620bf82025c9b9d6fc7216 ':
h264: move the parameter set definitions to a new header file
Conflicts:
libavcodec/h264_parse.h
libavcodec/h264_ps.c
libavcodec/h264dec.h
Merged-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 1 Aug 2016 11:50:21 +0000 (13:50 +0200)]
avcodec/vp9_parser: Check the input frame sizes for being consistent
Suggested-by: BBB
Fixed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Timothy Gu [Mon, 1 Aug 2016 03:56:23 +0000 (20:56 -0700)]
Doxygen: Re-enable JAVADOC_AUTOBRIEF
Timothy Gu [Sat, 30 Jul 2016 05:05:39 +0000 (22:05 -0700)]
dynarray: Change AV_ to FF_ for AV_DYNARRAY_ADD
The header is not installed and the macro isn't used outside libavutil,
so it is obviously privat to libavutil. Make the name reflect that.
Michael Bradshaw [Tue, 26 Jul 2016 17:18:43 +0000 (10:18 -0700)]
avformat/matroskaenc: fix Voids with size < 10
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Burt P [Fri, 29 Jul 2016 17:36:17 +0000 (12:36 -0500)]
af_hdcd: give cdt expired counter a value for never set
The counter is now -1 if the code detect timer was never set,
and 0 if it was set but never expired.
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Burt P [Fri, 29 Jul 2016 17:36:16 +0000 (12:36 -0500)]
af_hdcd: fix a minor cosmetic annoyance
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Timothy Gu [Sun, 31 Jul 2016 02:51:34 +0000 (19:51 -0700)]
Doxyfile: Reset unused options back to default
Silences a few warnings.
Timothy Gu [Sat, 30 Jul 2016 18:27:41 +0000 (11:27 -0700)]
doxygen: Remove outdated EXPAND_AS_DEFINED
Alexey Tourbin [Tue, 12 Jul 2016 05:07:54 +0000 (08:07 +0300)]
avfilter/af_stereowiden: fix read/write past the end of buffer
The stereowiden filter uses a buffer, s->buffer[], and a pointer
within the buffer, s->write, to implement inter-channel delays.
The loop which applies the delayed samples turns out to be faulty.
109 for (n = 0; n < in->nb_samples; n++, src += 2, dst += 2) {
110 const float left = src[0], right = src[1];
111 float *read = s->write + 2;
112
113 if (read > s->buffer + s->length)
114 read = s->buffer;
115
116 dst[0] = drymix * left - crossfeed * right - feedback * read[1];
117 dst[1] = drymix * right - crossfeed * left - feedback * read[0];
118
119 s->write[0] = left;
120 s->write[1] = right;
121
122 if (s->write == s->buffer + s->length)
123 s->write = s->buffer;
124 else
125 s->write += 2;
126 }
For one, the buffer gets written past its end in lines 119-120, before
the bound check is done in lines 122-123. This can be easily confirmed
by valgrind.
==3544== Invalid read of size 4
==3544== at 0x593B41: filter_frame (af_stereowiden.c:116)
==3544== Address 0xb1b03c4 is 4 bytes after a block of size 7,680 alloc'd
==3544==
==3544== Invalid read of size 4
==3544== at 0x593B66: filter_frame (af_stereowiden.c:117)
==3544== Address 0xb1b03c0 is 0 bytes after a block of size 7,680 alloc'd
==3544==
==3544== Invalid write of size 4
==3544== at 0x593B79: filter_frame (af_stereowiden.c:119)
==3544== Address 0xb1b03c0 is 0 bytes after a block of size 7,680 alloc'd
==3544==
==3544== Invalid write of size 4
==3544== at 0x593B7D: filter_frame (af_stereowiden.c:120)
==3544== Address 0xb1b03c4 is 4 bytes after a block of size 7,680 alloc'd
Also, using two separate pointers, s->write and read = s->write + 2,
does not seem to be well thought out. To apply the delay of s->buffer[],
it is enough to read the delayed samples at the current position within
the buffer, and then to store new samples at the same current position.
Thus the application of delayed samples can probably be best described
with a single pointer s->cur.
I also introduce a minor change to ensure that the size of s->buffer[]
is always a multiple of 2. Since the delay parameter is a float, it is
otherwise possible to trick the code into allocating off-by-one buffer.