Michael Niedermayer
afa97144cf
Merge commit ' 077b559433'
...
* commit '077b559433 ':
hevc: handle a NULL sps in set_sps() properly
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 16:41:09 +02:00
Michael Niedermayer
d13fc98247
Merge commit ' 18156b53f9'
...
* commit '18156b53f9 ':
hevc: do not pass an entire HEVCContext into export_stream_params()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 16:31:10 +02:00
Michael Niedermayer
39bbdebb1e
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>
2015-07-13 16:06:37 +02:00
Michael Niedermayer
f7068bf277
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>
2015-07-13 15:47:49 +02:00
Michael Niedermayer
b513661251
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>
2015-07-13 14:27:02 +02:00
Zhang Rui
f5c281daa8
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>
2015-07-13 13:38:29 +02:00
Michael Niedermayer
488cc05192
avformat/mov: Use ff_configure_buffers_for_index()
...
Fixes Ticket2513
Fixes Ticket4432
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-13 12:38:21 +02:00
Michael Niedermayer
b183fb4767
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>
2015-07-13 12:38:21 +02:00
James Almer
1aab5d8ab1
avcodec/dxva2_hevc: unbreak compilation after recent sps/pps changes
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-13 00:06:02 -03:00
Philip Langdale
b11c3fce38
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.
2015-07-12 19:56:54 -07:00
Michael Niedermayer
10d7d0880c
avcodec/utils: Check that the sample rate is not negative when opening an encoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 03:51:33 +02:00
Michael Niedermayer
7c944b0a36
tests/checkasm/x86/Makefile: Use ASMSTRIPFLAGS for asm
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 03:15:44 +02:00
Michael Niedermayer
d6ff68ad85
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>
2015-07-13 02:41:43 +02:00
Ronald S. Bultje
03931ecf71
vf_ssim: remove another obscure double loop.
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 02:39:51 +02:00
Ronald S. Bultje
a1f4848049
ssim: refactor a weird double loop.
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 02:23:30 +02:00
Michael Niedermayer
4496ccc724
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>
2015-07-13 02:14:58 +02:00
Michael Niedermayer
9e810a98a2
Merge commit ' 650060dfb6'
...
* commit '650060dfb6 ':
hevc_parser: parse and export some stream parameters
Conflicts:
configure
libavcodec/hevc_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 01:28:57 +02:00
Michael Niedermayer
99558270ed
avcodec/hevc: Simplify skipped_bytes_pos code further
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 01:09:21 +02:00
Michael Niedermayer
ad92410d90
avcodec/hevc: Move skipped_bytes_pos_nal to HEVCNAL, simplify code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 00:43:25 +02:00
Michael Niedermayer
bcc6c7bb65
avcodec/hevc: Move skipped_bytes_pos_size_nal into HAVCNAL
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 00:38:15 +02:00
Michael Niedermayer
5620ed3557
avcodec/hevc: Remove skipped_bytes_nal, simplify code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-13 00:03:45 +02:00
Michael Niedermayer
93aa84c1ea
Merge commit ' 7f78155dc6'
...
* commit '7f78155dc6 ':
hevc: improve a comment
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 23:45:56 +02:00
Michael Niedermayer
4690a63632
Merge commit ' d82e1adc20'
...
* commit 'd82e1adc20 ':
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>
2015-07-12 23:44:24 +02:00
Michael Niedermayer
4c42c66935
Merge commit ' ae05b48655'
...
* commit 'ae05b48655 ':
hevc: eliminate the second call to hls_nal_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 22:55:47 +02:00
Michael Niedermayer
760304e4c3
Merge commit ' d7bebe4805'
...
* commit 'd7bebe4805 ':
hevc: skip invalid/ignored NALUs when splitting the packet
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 22:46:06 +02:00
Michael Niedermayer
d5fcca83b9
Merge commit ' b11acd5732'
...
* commit 'b11acd5732 ':
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>
2015-07-12 22:28:54 +02:00
Paul B Mahol
885afff01c
avfilter/vf_w3fdif: implement slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-12 20:06:03 +00:00
Paul B Mahol
7b07e72abc
avfilter/vf_stereo3d: implement slice threading for anaglyph output
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-12 20:05:56 +00:00
Paul B Mahol
c02ee69be9
fate: add tests for stereo3d anaglyph modes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-12 20:05:56 +00:00
Michael Niedermayer
ddd86e4747
Merge commit ' ab05ed4c32'
...
* commit 'ab05ed4c32 ':
mpegvideo_parser: export pixel format and dimensions
Conflicts:
libavcodec/mpegvideo_parser.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 21:34:59 +02:00
Michael Niedermayer
547848f711
Merge commit ' 9f4c7397a2'
...
* commit '9f4c7397a2 ':
hevc: check slice address length
See: 05cc8c8e4b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 21:31:53 +02:00
Michael Niedermayer
6727380d05
Merge commit ' a9a2f36130'
...
* commit 'a9a2f36130 ':
doc: add a section about building with libmfx
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 21:23:16 +02:00
Michael Niedermayer
98c7f9741e
Merge commit ' 86eee85dad'
...
* commit '86eee85dad ':
bytestream2: set the reader to the end when reading more than available
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 21:13:07 +02:00
Michael Niedermayer
f14fc55969
Merge commit ' 8bc67ec2c0'
...
* commit '8bc67ec2c0 ':
Checkasm: assembly testing and benchmarking tool
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 21:03:06 +02:00
Ganesh Ajjanagadde
4547cf68a0
avformat/isom: utilize bitrate hints
...
Fixes Ticket4546
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-12 20:23:58 +02:00
Niklesh
774ceee17e
movtextdec.c: Add support for highlight and hilightcolor box
...
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
2015-07-12 10:24:17 -07:00
Anton Khirnov
077b559433
hevc: handle a NULL sps in set_sps() properly
...
This can happen in update_thread_context(), when the previous frame was
corrupted.
2015-07-12 18:57:10 +02:00
Anton Khirnov
18156b53f9
hevc: do not pass an entire HEVCContext into export_stream_params()
...
It only needs the parameter sets.
2015-07-12 18:52:02 +02:00
James Almer
a3b721d10d
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>
2015-07-12 13:32:22 -03:00
Anton Khirnov
650060dfb6
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.
2015-07-12 18:15:40 +02:00
Anton Khirnov
7f78155dc6
hevc: improve a comment
...
That loop does the actual full decoding, so 'parse' can be misleading.
2015-07-12 18:15:40 +02:00
Anton Khirnov
d82e1adc20
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.
2015-07-12 18:15:39 +02:00
Anton Khirnov
ae05b48655
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.
2015-07-12 18:15:39 +02:00
Anton Khirnov
d7bebe4805
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.
2015-07-12 18:15:39 +02:00
Anton Khirnov
b11acd5732
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.
2015-07-12 18:15:39 +02:00
Anton Khirnov
ab05ed4c32
mpegvideo_parser: export pixel format and dimensions
2015-07-12 18:15:39 +02:00
Andreas Cadhalpun
9f4c7397a2
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>
2015-07-12 18:15:39 +02:00
Anton Khirnov
a9a2f36130
doc: add a section about building with libmfx
2015-07-12 18:15:39 +02:00
Anton Khirnov
86eee85dad
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
2015-07-12 18:15:39 +02:00
Ronald S. Bultje
f353b851b9
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>
2015-07-12 17:15:42 +02:00