Manfred Georg
a950edb472
avcodec/utils: av_lockmgr_register defines behavior on failure.
...
The register function now specifies that the user callback should
leave things in the same state that it found them on failure but
that failure to destroy is ignored by the library. The register
function is now explicit about its behavior on failure
(it unregisters the previous callback and destroys all mutex).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-02 21:18:49 +02:00
wm4
cdd6f059a6
avcodec, avutil: allow more control about how samples are skipped
...
Add CODEC_FLAG2_SKIP_MANUAL (exposed as "skip_manual"), which makes
the decoder export sample skip information via side data, instead
of applying it automatically. The format of the side data is the
same as AV_PKT_DATA_SKIP_SAMPLES, but since AVPacket and AVFrame
side data constants overlap, AV_FRAME_DATA_SKIP_SAMPLES needs to
be introduced.
This is useful for applications which want to do the timestamp
calculations manually, or which actually want to retrieve the
padding.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-02 20:21:00 +02:00
Yusuke Nakamura
6ea357ea83
Fix compilation of jpeg2000dsp when disabling the encoder.
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-02 12:56:13 -03:00
Carl Eugen Hoyos
80ca627abb
Check for oom in the dirac parser.
...
Fixes ticket #3996 .
2014-10-02 09:31:41 +02:00
James Almer
c9f2ec8a34
jpeg2000: split off inverse MCT decoding as Jpeg2000DSP
...
This makes the addition of arch optimized functions easier.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-02 03:21:45 -03:00
James Almer
acebff8e5d
x86/mpegvideoencdsp: improve ff_pix_sum16_sse2
...
~15% faster.
Also add an mmxext version that takes advantage of the new code, and
build it alongside with the mmx version only on x86_32.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-01 13:07:22 -03:00
Michael Niedermayer
0a7afedc48
avcodec/libx264: add avcintra-class
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-01 16:39:19 +02:00
Christophe Gisquet
9a3653c9ec
hevc: reuse edge emu buffer for coefficients
...
Kind of hackish but...
Reviewed-by: Mickael Raulet <Mickael.Raulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-01 12:12:28 +02:00
Manfred Georg
79551d2c7a
avcodec/utils: Force mutex to NULL after destruction.
...
A badly behaving user provided mutex manager (such as that in OpenCV) may not reset the mutex to NULL on destruction. This can cause a problem for a later mutex manager (which may assert that the mutex is NULL before creating).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-01 00:56:53 +02:00
Michael Niedermayer
cda5d89def
avcodec/bitstream_filter: Use av_bitstream_filter_next() instead of direct access in av_bitstream_filter_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-30 20:27:07 +02:00
Clément Bœsch
0eb4a42812
avcodec/srtdec: use AVBPrint API
2014-09-30 20:21:15 +02:00
Clément Bœsch
55180b3299
Kill timed SRT
2014-09-30 20:21:14 +02:00
Benoit Fouet
d5ddcb5f8e
avcodec/h264_mp4toannexb_bsf: use the given padding in h264_extradata_to_annexb().
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-30 13:12:36 +02:00
Benoit Fouet
1cf4d2e9be
avcodec/h264_mp4toannexb_bsf: add a case when only SPS/PPS is in the stream.
...
When only SPS or PPS is present in the stream, copy the missing one from
AVCC before insertion to the output stream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-30 11:33:06 +02:00
Michael Niedermayer
61c0683080
avcodec/mpegvideo_enc: Fix leak on bitstream buffer reallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-30 05:19:20 +02:00
Michael Niedermayer
1441641d78
avcodec/mpegvideo_enc: Allocate only a small buffer and reallocate as needed
...
This should reduce the memory requirement
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-29 21:50:53 +02:00
Michael Niedermayer
46807921f7
Merge commit 'e3a00acde05c925617dc19b5373969d864bf8414'
...
* commit 'e3a00acde05c925617dc19b5373969d864bf8414':
hevc: Initialize mergecand_list to 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-29 21:02:15 +02:00
Michael Niedermayer
cf32181b70
avcodec/put_bits: Add rebase_put_bits()
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-29 15:22:37 +02:00
Luca Barbato
e3a00acde0
hevc: Initialize mergecand_list to 0
...
Unbreak cf6090dc62
.
CC: libav-stable@libav.org
Sample-Id: hevc-conformance-LTRPSPS_A_Qualcomm_1
2014-09-29 12:33:46 +01:00
Michael Niedermayer
8ba6945487
avcodec/utils: Fix off by 1 error causing unneeded allocation in ff_fast_malloc()
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-29 12:56:45 +02:00
Michael Niedermayer
755f7929c6
avcodec/mpegvideo_enc: Only enforce rc_max_available_vbv_use on first encoding attempt
...
This reduces repeatly re-encoding to achieve VBV compliance
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28 23:59:44 +02:00
Michael Niedermayer
d22e88d120
avcodec/x86/fmtconvert: Fix operand size in ff_int32_to_float_fmul_array8_sse*
...
Fixes acodec-dca2 fate failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28 19:04:06 +02:00
Michael Niedermayer
04152a31cb
avcodec/vc1dec: Fixing is_intra, 2nd attempt
...
This also un-does the fate changes from a52f443714
,
leaving this fix without even small differences in the output, that is
a sample for which this makes a vissible difference is very welcome
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28 15:10:40 +02:00
Michael Niedermayer
a52f443714
avcodec/vc1dec: fix is_intra block vs. mb bug
...
Fixes CID1194380
There are no vissible differences in the changed fate samples. Only
a tiny number of pixels change by tiny amounts in the frames i checked
If someone has a file that shows a vissible difference, please post it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28 14:27:35 +02:00
Michael Niedermayer
3956b12fde
avcodec/libx265: enable psnr reporting when requested by the user
...
This is similar to what is done in libx264.c
Fixes Ticket3567
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28 04:14:43 +02:00
Michael Niedermayer
4d9a46fe31
avcodec/libx264: mark unchanged pointer arguments as const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28 03:40:13 +02:00
Michael Niedermayer
d85ebea3f3
avcodec/ac3enc_template: fix out of array read
...
Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27 20:34:44 +02:00
Clément Bœsch
5ec90c90c6
avcodec/subviewerdec: remove old compat code
2014-09-27 17:55:29 +02:00
Clément Bœsch
180d7f330b
avcodec/microdvddec: remove old compat code
2014-09-27 17:55:22 +02:00
Christophe Gisquet
f183febcda
hevc: remove CodingTree
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27 11:50:41 +02:00
Michael Niedermayer
be5dd8aa55
Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'
...
* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
mpeg12: Always invoke the get_format() callback
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27 03:38:48 +02:00
Michael Niedermayer
28b1698a7c
Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'
...
* commit 'ce42316321145c435029dc288c2b5f1d48519dde':
h264: Always invoke the get_format() callback
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27 03:21:56 +02:00
Michael Niedermayer
01831fd004
Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'
...
* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
hwaccel: Call ->get_format again if hwaccel init fails
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27 02:42:30 +02:00
James Almer
26cd7b1e1a
x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}
...
About two times faster than the c wrapper.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-26 20:48:40 -03:00
Michael Niedermayer
7618d360ca
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
...
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
flac: Remove unused headers
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 22:33:28 +02:00
Michael Niedermayer
c895fa7f66
Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'
...
* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 22:18:12 +02:00
Michael Niedermayer
15fda8bcf1
Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'
...
* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 22:07:35 +02:00
Rémi Denis-Courmont
4e03b2097c
mpeg12: Always invoke the get_format() callback
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-09-26 21:28:37 +02:00
Rémi Denis-Courmont
ce42316321
h264: Always invoke the get_format() callback
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-09-26 21:28:37 +02:00
Rémi Denis-Courmont
1c80c9d7ef
hwaccel: Call ->get_format again if hwaccel init fails
...
This allows the application to fall back on another hwaccel or,
more likely, software decoding.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-09-26 21:28:36 +02:00
Michael Niedermayer
bde8eb7fa3
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
...
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
vc1: Use logical instead of bitwise or for coded_inter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 20:47:43 +02:00
Tristan Matthews
7703995a2e
flac: Remove unused headers
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-26 10:33:01 -07:00
Tim Walker
cc4992aaf3
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
...
This is actually defined in the A/52 specification.
2014-09-26 17:09:14 +02:00
Tim Walker
4c2fd4b262
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
...
Some encoders already use this value even
though it's reserved in the A/52 specification.
2014-09-26 17:09:13 +02:00
Michael Niedermayer
a97328afef
vc1: Use logical instead of bitwise or for twomv
...
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
2014-09-26 16:55:36 +02:00
Tim Walker
b5fe13448b
vc1: Use logical instead of bitwise or for coded_inter
...
This appears to be the intended behavior.
2014-09-26 16:18:42 +02:00
Michael Niedermayer
ee2e5acdb1
avcodec/dxtory: remove unused variables
...
Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:51:40 +02:00
Michael Niedermayer
4c57be124f
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
...
* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
pcm-dvd: Move a variable to a smaller scope
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:30:02 +02:00
Diego Biurrun
b97f6ef956
pcm-dvd: Move a variable to a smaller scope
...
This avoids an unused variable warning on big-endian systems.
2014-09-26 02:15:34 -07:00
Carl Eugen Hoyos
8de7bdd756
Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.
2014-09-26 00:06:41 +02:00