]>
git.sesse.net Git - ffmpeg/log
Ronald S. Bultje [Sun, 12 Jul 2015 23:33:06 +0000 (19:33 -0400)]
vf_ssim: x86 simd for ssim_4x4xN and ssim_endN.
Both are 2-2.5x faster than their C counterpart.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 13 Jul 2015 21:05:48 +0000 (18:05 -0300)]
avutil/mem_internal: add missing header includes
Fixes make checkheaders
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Ivan Uskov [Mon, 13 Jul 2015 14:17:54 +0000 (10:17 -0400)]
libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler under linux platform.
Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 23:46:16 +0000 (01:46 +0200)]
Merge commit '
a5a6a786bfebb85c269abc25559fd71963983581 '
* commit '
a5a6a786bfebb85c269abc25559fd71963983581 ':
mp3: Forward seeking errors
Conflicts:
libavformat/mp3dec.c
No change as the avio_seek() that are part of seeking in mp3 are already
checked in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 23:33:58 +0000 (01:33 +0200)]
Merge commit '
32c8d89c036b0e75ece74aea638df587099def0b '
* commit '
32c8d89c036b0e75ece74aea638df587099def0b ':
hevc: Print the non-supported chroma_format_idc
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 23:23:39 +0000 (01:23 +0200)]
Merge commit '
8e373fe048812a25b238ea60a7052b8c07639a42 '
* commit '
8e373fe048812a25b238ea60a7052b8c07639a42 ':
hevc: Factor out the pixel format mapping from the sps parser
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 22:54:51 +0000 (00:54 +0200)]
Merge commit '
c571424c7f6276a6374e1784ce2a33d4b6a4292d '
* commit '
c571424c7f6276a6374e1784ce2a33d4b6a4292d ':
asfdec: prevent memory leaks found with Coverity Scan
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 22:07:53 +0000 (00:07 +0200)]
avcodec/mpegvideo: Fix null pointer dereference of picture array
Fixes: 0d0a2bace067d09c08f0fa5340496c23_signal_sigsegv_7ffff713351a_342_WobblyWindowsIntro.avi with memlimit of 67108864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 21:33:18 +0000 (23:33 +0200)]
ffmpeg: Fix cleanup with ost = NULL
Fixes: 09e670595acbdafb226974b08dab66e3_signal_sigabrt_7ffff70eccc9_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 20:26:53 +0000 (22:26 +0200)]
avcodec/hevc_parser: Fix memleaks in parser mix
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 19:44:26 +0000 (21:44 +0200)]
avformat/oggdec: Check buf before copying data in to it
Fixes null pointer dereference
Fixes: aace024653cc62947336b86f8de812ab_signal_sigsegv_a0500f_343_WobblyWindowsIntro.ogg with memlimit 262144
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 19:19:04 +0000 (21:19 +0200)]
avcodec/pthread_frame: check avctx on deallocation
Fixes null pointer dereferences
Fixes: af1a5a33e67e479f439239097bd0d4fd_signal_sigsegv_7ffff713351a_152_Dolby_Rain_Logo.pmp with memlimit of 8388608
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Luca Barbato [Sun, 12 Jul 2015 13:48:00 +0000 (15:48 +0200)]
mp3: Forward seeking errors
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 12 Jul 2015 22:48:49 +0000 (00:48 +0200)]
hevc: Print the non-supported chroma_format_idc
And drop the spurious newline.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sun, 12 Jul 2015 22:48:48 +0000 (00:48 +0200)]
hevc: Factor out the pixel format mapping from the sps parser
The function will grow larger as more formats are supported.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Alexandra Hájková [Mon, 13 Jul 2015 10:02:03 +0000 (12:02 +0200)]
asfdec: prevent memory leaks found with Coverity Scan
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Mon, 13 Jul 2015 17:10:31 +0000 (14:10 -0300)]
avcodec/hevc_parser: use the old parser only when hevc decoder is available
If it's not, then the new dependence-free parser will be used instead
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 13 Jul 2015 17:25:03 +0000 (19:25 +0200)]
avutil/frame: fix crash with av_frame_unref(NULL)
Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 2097152 alloc limit
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 17:18:08 +0000 (19:18 +0200)]
avcodec/mpegvideo: Check for NULL in ff_mpv_common_end()
Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 1048576 alloc limit
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 17:10:59 +0000 (19:10 +0200)]
avcodec/vp3: check current_frame before accessing it
Fixes null pointer dereference
Fixes: b15eb06e0111e94bc59123c86db7aff9_signal_sigsegv_a0500f_45_320vp3.nsv with allocation limit 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 15:42:44 +0000 (17:42 +0200)]
configure: Fix build with --disable-decoders --enable-parser=hevc
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 15:11:17 +0000 (17:11 +0200)]
Merge commit '
1b9a8e5f1d007ea19f04032490d681becd0d4e6a '
* commit '
1b9a8e5f1d007ea19f04032490d681becd0d4e6a ':
dxva2_hevc: unbreak compilation after recent sps/pps changes
See:
1aab5d8ab1e27449a2d58d6f001bb34784f402bf
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 15:04:13 +0000 (17:04 +0200)]
Merge commit '
a062a55d37720abc8c704aa0e8682efd3cdc9c9b '
* commit '
a062a55d37720abc8c704aa0e8682efd3cdc9c9b ':
hevc_parser: fix standalone build with the hevc decoder disabled
Conflicts:
libavcodec/Makefile
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 14:50:06 +0000 (16:50 +0200)]
Merge commit '
b9f76d19d81fbc7f088536f966c2d3dc23c34ddc '
* commit '
b9f76d19d81fbc7f088536f966c2d3dc23c34ddc ':
hevc_ps: make sure failing to decode an SPS always returns an error
Conflicts:
libavcodec/hevc_ps.c
See:
15893adbdb6a7000f59207bcb88def6e7b4812b9
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 14:38:20 +0000 (16:38 +0200)]
Merge commit '
077b55943330150db0eafd36bbee614697cabd98 '
* commit '
077b55943330150db0eafd36bbee614697cabd98 ':
hevc: handle a NULL sps in set_sps() properly
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 14:30:41 +0000 (16:30 +0200)]
Merge commit '
18156b53f9b642b71c182c5c9818175a61572d2b '
* commit '
18156b53f9b642b71c182c5c9818175a61572d2b ':
hevc: do not pass an entire HEVCContext into export_stream_params()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 14:05:21 +0000 (16:05 +0200)]
avcodec/sanm: Reset sizes in destroy_buffers()
Fixes crash in 1288a2fe8e9ae6b00ca40e089d08ca65_signal_sigsegv_7ffff71426a7_354_accident.san with allocation limit 65536
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 13:46:10 +0000 (15:46 +0200)]
avcodec/alac: Clear pointers in allocate_buffers()
Fixes: 06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7ffff713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 12:25:38 +0000 (14:25 +0200)]
avformat/utils: Skip ff_configure_buffers_for_index() for local files
Theres no known case where its use on local files improves performance
if you know of such a case, please contact us
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Zhang Rui [Mon, 13 Jul 2015 08:22:40 +0000 (16:22 +0800)]
configure: clean whitespace with [:space:]
https://en.wikibooks.org/wiki/Regular_Expressions/POSIX_Basic_Regular_Expressions
Fixes NDKr10e on Cygwin,
CC_IDENT for it is defined as
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 2 Jun 2015 16:31:05 +0000 (18:31 +0200)]
avformat/mov: Use ff_configure_buffers_for_index()
Fixes Ticket2513
Fixes Ticket4432
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 2 Jun 2015 16:30:07 +0000 (18:30 +0200)]
avformat: Add ff_configure_buffers_for_index()
This allows configuring the io buffer in such way that few seeks are needed for playback
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 13 Jul 2015 03:05:11 +0000 (00:05 -0300)]
dxva2_hevc: unbreak compilation after recent sps/pps changes
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 13 Jul 2015 06:56:53 +0000 (08:56 +0200)]
hevc_parser: fix standalone build with the hevc decoder disabled
The parser depends on hevc_ps, which in turn needs some data tables.
Found-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Mon, 13 Jul 2015 05:49:03 +0000 (07:49 +0200)]
hevc_ps: make sure failing to decode an SPS always returns an error
Some of the goto err clauses do not set the error code. It seems better
to fall back on INVALIDDATA instead of adding it everywhere explicitly.
James Almer [Mon, 13 Jul 2015 03:05:11 +0000 (00:05 -0300)]
avcodec/dxva2_hevc: unbreak compilation after recent sps/pps changes
Signed-off-by: James Almer <jamrial@gmail.com>
Philip Langdale [Mon, 13 Jul 2015 02:55:56 +0000 (19:55 -0700)]
avcodec/vdpau_hevc: unbreak compilation after sps/pps changes
There was some reorganisation in the HEVC headers so the sps and pps
now live in a different place.
Michael Niedermayer [Mon, 13 Jul 2015 01:40:25 +0000 (03:40 +0200)]
avcodec/utils: Check that the sample rate is not negative when opening an encoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 01:15:44 +0000 (03:15 +0200)]
tests/checkasm/x86/Makefile: Use ASMSTRIPFLAGS for asm
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 21:58:39 +0000 (23:58 +0200)]
Factor duplicated ff_fast_malloc() out into mem_internal.h
internal.h is difficult to use due to circular dependancies
mem.h is a public header ff_* is not public
Alternative solutions probably are possible too
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Sat, 11 Jul 2015 23:56:00 +0000 (19:56 -0400)]
vf_ssim: remove another obscure double loop.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Sat, 11 Jul 2015 23:55:58 +0000 (19:55 -0400)]
ssim: refactor a weird double loop.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 13 Jul 2015 00:07:15 +0000 (02:07 +0200)]
avcodec/hevc_parser: Reenable the old parser under ADVANCED_PARSER define
Feel free to use either, they both work but the old one provides
more information but needs the hevc decoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 23:28:36 +0000 (01:28 +0200)]
Merge commit '
650060dfb665552442ec11b456660e3e9a9d9016 '
* commit '
650060dfb665552442ec11b456660e3e9a9d9016 ':
hevc_parser: parse and export some stream parameters
Conflicts:
configure
libavcodec/hevc_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 22:52:18 +0000 (00:52 +0200)]
avcodec/hevc: Simplify skipped_bytes_pos code further
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 22:43:25 +0000 (00:43 +0200)]
avcodec/hevc: Move skipped_bytes_pos_nal to HEVCNAL, simplify code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 22:35:11 +0000 (00:35 +0200)]
avcodec/hevc: Move skipped_bytes_pos_size_nal into HAVCNAL
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 22:03:45 +0000 (00:03 +0200)]
avcodec/hevc: Remove skipped_bytes_nal, simplify code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 21:45:44 +0000 (23:45 +0200)]
Merge commit '
7f78155dc6b65be55efb5309b6dd2bb33925a8c4 '
* commit '
7f78155dc6b65be55efb5309b6dd2bb33925a8c4 ':
hevc: improve a comment
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 21:31:12 +0000 (23:31 +0200)]
Merge commit '
d82e1adc2019135a2fc45372e0ed0b5ef107cdd0 '
* commit '
d82e1adc2019135a2fc45372e0ed0b5ef107cdd0 ':
hevc: move splitting the packet into NALUs into a separate function
Conflicts:
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_parse.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 20:55:47 +0000 (22:55 +0200)]
Merge commit '
ae05b4865514fd71b5e9431e93aa0d03d7ba7751 '
* commit '
ae05b4865514fd71b5e9431e93aa0d03d7ba7751 ':
hevc: eliminate the second call to hls_nal_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 20:45:58 +0000 (22:45 +0200)]
Merge commit '
d7bebe4805193783f0b6f292f9127a75709fb7d9 '
* commit '
d7bebe4805193783f0b6f292f9127a75709fb7d9 ':
hevc: skip invalid/ignored NALUs when splitting the packet
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 20:06:21 +0000 (22:06 +0200)]
Merge commit '
b11acd57326db6c2cc1475dd0bea2a06fbc85aa2 '
* commit '
b11acd57326db6c2cc1475dd0bea2a06fbc85aa2 ':
hevc: remove HEVCContext usage from hevc_ps
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevcpred_template.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Fri, 10 Jul 2015 18:04:48 +0000 (18:04 +0000)]
avfilter/vf_w3fdif: implement slice threading
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 9 Jul 2015 19:18:14 +0000 (19:18 +0000)]
avfilter/vf_stereo3d: implement slice threading for anaglyph output
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 11 Jul 2015 22:51:39 +0000 (22:51 +0000)]
fate: add tests for stereo3d anaglyph modes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 12 Jul 2015 19:34:59 +0000 (21:34 +0200)]
Merge commit '
ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7 '
* commit '
ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7 ':
mpegvideo_parser: export pixel format and dimensions
Conflicts:
libavcodec/mpegvideo_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 19:31:22 +0000 (21:31 +0200)]
Merge commit '
9f4c7397a296e6d11b3c6c121a6896163577dc7c '
* commit '
9f4c7397a296e6d11b3c6c121a6896163577dc7c ':
hevc: check slice address length
See:
05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 19:23:16 +0000 (21:23 +0200)]
Merge commit '
a9a2f3613040c4f90bf15cbd76f8671252ecc043 '
* commit '
a9a2f3613040c4f90bf15cbd76f8671252ecc043 ':
doc: add a section about building with libmfx
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 19:12:42 +0000 (21:12 +0200)]
Merge commit '
86eee85daddb682fa072c2e2657c90a514b855e3 '
* commit '
86eee85daddb682fa072c2e2657c90a514b855e3 ':
bytestream2: set the reader to the end when reading more than available
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 19:00:50 +0000 (21:00 +0200)]
Merge commit '
8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717 '
* commit '
8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717 ':
Checkasm: assembly testing and benchmarking tool
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Sun, 12 Jul 2015 14:33:37 +0000 (10:33 -0400)]
avformat/isom: utilize bitrate hints
Fixes Ticket4546
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Niklesh [Sun, 12 Jul 2015 07:14:48 +0000 (12:44 +0530)]
movtextdec.c: Add support for highlight and hilightcolor box
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
Anton Khirnov [Sun, 12 Jul 2015 16:57:10 +0000 (18:57 +0200)]
hevc: handle a NULL sps in set_sps() properly
This can happen in update_thread_context(), when the previous frame was
corrupted.
Anton Khirnov [Sun, 12 Jul 2015 16:52:02 +0000 (18:52 +0200)]
hevc: do not pass an entire HEVCContext into export_stream_params()
It only needs the parameter sets.
James Almer [Sun, 12 Jul 2015 06:12:37 +0000 (03:12 -0300)]
avcodec/dcadec: silence request_channels deprecation warnings
This also prevents an eventual compilation failure once request_channels
is removed.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Thu, 9 Jul 2015 17:34:51 +0000 (19:34 +0200)]
hevc_parser: parse and export some stream parameters
Particularly those that will be needed by the QSV decoder.
More can be added later as necessary.
Anton Khirnov [Thu, 9 Jul 2015 16:36:16 +0000 (18:36 +0200)]
hevc: improve a comment
That loop does the actual full decoding, so 'parse' can be misleading.
Anton Khirnov [Thu, 9 Jul 2015 16:33:52 +0000 (18:33 +0200)]
hevc: move splitting the packet into NALUs into a separate function
This function is independent of the decoding context, so we'll be able
to use it in the parser.
Anton Khirnov [Thu, 9 Jul 2015 16:11:44 +0000 (18:11 +0200)]
hevc: eliminate the second call to hls_nal_unit()
Also, make hls_nal_unit() work only on the provided NAL unit, without
requiring a whole decoding context.
This will allow splitting this code for reuse by the parser.
Anton Khirnov [Thu, 9 Jul 2015 16:01:08 +0000 (18:01 +0200)]
hevc: skip invalid/ignored NALUs when splitting the packet
There is no need to wait until actually decoding the NALU. This will
allow to get rid of the second hls_nal_unit() call later.
Anton Khirnov [Thu, 9 Jul 2015 12:22:43 +0000 (14:22 +0200)]
hevc: remove HEVCContext usage from hevc_ps
Factor out the parameter sets into a separate struct and use it instead.
This will allow us to reuse this code in the parser.
Anton Khirnov [Mon, 6 Jul 2015 19:53:13 +0000 (21:53 +0200)]
mpegvideo_parser: export pixel format and dimensions
Andreas Cadhalpun [Fri, 10 Jul 2015 17:41:43 +0000 (19:41 +0200)]
hevc: check slice address length
It is used as get_bits argument and reading 0 bits doesn't make sense.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Fri, 10 Jul 2015 07:57:41 +0000 (09:57 +0200)]
doc: add a section about building with libmfx
Anton Khirnov [Fri, 10 Jul 2015 07:31:24 +0000 (09:31 +0200)]
bytestream2: set the reader to the end when reading more than available
This prevents possible infinite loops with the calling code along the
lines of while (bytestream2_get_bytes_left()) { ... }, where the reader
does not advance.
CC: libav-stable@libav.org
Ronald S. Bultje [Sat, 11 Jul 2015 23:55:59 +0000 (19:55 -0400)]
vf_ssim: fix s->coefs for yuv with non-4:2:0 subsampling.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Henrik Gramner [Sat, 11 Jul 2015 18:32:11 +0000 (20:32 +0200)]
Checkasm: assembly testing and benchmarking tool
It provides the following features:
* verify correctness by comparing output to the C version.
* detect failure to save and restore clobbered callee-saved registers.
* detect 32-bit parameters being used as if they were 64-bit in x86-64
(the upper halves are not guaranteed to be zero - but in practice
they very often are, which makes those bugs hard to spot otherwise).
* easy benchmarking.
Compile by running 'make checkasm'.
Execute by running 'tests/checkasm/checkasm'.
Optional arguments are '--bench' to run benchmarks for all functions,
'--bench=<pattern>' to run benchmarks for all functions that starts with
<pattern>, and '<integer>' to seed the PRNG for reproducible results.
Contains unit tests for most h264pred functions to get started, more tests
can be added afterwards using those as a reference.
Loosely based on code from x264. Currently only supports x86 and x86-64,
but additional architectures shouldn't be too much of an obstacle to add.
Note that functions with floating point parameters or floating point
return values are not supported. Some compiler-specific features or
preprocessor hacks would likely be required to add support for that.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Sun, 12 Jul 2015 14:34:14 +0000 (16:34 +0200)]
Merge commit '
796268654c7807c9a1cfb322c838383e2b900d60 '
* commit '
796268654c7807c9a1cfb322c838383e2b900d60 ':
asfdec: always reset packet state after seeking
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 14:24:20 +0000 (16:24 +0200)]
avformat/riffde: Fix integer overflow in bitrate
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 14:23:27 +0000 (16:23 +0200)]
Merge commit '
f1bdc234370401c032cd85184e93c7c155eb6d62 '
* commit '
f1bdc234370401c032cd85184e93c7c155eb6d62 ':
riff: Validate bitrate
Conflicts:
libavformat/riffdec.c
See:
189420cb561929e05f5cc4224cdca83740a24a32
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Fri, 10 Jul 2015 22:09:46 +0000 (00:09 +0200)]
riffdec: prevent negative bit rate
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 13:55:17 +0000 (15:55 +0200)]
Merge commit '
c1d647b15afa69fa70f999a9ddcb98346409fb4d '
* commit '
c1d647b15afa69fa70f999a9ddcb98346409fb4d ':
mp3: Make the seek more robust
Conflicts:
libavformat/mp3dec.c
Mostly not merged
See:
b6267901c466c482b2f1af3578b0a6d88265d144 and various later commits
The bug is also not reproducable in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 13:21:15 +0000 (15:21 +0200)]
Merge commit '
d80811c94e068085aab797f9ba35790529126f85 '
* commit '
d80811c94e068085aab797f9ba35790529126f85 ':
riff: Use the correct logging context
Conflicts:
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 12 Jul 2015 13:08:27 +0000 (15:08 +0200)]
Merge commit '
355864ef7a9548ee6491a25de1e0650bd983a667 '
* commit '
355864ef7a9548ee6491a25de1e0650bd983a667 ':
g726: Do not crash on user mistake
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Sun, 12 Jul 2015 10:47:20 +0000 (06:47 -0400)]
ivfenc: write duration at end-of-stream.
At the beginning, the value is not initialized.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Sun, 12 Jul 2015 10:34:13 +0000 (12:34 +0200)]
asfdec: always reset packet state after seeking
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Fri, 10 Jul 2015 14:35:44 +0000 (16:35 +0200)]
avformat/brstm: Remove unused variable
Fixes "libavformat/brstm.c:128:35: warning: variable info_size set but not used"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 22:00:21 +0000 (00:00 +0200)]
avformat/yuv4mpegdec: Use 64bit for file offset
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 21:35:16 +0000 (23:35 +0200)]
avcodec/utils: Assert that the pointer is set when size is in ff_fast_malloc()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 21:08:08 +0000 (23:08 +0200)]
avcodec/utils: Avoid undefined void casts in ff_fast_malloc()
based on code from libavutil/mem.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 20:47:09 +0000 (22:47 +0200)]
avutil/mem: Fix potential overflow in overallocation code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 20:46:44 +0000 (22:46 +0200)]
avcodec/utils: Fix potential overflow in overallocation code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Fri, 10 Jul 2015 18:04:25 +0000 (18:04 +0000)]
fate: add tests for w3fdif filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 11 Jul 2015 19:31:04 +0000 (19:31 +0000)]
avformat/yuv4mpegdec: remove unused variable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ronald S. Bultje [Sat, 11 Jul 2015 15:21:17 +0000 (11:21 -0400)]
vf_psnr: fix rgb channel order mixup in final log message.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Sat, 11 Jul 2015 11:22:47 +0000 (07:22 -0400)]
vf_psnr: always calculate MSE over full pixel range.
This makes the output compatible with that of pretty much any other
tool that calculates PSNR.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Sat, 11 Jul 2015 16:40:31 +0000 (18:40 +0200)]
riff: Validate bitrate
Luca Barbato [Sat, 11 Jul 2015 15:38:26 +0000 (17:38 +0200)]
mp3: Make the seek more robust
Try to parse up to 4 packets to find the closest packet.
Reported-By: jan.schlueter@ofai.at
Luca Barbato [Sat, 11 Jul 2015 10:41:42 +0000 (12:41 +0200)]
riff: Use the correct logging context