Michael Niedermayer
d06dce21a4
Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
...
* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
wmv2: Return meaningful error codes
Conflicts:
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:34:36 +01:00
Michael Niedermayer
41572ac698
Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'
...
* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
qdm2: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:26:56 +01:00
Michael Niedermayer
d128794fbc
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
...
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See: 2a89afb376
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:13:12 +01:00
Michael Niedermayer
2e786bc498
avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure
...
This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:58:31 +01:00
Michael Niedermayer
38e867f6c0
Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'
...
* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:55:27 +01:00
Michael Niedermayer
62aec0c2d5
Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
...
* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
avpacket: Check buffer reference
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:47:36 +01:00
Michael Niedermayer
7a7b77e6c9
Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
...
* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
vorbisdec: Check memory allocations
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:39:32 +01:00
Michael Niedermayer
3d5c0ba816
Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'
...
* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
dvdsubdec: Check memory allocations
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:31:26 +01:00
Michael Niedermayer
2980c8e7d3
Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'
...
* commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
lavc: Document interaction between avcodec_open2() and decoding routines
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 21:25:07 +01:00
Michael Niedermayer
d2668ae472
Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'
...
* commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
dca: Remove separate header for DCA ExSS
Conflicts:
libavcodec/dca.h
libavcodec/dca_exss.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 20:18:19 +01:00
Michael Niedermayer
03dab49a12
avcodec/vp56: Add () to protect TRANSPOSE()s arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 19:13:26 +01:00
Himangi Saraogi
42c8f92e2f
wmv2: Return meaningful error codes
2015-02-17 12:18:20 -05:00
Himangi Saraogi
f3e045263e
qdm2: Return meaningful error codes
2015-02-17 12:18:20 -05:00
Himangi Saraogi
a1e2c47cd4
libxvid: Return meaningful error messages
2015-02-17 12:18:20 -05:00
Himangi Saraogi
18f4fa251b
aac_adtstoasc_bsf: Check extradata memory allocation
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:18:10 -05:00
Vittorio Giovara
fe0f4e5657
avpacket: Check buffer reference
...
CC: libav-stable@libav.org
Bug-Id: CID 1267889
2015-02-17 12:16:43 -05:00
Vittorio Giovara
31dc73e92a
vorbisdec: Check memory allocations
2015-02-17 12:16:43 -05:00
Vittorio Giovara
ec17782e17
dvdsubdec: Check memory allocations
2015-02-17 12:16:43 -05:00
Vittorio Giovara
cb70a93ca1
lavc: Document interaction between avcodec_open2() and decoding routines
2015-02-17 11:27:42 -05:00
Vittorio Giovara
d89e58f539
dct-test: Fix initialization syntax
...
Related to "warning: suggest braces around initialization of subobject".
2015-02-17 11:27:42 -05:00
Christophe Gisquet
398f531915
x86: hevc_mc: fewer xmm regs used in epel h/v
...
11 xmm regs seem only required for avx2.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 15:19:19 +01:00
Michael Niedermayer
e3f7142306
avcodec/vc1dsp: add () to protect the arguments of the op* macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 00:02:40 +01:00
Michael Niedermayer
cb9d40451c
avcodec/ac3: add () to protect the macro arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:59:39 +01:00
Michael Niedermayer
235782260d
avcodec/me_cmp: add () to protect avg*s arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:13:00 +01:00
Michael Niedermayer
17a62cbcb9
avcodec/bmvvideo: Add () to protect NEXT_BYTE() argument
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:09:09 +01:00
James Almer
6e3651983c
avcodec/hevcdsp: add missing () to CMP macro
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-16 18:56:16 -03:00
Christophe Gisquet
89cb4995fa
x86: hevc_mc: save 1 gpr in epel filter loading
...
The 3*stride value stored in r3src can be loaded much later,
so use r3src instead of a dedicated gpr when possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 21:53:51 +01:00
James Almer
22596383f3
avcodec/hevcdsp: optimize pixel comparison in sao_edge_filter
...
GCC 4.9.2 on a Core i5-4200U @ 1.60GHz, Linux x86_64
Before
715487 decicycles in sao_edge_filter_8, 262144 runs, 0 skips
After
672104 decicycles in sao_edge_filter_8, 262144 runs, 0 skips
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-16 17:47:47 -03:00
zhaoxiu.zeng
bf99068089
avcodec/vc1_mc: factor out helper functions for scaling blocks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 19:44:46 +01:00
Clément Bœsch
f9240ec01a
avcodec/gif: fix off by one in column offsetting finding
2015-02-16 17:47:35 +01:00
Seppo Tomperi
e40e446efd
hevcdsp: HEVC deblocking ARM NEON register clobber fix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 13:27:41 +01:00
zhaoxiu.zeng
0f83415569
avcodec/vc1_mc: move median4() to mathops.h
...
Needed for architecture specific optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 11:41:00 +01:00
Diego Biurrun
f8c1719771
dca: Remove separate header for DCA ExSS
...
There is no point in having a separate header for a single declaration.
2015-02-16 10:44:56 +01:00
James Almer
03adafb318
x86/g722dsp: add ff_g722_apply_qmf_sse2
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-16 00:41:21 -03:00
Michael Niedermayer
815daf1607
Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'
...
* commit '3a651f599a18b023602370b67a77eb0efa309b20':
dca: Move data tables from a header to an object file
Conflicts:
libavcodec/Makefile
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:49:22 +01:00
Michael Niedermayer
9d4f836627
Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'
...
* commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda':
dca: Add array sizes to array declarations
Conflicts:
libavcodec/dcadata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:29:41 +01:00
Michael Niedermayer
e86f754b1c
Merge commit '702458538d4e52809bcef460d39baabf061b16b5'
...
* commit '702458538d4e52809bcef460d39baabf061b16b5':
g722: Add ARM NEON implementation for g722_apply_qmf()
Conflicts:
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:16:29 +01:00
Michael Niedermayer
39b40be2a1
Merge commit '73ae0a9d12857852222363f9a7c14d07058ebfd3'
...
* commit '73ae0a9d12857852222363f9a7c14d07058ebfd3':
g722: Split out computation of band->s_zero and unroll code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:07:42 +01:00
Michael Niedermayer
9e0a1bd2b9
Merge commit 'b16057b5fe9f02442c52388037891c2e381205fc'
...
* commit 'b16057b5fe9f02442c52388037891c2e381205fc':
g722: Unroll g722_apply_qmf()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:00:53 +01:00
Michael Niedermayer
9f1792982e
Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'
...
* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
g722: Reduce number of pointers passed to g722_apply_qmf() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 01:54:19 +01:00
Michael Niedermayer
47df21e172
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
...
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 01:46:35 +01:00
Diego Biurrun
3a651f599a
dca: Move data tables from a header to an object file
...
This allows sharing them with the DCA XLL extension w/o duplication.
2015-02-15 13:34:04 -08:00
Diego Biurrun
65df9904ce
dca: Add array sizes to array declarations
2015-02-15 13:34:04 -08:00
Peter Meerwald
702458538d
g722: Add ARM NEON implementation for g722_apply_qmf()
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 22:47:21 +02:00
Peter Meerwald
73ae0a9d12
g722: Split out computation of band->s_zero and unroll code
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 22:47:19 +02:00
Peter Meerwald
b16057b5fe
g722: Unroll g722_apply_qmf()
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 22:47:16 +02:00
Peter Meerwald
10f160768b
g722: Reduce number of pointers passed to g722_apply_qmf() function
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 22:47:14 +02:00
Peter Meerwald
6769068313
g722: Split out g722_qmf_apply() function into g722dsp.c
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 22:47:10 +02:00
zhaoxiu.zeng
38c619c1ed
avcodec/vc1: cleanup and simplification
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 17:28:02 +01:00
Michael Niedermayer
8123e19e61
avcodec/dcadec: Move remaining tables to dcadata.h
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 11:35:40 +01:00
Zhaoxiu Zeng
2a72b1664d
avcodec/h264: use avpriv_find_start_code() in h264_split()
...
This also allows replacing several literal numbers by named constants
And it should be faster, the function is not speed relevant though as it is
generally only called a few times at the streams start.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 01:13:32 +01:00
Michael Niedermayer
e33b084ee9
Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'
...
* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
vdpau: Adjust necessary #includes for vdpau_internal.h
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 22:59:16 +01:00
Michael Niedermayer
d2223ec2bd
Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'
...
* commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664':
dca: Move all tables into dcadata.h
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 22:40:35 +01:00
Michael Niedermayer
6c44dd6c6e
Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'
...
* commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3':
dca: Remove trace debugging code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 22:32:23 +01:00
Michael Niedermayer
877c038a9d
Merge commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa'
...
* commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa':
dca: Return more informative error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 22:26:00 +01:00
Michael Niedermayer
ad0be70382
avcodec/dcaenc: rename DCA_SUBBANDS
...
Fixes "warning: DCA_SUBBANDS redefined"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 22:13:28 +01:00
Michael Niedermayer
d8901c2f01
Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'
...
* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0':
dca: Split code for handling the EXSS extension off into a separate file
Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 22:02:41 +01:00
Michael Niedermayer
a94eba6f0c
Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'
...
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0':
avcodec: Don't anonymously typedef structs
Conflicts:
libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 21:18:17 +01:00
Clément Bœsch
3cab173e23
avcodec/gif: support crop and transparency with PAL8
2015-02-14 20:48:50 +01:00
Paul B Mahol
088dfd3ff1
avcodec/dxtory: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-14 19:45:23 +00:00
Michael Niedermayer
4177f501b4
Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'
...
* commit '7769be590c7aeb2aad26ca723d105cf5203e33d2':
vp56: Return meaningful error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 20:29:34 +01:00
Diego Biurrun
ecbcebde34
vdpau: Adjust necessary #includes for vdpau_internal.h
2015-02-14 10:56:01 -08:00
Gilles Chanteperdrix
8ca098f444
avcocdec/mpegaudio_parser: add MP3 ADU headers parser
...
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 19:32:42 +01:00
Diego Biurrun
2a9c6fae92
dca: Move all tables into dcadata.h
2015-02-14 10:13:49 -08:00
Diego Biurrun
8a213179af
dca: Remove trace debugging code
2015-02-14 10:13:49 -08:00
Diego Biurrun
a96f51f29a
dca: Return more informative error codes
2015-02-14 10:13:49 -08:00
Diego Biurrun
b339019de4
dca: Split code for handling the EXSS extension off into a separate file
2015-02-14 10:13:49 -08:00
Diego Biurrun
7f9f771eac
avcodec: Don't anonymously typedef structs
2015-02-14 10:13:49 -08:00
Himangi Saraogi
7769be590c
vp56: Return meaningful error codes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-02-14 09:24:13 -08:00
Christophe Gisquet
b533949813
x86: hevc: remove a parameter to WP internals
...
The second stride is always the internal buffer one, MAX_PB_SIZE (times 2 to
get the value in bytes).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 17:22:50 +01:00
zhaoxiu.zeng
a196e0c66d
avcodec/vc1_pred: few branchless optimizations
...
This is also simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 17:13:16 +01:00
Zhaoxiu Zeng
3b5ad8fbf7
avcodec/parser: optimize ff_mpeg4video_split()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 14:54:39 +01:00
Paul B Mahol
ba22295e76
lavc: deprecate VIMA decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-14 12:48:41 +00:00
zhaoxiu.zeng
ac7fc444ee
avcodec/apedec: simplify sign conversion
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 01:09:44 +01:00
zhaoxiu.zeng
b11a187575
avcodec/golomb: simplify sign conversion
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14 00:41:45 +01:00
zhaoxiu.zeng
0073c8e345
avcodec/apedec: move 'coeffs[256] and delay[256]' into, long_filter_high_3800
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 23:23:27 +01:00
zhaoxiu.zeng
9e6198f0a4
avcodec/wmalosslessdec: simplify
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 23:08:00 +01:00
zhaoxiu.zeng
80f1378005
avcodec/wmalosslessdec: optimize sign operation
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 18:34:29 +01:00
zhaoxiu.zeng
bc0a440e88
avcodec/wmalosslessdec: change type of acfilter_coeffs from int64_t to int16_t
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 18:20:46 +01:00
zhaoxiu.zeng
e4ea84e12e
avcodec/wmv2: simplify cbp_table_index calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 15:55:12 +01:00
zhaoxiu.zeng
b4b9a64bdb
avcodec/vc1: simplify vc1_split()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 14:47:58 +01:00
zhaoxiu.zeng
b39ac9d210
avcodec/vc1: simplify find_next_marker()
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 14:01:45 +01:00
Michael Niedermayer
3e2714992b
Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'
...
* commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc':
hevc: Use generic av_clip function, not C implementation
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
See: 83976e40e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-13 12:34:18 +01:00
Peter Meerwald
eea769df32
hevc: Use generic av_clip function, not C implementation
...
hevc seems to be the only place where the C implementation
of the av_clip function is explicitly selected, precluding
platform-specific optimizations
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-13 08:37:13 +01:00
James Almer
1679d68dbf
x86/hevc_mc: optimize AVX2 mc functions
...
Before
40766 decicycles in ff_hevc_put_hevc_qpel_h64_8_avx2, 8192 runs, 0 skips
After
37975 decicycles in ff_hevc_put_hevc_qpel_h64_8_avx2, 8192 runs, 0 skips
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-12 13:21:58 -03:00
James Almer
14b44c1614
x86/hevc_sao: make sao_edge_filter_{10,12} work on x86_32
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-12 13:21:30 -03:00
Michael Niedermayer
cab6302534
avcodec/arm/videodsp_armv5te: Fix linking failure with "g++ -shared -D__STDC_CONSTANT_MACROS -o test.so ... libavcodec.a"
...
Tested-by: Andreas Haupt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-12 16:35:29 +01:00
Michael Niedermayer
9843746570
avcodec/mpegvideo_enc: correctly initialize chroma_intra_matrix for MPEG1/2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-12 00:19:22 +01:00
Michael Niedermayer
0bcb040a2e
avcodec/mpegvideo_enc: Consider chroma_intra_matrix in dct_quantize_trellis_c()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11 23:58:22 +01:00
Michael Niedermayer
7cac568b39
avcodec/mjpegenc: support trellis quantization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11 21:52:55 +01:00
Michael Niedermayer
7366bb38f1
avcodec/mpegvideo_enc: Add intra_chroma_ac_vlc_length, it will be needed for mjpeg
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11 21:35:53 +01:00
Michael Niedermayer
08509c8f86
avcodec/mjpegdec: Skip blocks which are outside the visible area
...
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash.avi
Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11 03:53:30 +01:00
Paul B Mahol
392d975efe
avcodec: fix clobbered ff_get_buffer()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-10 14:20:32 +00:00
Paul B Mahol
e4eba9e21d
avcodec/mss4: use av_malloc_array()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-10 09:35:23 +00:00
Paul B Mahol
fd6768a4b8
avcodec/huffman: check if map was allocated too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-10 09:35:23 +00:00
Paul B Mahol
a5398aa56c
avcodec/hevc_parser: check for av_mallocz() failure
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-10 09:35:23 +00:00
James Almer
06fe6dfe12
x86/hevc_sao: make sao_band_filter work on x86_32
...
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-09 20:41:21 -03:00
Paul B Mahol
238247b622
avcodec/sgienc: return meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-09 14:07:54 +00:00
Michael Niedermayer
d80fe5d4bc
avcodec/vb: Check for av_mallocz() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-09 09:27:16 +01:00
Seppo Tomperi
03cecf45c1
hevcdsp: ARM NEON optimized transforms
...
cherry picked from commit b153f55935969c794de4640f8d34e01c58e027ae
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 23:29:35 +01:00
Christophe Gisquet
b61b9e4919
x86: hevc_mc: remove lea in EPEL_LOAD
...
The second parameter to the macro is always an immediate address,
so no lea is needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 22:19:35 +01:00
Christophe Gisquet
4919b38421
x86: hevc_mc: fewer gpr autoloads for _v filters
...
In that case, it's just to load my, but mx/r3src is not used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 22:19:34 +01:00
James Almer
92d903afaa
x86/vp9dsp: fix clobbering of xmm6 on IDCT sse2 functions
...
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-08 00:50:39 -03:00
Michael Niedermayer
7c148f30f3
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Support decoding yuv dpx images.
Do not use -mdynamic-no-pic on OSX x86_64.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 02:36:23 +01:00
Michael Niedermayer
2048126ea7
avcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 02:27:27 +01:00
Michael Niedermayer
de6df46120
avcodec/h264: Setup decoder to have matching reference to the EC code
...
Also move EC ref initialization to where the EC code is called.
Fixes out of array read
Fixes: asan_heap-uaf_143f420_142_20110805_112659_ch0.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 02:27:27 +01:00
Michael Niedermayer
ecfd48dc06
avcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other parts of the h264 decoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 02:27:27 +01:00
Carl Eugen Hoyos
2efaaf9476
Support decoding yuv dpx images.
2015-02-08 00:12:46 +01:00
Christophe Gisquet
626d6184ce
x86: lavc/hevc_mc: fix comments
...
The width parameter is now completely at the back, and actually
never used. This helps understanding the actual parameter list.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 20:52:03 +01:00
Paul B Mahol
134e8c73ea
avcodec/faxcompr: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-07 17:16:14 +00:00
Christophe Gisquet
97996eff4f
hevc/sao: do in-place band filtering when possible
...
The copies are only needed when data must be restored, so skip them
when it must not be.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 18:04:25 +01:00
Christophe Gisquet
ed450d4acf
x86: lavc: share more constant through defines
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 17:48:14 +01:00
Paul B Mahol
ec8ec999f4
avcodec/twinvqdec: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-07 15:19:03 +00:00
Christophe Gisquet
691b7f5e9e
lavc/lossless_audiodsp: revert various commits
...
Their intent was to make the DSP work with wmalossless pro.
The later was fixed to work with the DSP.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 15:15:19 +01:00
Christophe Gisquet
46e2afa4dc
wmalossless: reset lms_update
...
It may contain garbage at the end, and zeroing allows using DSP
with longer loops.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 15:14:32 +01:00
Hendrik Leppkes
8029af586f
dxva2_hevc: properly fill the scaling list structure
...
The scaling list can be specified in either the SPS or PPS.
Additionally, compensate for the diagonal scan permutation applied
in the decoder.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-07 14:33:29 +01:00
Anshul Maheshwari
f05efd42af
avcodec/ccaption_dec: Added Debug logs
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 06:01:31 +01:00
Anshul Maheshwari
5647286e67
avcodec/ccaption_dec: handle error from ass_sub api
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 05:51:17 +01:00
Anshul Maheshwari
bf30161a8d
avcodec/ccaption_dec: Added Roll up functionality
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 05:51:10 +01:00
Michael Niedermayer
2fd9ce92af
avcodec/h264_slice: assert that reinit does not occur after the first slice
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 03:59:45 +01:00
Michael Niedermayer
38d5241b7f
avcodec/h264_slice: ignore SAR changes in slices after the first
...
Fixes race condition and null pointer dereference
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 03:59:45 +01:00
Michael Niedermayer
f111831ed6
avcodec/h264_slice: Check picture structure before setting the related fields
...
This might fix a hypothetical race condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 03:59:45 +01:00
Michael Niedermayer
f906982c94
avcodec/h264_slice: Do not change frame_num after the first slice
...
Fixes potential race condition
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 02:20:14 +01:00
Christophe Gisquet
9dc45d1f42
x86: lavc: share more constants
...
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 23:35:02 +01:00
Michael Niedermayer
bfb988b1fa
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavc/tscc: Make 32bit output opaque.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 22:31:32 +01:00
Mickaël Raulet
6ecc3fd612
x86/hevc_mc: use aligned loads
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 21:38:00 +01:00
James Almer
383fddeec6
x86/lossless_audiodsp: fix compilation with --disable-yasm
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-06 17:30:17 -03:00
Carl Eugen Hoyos
d45fadb6df
lavc/tscc: Make 32bit output opaque.
...
Found-by: wm4
2015-02-06 21:02:08 +01:00
Michael Niedermayer
9bc7ee8a98
avcodec/avfft: Add simple self test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 19:07:29 +01:00
Timothy Gu
5081012eb8
audioconvert: Add missing include for FF_API_AUDIO_CONVERT
...
Fixes warning in `make checkheaders`.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 19:07:29 +01:00
James Almer
aea29a891f
x86/hevc_sao: fix loading of RIP address
...
pb_eo must be handled as a rip relative address for MSVC64, so an
intermediate register is needed. Should fix link failures.
Suggested by Hendrik Leppkes and Christophe Gisquet.
Tested-By: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-06 15:06:15 -03:00
Mickaël Raulet
bcb0925115
x86/hevc: use CLIPW macro when possible
...
Conflicts:
libavcodec/x86/hevc_mc.asm
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 17:38:47 +01:00
Christophe Gisquet
5eedd36df1
x86: hevc_mc: use epel_hv 16-wide function
...
The epel_hv functions were still relying on only epel_hv 8-wide
being the maximum width instanciated.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 17:37:56 +01:00
Pierre Edouard Lepere
a0d1300f71
x86: hevc_mc: add AVX2 optimizations
...
before
33304 decicycles in luma_bi_1, 523066 runs, 1222 skips
38138 decicycles in luma_bi_2, 523427 runs, 861 skips
13490 decicycles in luma_uni, 516138 runs, 8150 skips
after
20185 decicycles in luma_bi_1, 519970 runs, 4318 skips
24620 decicycles in luma_bi_2, 521024 runs, 3264 skips
10397 decicycles in luma_uni, 515715 runs, 8573 skips
Conflicts:
libavcodec/x86/hevc_mc.asm
libavcodec/x86/hevcdsp_init.c
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 17:20:47 +01:00
Michael Niedermayer
6fafc62b0b
avcodec/h264: Be more strict on rejecting pps/sps changes
...
Fixes race condition
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 15:22:51 +01:00
Michael Niedermayer
31cc9c04ca
avcodec/h264: Be more strict on rejecting pps_id changes
...
Fixes race condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 15:22:51 +01:00
Michael Niedermayer
69aa79365c
avcodec/h264_ps: More completely check the bit depths
...
Fixes out of array read
Fixes: asan_static-oob_30328b6_719_cov_3325483287_H264_artifacts_motion.h264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 04:32:14 +01:00
Michael Niedermayer
a6c2c8fe3f
Revert "avcodec/x86/lossless_audiodsp: Make scalarproduct_and_madd_int16 prototypes more similar"
...
This reverts commit 3b4ffba3af
.
Unbreaks the SSSE3 code on mingw32
Conflicts:
libavcodec/x86/lossless_audiodsp.asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 02:31:45 +01:00
Michael Niedermayer
f1214763af
avcodec/x86/lossless_audiodsp: Move order&8 fallback into C code
...
This is simpler and more robust, and fixes mismatching XMM save restore
mismatches
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 02:18:54 +01:00
Michael Niedermayer
d41b66a1a2
avcodec/vp3: pass correct context to av_log()
...
Fixes null pointer dereference
Fixes: signal_sigsegv_000_3694_cov_1050071691_theora.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 00:34:09 +01:00
Michael Niedermayer
3b4ffba3af
avcodec/x86/lossless_audiodsp: Make scalarproduct_and_madd_int16 prototypes more similar
...
This is needed as the mmx code is used as fallback from the ssse3 code
Suggested-by: jamrial
Tested-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06 00:20:59 +01:00
Michael Niedermayer
43b1fd5bb4
avcodec/hevc: drop redundant ifs()
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 22:29:55 +01:00
Seppo Tomperi
0c494114cc
hevcdsp: ARM NEON optimized deblocking filter
...
cherry picked from commit 1b9ee47d2f43b0a029a9468233626102eb1473b8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 22:01:52 +01:00
Christophe Gisquet
9a2f5d825a
hevc: free sao buffers when receiving a new SPS
...
The buffer pointers would be otherwise overwritten, causing a
leak on e.g. PERSIST_RPARAM_A_RExt_Sony_1.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 21:50:35 +01:00
wm4
a83b6b077c
vp9: assign PTS to visible instead of invisible frames
...
All the webm/vp9 files I have seen so far can have packets that contain
1 invisible and 1 visible frame. The vp9 parser separates them. Since
the invisible frame is always (?) the first sub-packet, the new packet
is assigned the PTS of the original packet, while the packet containing
the visible frame has no PTS.
This patch essentially reassigns the PTS from the invisible to the
visible frame.
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 21:16:26 +01:00
James Almer
15574c505b
x86/hevcdsp: add ff_hevc_sao_edge_filter_{10,12}_{sse2,avx2}
...
Original x86 intrinsics code by Pierre-Edouard Lepere.
Yasm port, refactoring and optimizations by James Almer.
Benchmarks of BQTerrace_1920x1080_60_qp22.bin with an Intel Core i5-4200U
Width 32
342694 decicycles in sao_edge_filter_10, 16384 runs, 0 skips
29476 decicycles in ff_hevc_sao_edge_filter_32_10_ssse3, 16384 runs, 0 skips
13996 decicycles in ff_hevc_sao_edge_filter_32_10_avx2, 16381 runs, 3 skips
Width 64
581163 decicycles in sao_edge_filter_10, 8192 runs, 0 skips
59774 decicycles in ff_hevc_sao_edge_filter_64_10_ssse3, 8192 runs, 0 skips
28383 decicycles in ff_hevc_sao_edge_filter_64_10_avx2, 8191 runs, 1 skips
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-05 15:02:33 -03:00
James Almer
042c1159fc
x86/hevcdsp: add ff_hevc_sao_edge_filter_8_{ssse3,avx2}
...
Original x86 intrinsics code and initial yasm port by Pierre-Edouard Lepere.
Refactoring and optimizations by James Almer.
Benchmarks of BQTerrace_1920x1080_60_qp22.bin with an Intel Core i5-4200U
Width 32
158583 decicycles in edge, sao_edge_filter_8 runs, 0 skips
5205 decicycles in ff_hevc_sao_edge_filter_32_8_ssse3, 32767 runs, 1 skips
2942 decicycles in ff_hevc_sao_edge_filter_32_8_avx2, 32767 runs, 1 skips
Width 64
705639 decicycles in sao_edge_filter_8, 262144 runs, 0 skips
19224 decicycles in ff_hevc_sao_edge_filter_64_8_ssse3, 262111 runs, 33 skips
10433 decicycles in ff_hevc_sao_edge_filter_64_8_avx2, 262115 runs, 29 skips
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-05 15:02:27 -03:00
James Almer
1f1c7c8a57
hevcdsp: remove compilation-time-fixed parameter from sao_edge_filter
...
The stride_src parameter is always 2 * MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE.
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-05 15:02:22 -03:00
Michael Niedermayer
e09ad5bd0d
avcodec/h264_refs: set last_pic_for_ec only if it has not been set previously
...
This ensures we do not loose the frame in case or multiple clears
Fixes out of array read
Fixes: asan_heap-oob_2fa47ea_2100_cov_1278768963_ff_add_pixels_clamped_mmx.m2ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 14:57:42 +01:00
Paul B Mahol
dccd648f9f
avcodec/alsdec: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-05 09:48:54 +00:00
Paul B Mahol
57bca64b3f
avcodec/cllc: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-05 09:48:54 +00:00
Philip Langdale
d20df2601f
avcodec/nvenc: De-compensate aspect ratio compensation of DVD-like content.
...
For reasons we are not privy to, nvidia decided that the nvenc encoder
should apply aspect ratio compensation to 'DVD like' content, assuming that
the content is not bt.601 compliant, but needs to be bt.601 compliant. In
this context, that means that they make the following, questionable,
assumptions:
1) If the input dimensions are 720x480 or 720x576, assume the content has
an active area of 704x480 or 704x576.
2) Assume that whatever the input sample aspect ratio is, it does not account
for the difference between 'physical' and 'active' dimensions.
From, these assumptions, they then conclude that they can 'help', by adjusting
the sample aspect ratio by a factor of 45/44. And indeed, if you wanted to
display only the 704 wide active area with the same aspect ratio as the full
720 wide image - this would be the correct adjustment factor, but what if you
don't? And more importantly, what if you're used to ffmpeg not making this kind
of adjustment at encode time - because none of the other encoders do this!
And, what if you had already accounted for bt.601 and your input had the
correct attributes? Well, it's going to apply the compensation anyway!
So, if you take some content, and feed it through nvenc repeatedly, it
will keep scaling the aspect ratio every time, stretching your video out
more and more and more.
So, clearly, regardless of whether you want to apply bt.601 aspect ratio
adjustments or not, this is not the way to do it. With any other ffmpeg
encoder, you would do it as part of defining your input paramters or
do the adjustment at playback time, and there's no reason by nvenc
should be any different.
This change adds some logic to undo the compensation that nvenc would
otherwise do.
nvidia engineers have told us that they will work to make this
compensation mechanism optional in a future release of the nvenc
SDK. At that point, we can adapt accordingly.
Signed-off-by: Philip Langdale <philipl@overt.org>
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 02:32:33 +01:00
Michael Niedermayer
fd52d2d3d1
avcodec/mpegvideo_motion: Fix gmc chroma dimensions
...
Fixes integer overflow and out of array read
Fixes: asan_heap-oob_1fb2f9b_3780_cov_3984375136_usf.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-05 00:33:50 +01:00
James Almer
7457afc64d
hevcdsp: replace the SAOParams struct parameter from sao_edge_filter
...
As with sao_band_filter, pass instead the two variables from the struct needed in the function.
This simplifies writing asm optimized versions.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-04 17:53:04 -03:00
James Almer
121ccc3365
hevcdsp: further simplify sao_edge_filter
...
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-04 17:52:59 -03:00
Seppo Tomperi
4386e1fd94
hevcdsp: simplified sao_edge_filter
...
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
2015-02-04 17:52:54 -03:00
Seppo Tomperi
74d7faf400
hevcdsp: separated sao edge filter and pixel restore funcs
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
2015-02-04 17:52:49 -03:00
Michael Niedermayer
fabbfaa095
avcodec/mjpegdec: Check number of components for JPEG-LS
...
Fixes out of array accesses
Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 20:49:12 +01:00
Michael Niedermayer
afa92907f3
avcodec/mjpegdec: Check escape sequence validity
...
Fixes assertion failure
Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 20:14:18 +01:00
Hendrik Leppkes
b11994593a
dxva2_hevc: properly fill the scaling list structure
...
The scaling list can be specified in either the SPS or PPS.
Additionally, compensate for the diagonal scan permutation applied in the decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 16:31:49 +01:00
Paul B Mahol
9f1a5dbc26
avcodec/cdxl: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 13:40:04 +00:00
Michael Niedermayer
ba4fba8f48
Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'
...
* commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e':
aacdec: Support for ER AAC ELD 480.
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 13:49:17 +01:00
Michael Niedermayer
dd72e26d0c
Merge commit '7640c4a371a97899dfb443d980fd0bf8ac587754'
...
* commit '7640c4a371a97899dfb443d980fd0bf8ac587754':
aacdec: Tables for length 480 AAC ELD.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 13:40:23 +01:00
Michael Niedermayer
f53aa3f4f3
Merge commit '0ee2573347ecdb9cb5656001f7201d819eec16d8'
...
* commit '0ee2573347ecdb9cb5656001f7201d819eec16d8':
aacdec: Support for ER AAC in LATM
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 13:31:24 +01:00
Michael Niedermayer
5348d7b605
Merge commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167'
...
* commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167':
aacdec: Refactor aac_er_decode_frame.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 13:18:51 +01:00
Michael Niedermayer
0afc26d330
Merge commit '82bd8a57692d8f3643ad0903c97e4a0f84393f53'
...
* commit '82bd8a57692d8f3643ad0903c97e4a0f84393f53':
aacdec: Refactor decode_ics_info.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 13:09:52 +01:00
Paul B Mahol
cecc4ea1fc
avcodec/evrcdec: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 09:45:42 +00:00
Paul B Mahol
63cb546f0a
avcodec/wnv1: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 09:45:41 +00:00
Paul B Mahol
1634d2bcd1
avcodec/on2avc: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 09:45:41 +00:00
Paul B Mahol
49f8257135
avcodec/tak_parser: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 09:45:41 +00:00
Paul B Mahol
c93a7b264f
avcodec/ac3dec: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 09:45:41 +00:00
Paul B Mahol
e9eb94ac5a
avcodec/qcelpdec: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 09:45:41 +00:00
Paul B Mahol
6e7ac5ee55
avcodec/webp: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-04 09:45:41 +00:00
Reimar Döffinger
8c1ce7787a
aacsbr: silence message for SBR extension "padding".
...
Some files contain a few additional, all-0 bits.
Check for that case and don't print incorrect "not supported"
message.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
2015-02-03 20:32:16 -08:00
Alex Converse
d615187f74
aacdec: Support for ER AAC ELD 480.
...
Based in part on work from Niel van der Westhuizen <espes@pequalsnp.com>.
2015-02-03 20:32:16 -08:00
Niel van der Westhuizen
7640c4a371
aacdec: Tables for length 480 AAC ELD.
2015-02-03 20:32:16 -08:00
Niel van der Westhuizen
0ee2573347
aacdec: Support for ER AAC in LATM
2015-02-03 20:32:16 -08:00
Alex Converse
edd9ea3ffb
aacdec: Refactor aac_er_decode_frame.
2015-02-03 20:32:15 -08:00
Alex Converse
82bd8a5769
aacdec: Refactor decode_ics_info.
2015-02-03 20:32:15 -08:00
Christophe Gisquet
52f2adc015
avcodec/hevc: Update the USE_SAO_SMALL_BUFFER case for the alignment requirements in FFmpeg
...
Use edge emu buffers
And enable the code unconditionally
Speed difference without USE_SAO_SMALL_BUFFER and with the new code:
Decicycles: 26772->26220 (BO32), 83803->80942 (BO64)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 01:54:22 +01:00
Christophe Gisquet
00fe77855b
avcodec/hevc: Do not zero is_pcm on allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 01:54:13 +01:00
Fabrice Bellard
da81cc38e8
avcodec/hevc: reduce memory for SAO
...
cherry picked from commit 5d9f79edef2c11b915bdac3a025b59a32082f409
SAO edge filter uses pre-SAO pixel data on the left and top of the ctb, so
this data must be kept available. This was done previously by having 2
copies of the frame, one before and one after SAO.
This commit reduces the storage to just that, instead of the previous whole
frame.
Commit message taken from patch by Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-04 01:54:01 +01:00
Michael Niedermayer
741b56fcee
avcodec/svq1dec: Add assert to ensure "stages >= 0"
...
This is currently always true, the assert protects against
future changes to the code breaking this assumtation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 23:03:38 +01:00
Michael Niedermayer
cba3a46e93
Merge commit '9b8c8a9395c849639aea0f6b5300e991e93c3a73'
...
* commit '9b8c8a9395c849639aea0f6b5300e991e93c3a73':
svq1dec: Validate the stages value strictly
Not merged, this is wrong, the condition is not possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 23:03:19 +01:00
Michael Niedermayer
acfb4ede2f
Merge commit '6f7a32839d1b913be8170e91c3ac9816b314da21'
...
* commit '6f7a32839d1b913be8170e91c3ac9816b314da21':
svq1enc: correctly handle memory error and allocations
Conflicts:
libavcodec/svq1enc.c
See: 79888388e7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 22:40:46 +01:00
Luca Barbato
9b8c8a9395
svq1dec: Validate the stages value strictly
...
It can be less than -1.
Bug-Id: CID 1194397 / CID 1194398
CC: libav-stable@libav.org
2015-02-03 15:23:21 +00:00
Michael Niedermayer
6f7a32839d
svq1enc: correctly handle memory error and allocations
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-03 15:23:21 +00:00
Rong Yan
fc35df8931
avcodec/ppc/idctdsp.c: POWER LE support in idct_add_altivec()
...
also add GET_TMP2() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 06:16:39 +01:00
Michael Niedermayer
7b32b35bf5
Merge commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8'
...
* commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8':
opus: Factor out imdct15 into a standalone component
Conflicts:
configure
libavcodec/opus_celt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 20:43:13 +01:00
Michael Niedermayer
aab902e646
Merge commit '28df0151b6618226b05ee52e031af0b11ca531b0'
...
* commit '28df0151b6618226b05ee52e031af0b11ca531b0':
configure: Add a dependency on vc1_decoder from vc1_parser
See: 6ac3c8c6a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 20:32:05 +01:00
Michael Niedermayer
d525b45fde
avcodec/hevc_filter: Fix indention
...
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 19:56:44 +01:00
Mickaël Raulet
7cf6a67ef9
avcodec/hevc: adding support for monochrome sequences in hevc
...
cherry picked from commit 8e50557707d2ec11ccad657470b2e140f314348e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 18:10:57 +01:00
Jean First
ecc92ee717
lavc/libopenjpegenc: move opj_create_compress, opj_cio_open and opj_set_event_mgr to libopenjpeg_encode_frame
...
libopenjpegenc crashes with "pointer being freed was not allocated" when threading
is enabled with:
ffmpeg -i tests/vsynth1/01.pgm -vcodec libopenjpeg file.j2k
this appears to be a bug in libopenjpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 17:54:05 +01:00
Jean First
6d1d036e2c
lavc/libopenjpegenc: factorize cinema parameters to it's own function
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 17:32:54 +01:00
Diego Biurrun
3d5d46233c
opus: Factor out imdct15 into a standalone component
...
It will be reused by the AAC decoder.
2015-02-02 16:07:33 +01:00
Martin Storsjö
28df0151b6
configure: Add a dependency on vc1_decoder from vc1_parser
...
This fixes builds with vc1_parser enabled without vc1_decoder. All
the vc1_decoder object files were included in the vc1_parser line
in libavcodec/Makefile before, but architecture specific object files
for vc1_decoder were not.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-02 15:30:54 +02:00
Michael Niedermayer
6e95c67330
avcodec/wavpackenc: remove unneeded L suffixes
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 13:34:31 +01:00
James Almer
aa945dc112
x86/hevcdsp: add missing vzeroupper in ff_hevc_sao_band_filter_48_*_avx2
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-02 00:01:35 -03:00
Ben Boeckel
1fe94ea79e
vorbis: parse out setup headers as well
...
Prevents an 'Invalid packet' message. Currently mid-stream setup packets
are ignored. Theoretically, they could, based on the specification, be used to
reinitialize the stream if parameters change, but I don't expect that to be
common (and no one seems to have asked for it).
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 03:11:49 +01:00
James Almer
71e2cb4706
x86/hevcdsp: add missing guards to ff_hevc_sao_band_filter_avx2
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-01 21:45:52 -03:00
Christophe Gisquet
6a6aeb538b
hevc/sao: use aligned copies
...
For band filter, source and destination are aligned (except for 16x16 ctbs),
and otherwise, they are most often aligned. Overall, the total width is also
too small for amortizing memcpy.
Timings (using an intrinsic version of edge filters):
B/32 B/64 E/32 E/64
Before: 32045 93952 38925 126896
After: 26772 83803 33942 117182
2015-02-01 20:23:03 -03:00
Christophe Gisquet
bff7feb328
x86: hevc/sao: aligned source buffers
...
Usefull for at least band filter, for which:
- Band filter call only:
32 64
Before: 16556 54015
After: 16497 52355
- Whole case:
32 64
Before: 37031 103008
After: 32045 93952
2015-02-01 20:22:54 -03:00
James Almer
fa3eccb4f9
x86/hevc: add ff_hevc_sao_band_filter_{8,10,12}_{sse2,avx,avx2}
...
Original x86 intrinsics code and initial 8bit yasm port by Pierre-Edouard Lepere.
10/12bit yasm ports, refactoring and optimizations by James Almer
Benchmarks of BQTerrace_1920x1080_60_qp22.bin with an Intel Core i5-4200U
width 32
40338 decicycles in sao_band_filter_0_8, 2048 runs, 0 skips
8056 decicycles in ff_hevc_sao_band_filter_8_32_sse2, 2048 runs, 0 skips
7458 decicycles in ff_hevc_sao_band_filter_8_32_avx, 2048 runs, 0 skips
4504 decicycles in ff_hevc_sao_band_filter_8_32_avx2, 2048 runs, 0 skips
width 64
136046 decicycles in sao_band_filter_0_8, 16384 runs, 0 skips
28576 decicycles in ff_hevc_sao_band_filter_8_32_sse2, 16384 runs, 0 skips
26707 decicycles in ff_hevc_sao_band_filter_8_32_avx, 16384 runs, 0 skips
14387 decicycles in ff_hevc_sao_band_filter_8_32_avx2, 16384 runs, 0 skips
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-01 20:22:35 -03:00
Michael Niedermayer
4531e2c489
avcodec/mpegvideo_enc: Fix number suffixes in rc_buffer_size calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 20:00:10 +01:00
Michael Niedermayer
592ba6ec10
avcodec/h264_cabac: use int instead of long for mbb_xy
...
The mb address fits in int
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 20:00:10 +01:00
Michael Niedermayer
b4ad2853c5
avcodec/dxtory: Use LL instead of L number suffix
...
This is probably unneeded and normal int would be fine, but its
safer to use LL and this isnt speed relevant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 20:00:10 +01:00
James Almer
2929e56006
hevcdsp: replace the SAOParams struct parameter from sao_band_filter
...
Pass instead the two variables from the struct needed in the function.
This simplifies writing asm optimized versions of the function
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-01 15:45:20 -03:00
James Almer
65e6ab0c5a
hevcdsp: remove unused parameter from sao_band_filter
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-01 15:45:14 -03:00
Michael Niedermayer
0ff8fe10f2
avcodec/h261enc: Fix number suffix
...
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 19:13:38 +01:00
Michael Niedermayer
61aca123fb
avcodec/h261dec: Fix exported MVs for skipped MBs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 18:48:23 +01:00
Michael Niedermayer
0182e5a740
avcodec/nellymoserenc: replace assert by av_assert1()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 17:56:01 +01:00
Carl Eugen Hoyos
f018b1f3a0
Support YA16 in jpeg 2000.
2015-02-01 16:18:39 +01:00
Paul B Mahol
021c0c5f52
avcodec/motion_est: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-01 11:15:20 +00:00
Paul B Mahol
01a3c5dae0
avcodec/put_bits: remove unneeded #include, there are no assert()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-01 11:15:20 +00:00
Christophe Gisquet
cb335b3af2
dvenc: fix 2x4x8 (interlaced) weight table
...
Since the decoder has been fixed to output something similar to
other implementations, the encoder weight table needed this fix.
Reference PSNR values on a progressive sequence (from tiny_psnr)
from a chained encoding and decoding:
Full progressive: stddev: 0.74 PSNR: 50.69 MAXDIFF: 19
Before: stddev: 1.43 PSNR: 44.97 MAXDIFF: 17
This patch: stddev: 0.76 PSNR: 50.44 MAXDIFF: 14
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 02:01:55 +01:00
Michael Niedermayer
b80106169a
avcodec/motion_est: Set subcmp consistently for H261
...
Fixes Ticket3150
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 21:14:08 +01:00
Michael Niedermayer
3aefa1eb69
avcodec/h261enc: More specific return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 19:59:53 +01:00
Michael Niedermayer
b9c3f041e0
avcodec/h261enc: Avoid casts, Simplify code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 19:59:26 +01:00
Michael Niedermayer
958836f8c5
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 14:29:15 +01:00
Carl Eugen Hoyos
f9f9ae1b77
lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
2015-01-31 10:05:24 +01:00
Carl Eugen Hoyos
4faea46bd9
lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
2015-01-31 10:05:10 +01:00
Paul B Mahol
bc74f946bc
avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:06 +00:00
Paul B Mahol
335c150ba1
avcodec/svq1dec: remove unneeded #include, there are no assert()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:06 +00:00
Michael Niedermayer
9f73b88c62
avcodec/h261enc: fix dquant encoding
...
Fixes Ticket4111
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 04:57:50 +01:00
Michael Niedermayer
f5722ba276
libavcodec/h264: replace assert() by av_assert0()
...
also remove the now unneeded #include <assert.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 02:37:19 +01:00
Michael Niedermayer
be2ebc723d
avcodec/ratecontrol: replace asserts by av_asserts
...
Also remove the now unneeded #include <assert.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31 01:48:21 +01:00
Paul B Mahol
2ff7e81b3c
avcodec/vp3: use init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 19:15:01 +00:00
Michael Niedermayer
dffc16d523
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Respect horizontal differencing predictor for 16bit gray tiff images.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 19:01:56 +01:00
Michael Niedermayer
d0f315ab6c
avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 16:44:00 +01:00
Michael Niedermayer
3531594017
ppc/mpegvideo_altivec: Change assert to av_assert2()
...
And move it to where the variable is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 16:43:14 +01:00
Paul B Mahol
be128c1e34
avcodec/videodsp_template: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 15:32:11 +00:00
Paul B Mahol
3db9960e0a
avcodec/qdm2: remove unneeded #include, there are no assert()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-30 15:32:11 +00:00
Carl Eugen Hoyos
50144b91ea
Respect horizontal differencing predictor for 16bit gray tiff images.
...
Fixes ticket #4291 .
2015-01-30 14:12:55 +01:00
Michael Niedermayer
a73c411809
avcodec/aacdec: remove unneeded #include, theres no assert() in aacdec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 02:29:38 +01:00
Michael Niedermayer
305cbe76d3
avcodec/wma: remove unneeded #includes, there are no assert() only av_assert*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 02:26:17 +01:00
Michael Niedermayer
2b215b7f5a
avcodec/hevc: Check for av_malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 00:44:51 +01:00
Michael Niedermayer
5008605bf2
avcodec/hevc: Replace more mallocs by av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 00:44:50 +01:00
Anshul Maheshwari
93fac23b80
avcodec/ccaption_dec: Adding color and fonts for future use in screen
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30 00:04:51 +01:00
Michael Niedermayer
c16896f525
Merge commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0'
...
* commit 'c01ccccbb13f464e74bb8498a8c573a66c430ca0':
ituh263dec: use macro instead of #if
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 22:02:22 +01:00
Michael Niedermayer
e18e5ae62c
Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a'
...
* commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a':
mpegvideo_enc: initialize the encoding context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 21:36:20 +01:00
Michael Niedermayer
56252a5e09
Merge commit '1a07df31128da3a0020b66502399989b91770d44'
...
* commit '1a07df31128da3a0020b66502399989b91770d44':
DNxHD: Add support for id 1258 (DNx100 960x720@8)
Conflicts:
Changelog
libavcodec/dnxhddata.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 21:21:49 +01:00
Michael Niedermayer
64e7cf1253
Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'
...
* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
DNxHD: Simplify pixel format detection
Conflicts:
libavcodec/dnxhddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 20:54:25 +01:00
Michael Niedermayer
e5b7e2224f
Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'
...
* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
DNxHD: More verbose error messages
Conflicts:
libavcodec/dnxhddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 20:38:35 +01:00
Vittorio Giovara
70d246d5cc
flacenc: initialize sums matrix
...
CC: libav-stable@libav.org
Bug-Id: CID 703821
2015-01-29 17:33:38 +00:00
Vittorio Giovara
c01ccccbb1
ituh263dec: use macro instead of #if
2015-01-29 17:33:34 +00:00
Vittorio Giovara
302ca6b20e
mpegvideo_enc: initialize the encoding context
...
This prevents several uninitialized variable uses that take
place towards the end of encoding.
CC: libav-stable@libav.org
Bug-Id: CID 700760
2015-01-29 15:26:33 +00:00
Vittorio Giovara
1a07df3112
DNxHD: Add support for id 1258 (DNx100 960x720@8)
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-01-29 15:04:57 +00:00
Vittorio Giovara
598f7d046c
DNxHD: Simplify pixel format detection
...
Error out in case of unknown values.
2015-01-29 15:04:46 +00:00
Vittorio Giovara
41e03e284e
DNxHD: More verbose error messages
2015-01-29 15:04:35 +00:00
Michael Niedermayer
d39fa69dfc
Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'
...
* commit '6996fd204a7f28b46a8c3c97bcf223998218c743':
libopenh264: Log debug messages to a non-null context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29 14:13:25 +01:00
Martin Storsjö
6996fd204a
libopenh264: Log debug messages to a non-null context
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-29 09:16:35 +02:00
Carl Eugen Hoyos
3ea97767e4
Add an ARES atom to extradata when encoding avui.
...
Allows playback with QuickTime and the original codec.
Tested by Olaf Matthes, olaf matthes gmx de
2015-01-29 01:07:08 +01:00
Michael Niedermayer
72db3c79df
Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'
...
* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
h264: Do not share rbsp_buffer across threads
Conflicts:
libavcodec/h264.c
See: ecbf838c7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 22:44:09 +01:00
Michael Niedermayer
61928b68dc
h264: Do not share rbsp_buffer across threads
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2015-01-28 16:28:58 +01:00
Michael Niedermayer
ccaa5dcb31
avcodec/h264_parser: Rename close()
...
This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 13:11:03 +01:00
Timo Rothenpieler
fb34c580bb
avcodec/nvenc: Handle non-square pixel aspect ratios
...
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 06:10:40 +01:00
Reimar Döffinger
d96090e7b6
Support BMP files that do not properly align lines.
...
Quite a few programs missed that detail of the spec
(including old versions of FFmpeg I believe) and when
we would otherwise fail anyway it seems worth a try
to use a simple byte-aligned stride instead.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2015-01-27 21:29:42 +01:00
Michael Niedermayer
c5b6b711b2
Merge commit '607ad990d31e6be52980970e5ce8cd25ab3de812'
...
* commit '607ad990d31e6be52980970e5ce8cd25ab3de812':
dvbsubdec: check memory allocations and propagate errors
Conflicts:
libavcodec/dvbsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 20:25:40 +01:00
Michael Niedermayer
4ce67c961c
Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'
...
* commit 'a536a4e4bc52d05f59869761337452fb1f1977f6':
lavc: support extracting audio service type from side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 18:50:47 +01:00
Michael Niedermayer
62a82c66cd
Merge commit '728685f37ab333ca35980bd01766c78d197f784a'
...
* commit '728685f37ab333ca35980bd01766c78d197f784a':
Add a side data type for audio service type.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 18:03:43 +01:00
Michael Niedermayer
3c831fba08
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
...
* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
lavc: deprecate unused AVCodecContext.stream_codec_tag
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 17:08:40 +01:00
Michael Niedermayer
a764402394
avcodec/h263dec: Try to use codec_tag instead of the stream_codec_tag
...
If this causes problems then the stream_codec_tag should be enabled again
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 17:03:42 +01:00
Vittorio Giovara
607ad990d3
dvbsubdec: check memory allocations and propagate errors
2015-01-27 15:26:37 +00:00
Michael Niedermayer
be023405a7
Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'
...
* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
avidec: do not export stream_codec_tag
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 16:17:42 +01:00
Michael Niedermayer
392080cbe5
Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
...
* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
h264: drop any pretense of support for data partitioning
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 16:03:23 +01:00
Michael Niedermayer
ad3412d028
Merge commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8'
...
* commit 'ecab21ac47d0d4ca604bebf494017ae5090853a8':
h264: do not reset the ref lists in flush_change()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 15:15:18 +01:00
Michael Niedermayer
6e57d2da90
Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'
...
* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
h264: move parser-only variables to their own context
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 15:08:17 +01:00
Michael Niedermayer
3d04117078
Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
...
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
error_resilience: move the MECmpContext initialization into ER code
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 14:56:52 +01:00
Michael Niedermayer
a7fa1b9aa1
Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
...
* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
hevc: unref the current frame if frame_start() fails
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 13:15:06 +01:00
Michael Niedermayer
74e5a5a849
Merge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'
...
* commit '1dd021929f8157b88529ce1e6ab6351dd2899e89':
hevc: clear unused refs on failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 13:02:36 +01:00
Michael Niedermayer
ed8de1570d
Merge commit 'f9f883af4fe615a832407a657752e248a96c6280'
...
* commit 'f9f883af4fe615a832407a657752e248a96c6280':
h264: simplify code in flush_dpb()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:55:21 +01:00
Hendrik Leppkes
36962ad233
Add DXVA2 HEVC HWAccel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
f8ecffa9b7
hevc: reindent after previous commit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
b2e9b0f5d4
hevc: add hwaccel hooks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
06894f1a04
hevc: store the short term rps flag and size in the context
...
For future use by hardware accelerators.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Hendrik Leppkes
2af82a1ad9
hevc: store the escaped/raw bitstream in HEVCNAL
...
Hardware Accelerators require access to the escaped bitstream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 12:37:34 +01:00
Anton Khirnov
a536a4e4bc
lavc: support extracting audio service type from side data
2015-01-27 09:22:33 +01:00
Anton Khirnov
728685f37a
Add a side data type for audio service type.
...
Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.
2015-01-27 09:17:48 +01:00
Anton Khirnov
e44b58924f
lavc: deprecate unused AVCodecContext.stream_codec_tag
2015-01-27 09:14:39 +01:00
Anton Khirnov
f771b3ab5d
avidec: do not export stream_codec_tag
...
Handle its only existing use case internally.
2015-01-27 09:13:45 +01:00
Anton Khirnov
167e004e1a
h264: drop any pretense of support for data partitioning
...
It does not work correctly and apparently never did. There is no
indication that this (mis)feature is ever used in the wild or even that
any software other than the reference supports it.
Since the code that attempts to support it adds some nontrivial
complexity and has resulted in several bugs in the past, it is better to
just drop it.
2015-01-27 09:10:12 +01:00
Anton Khirnov
58ae8d5957
h264_parser: restore a comment lost in 0268a54
2015-01-27 09:09:56 +01:00
Anton Khirnov
ecab21ac47
h264: do not reset the ref lists in flush_change()
...
They are always constructed anew when needed, so there is no need to
reset them explicitly.
2015-01-27 09:09:29 +01:00
Anton Khirnov
9404a47a2d
h264: move parser-only variables to their own context
2015-01-27 09:08:31 +01:00
Anton Khirnov
cf1e0786ed
error_resilience: move the MECmpContext initialization into ER code
...
Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.
2015-01-27 09:07:59 +01:00
Hendrik Leppkes
7e850fa67e
Add DXVA2 HEVC HWAccel
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:05:31 +01:00
Hendrik Leppkes
b82722df9b
hevc: reindent after previous commit
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:05:25 +01:00
Hendrik Leppkes
e72e8c5a1d
hevc: add hwaccel hooks
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:05:08 +01:00
Hendrik Leppkes
4b95e95dba
hevc: store the short term rps flag and size in the context
...
For future use by hardware accelerators.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:04:59 +01:00
Hendrik Leppkes
36779a8405
hevc: store the escaped/raw bitstream in HEVCNAL
...
Hardware Accelerators require access to the escaped bitstream.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:04:44 +01:00
Hendrik Leppkes
b0593a4bca
hevc: pass the full HEVCNAL struct to decode_nal_unit
...
This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-01-27 09:04:29 +01:00
Anton Khirnov
443b71928b
hevc: unref the current frame if frame_start() fails
...
Prevents DPB from filling up with damaged input.
2015-01-27 08:34:56 +01:00
Anton Khirnov
1dd021929f
hevc: clear unused refs on failure
2015-01-27 08:34:46 +01:00
Anton Khirnov
f9f883af4f
h264: simplify code in flush_dpb()
...
There is no point in clearing reference explicitly, since that will be
done as a part of ff_h264_unref_picture() right below.
2015-01-27 08:34:24 +01:00
Timo Rothenpieler
914fd42b8a
avcodec/nvenc: Fix b-frame parameter handling
...
This should behave similar to x264 and other encoders, as it handles a
gop_size of 0 as Intra-Only, while it's still possible to control how
many B-Frames it inserts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-26 15:39:01 +01:00
Christophe Gisquet
7aeafacfd0
x86/sbrdsp: Use different mem moves
...
Before
2843 decicycles in ff_sbr_autocorrelate_sse3, 262086 runs, 58 skips
After
2693 decicycles in ff_sbr_autocorrelate_sse3, 262117 runs, 27 skips
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-25 18:20:43 -03:00
James Almer
449b21bfab
x86/sbrdsp: add ff_sbr_autocorrelate_{sse,sse3}
...
2 to 2.5 times faster.
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-25 18:20:39 -03:00
Philip Langdale
ff0c559329
nvenc: Propagate desired number of reference frames.
...
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-24 22:59:54 +01:00
Hendrik Leppkes
77140279d3
hevc: pass the full HEVCNAL struct to decode_nal_unit
...
This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-24 17:49:27 +01:00
Jean First
1f13348f7d
lavc/libopenjpegenc: move opj_setup_encoder to libopenjpeg_encode_frame
...
if the openjpeg parameter tcp_rates is not 0 ( using the ffmpeg compression_level option )
every 2nd image per thread is badly encoded. By moving the opj_setup_encoder function from
libopenjpeg_encode_init to libopenjpeg_encode_frame this can be prevented.
This fixes ticket #3754 .
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-24 00:40:08 +01:00
Michael Niedermayer
e40cdf8604
Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'
...
* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf':
mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions
Conflicts:
libavcodec/mpegvideo_enc.c
See: 1e78679768
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 22:03:21 +01:00
Michael Niedermayer
2a06c2a03e
mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions
...
This improves motion estimation and avoids using uninitialized data
for resolutions that aren't a multiple of 16.
Prior to d2a25c40
, the edges used to be initialized so that encoding
was deterministic, but after that commit it started using uninitialized
data (for non multiple of 16 resolutions).
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-23 15:05:49 +02:00
Michael Niedermayer
ecd39520b8
avcodec/h264: Partially decode and display single fields try #2
...
This like the previous attempt does not fully correctly decode this
type of non standard H.264, but it now works fully automatic
requiring no manual filters or flags to be used
See Ticket2254
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 00:47:24 +01:00
Derek Buitenhuis
41e983f1a6
libx265: Pass through user-set frame type
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-01-22 16:30:27 +00:00
Derek Buitenhuis
6341ab0ad3
libx265: Pass through user-set frame type
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-01-22 16:29:30 +00:00
Michael Niedermayer
146a2c4e7f
avcodec/mpegvideo: also export 0,0 motion vectors
...
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 12:36:45 +01:00
Carl Eugen Hoyos
6c559a0a9d
lavc/pnm: Support decoding ya16.
2015-01-22 01:49:04 +01:00
Carl Eugen Hoyos
196dd72bcf
lavc/pamenc: Support encoding ya16be.
2015-01-22 01:47:54 +01:00
Carl Eugen Hoyos
c2e36e07cd
lavc/tiffenc: Support encoding ya16le.
2015-01-22 01:38:58 +01:00
Carl Eugen Hoyos
c6a36f6931
lavc/pngenc: Support encoding ya16be.
2015-01-22 01:33:05 +01:00
agathah
dac91bb4c3
avcodec/nvenc: set repeatSPSPPS flag for streaming
...
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21 13:59:35 +01:00
Andreas Cadhalpun
840c3c0531
libavcodec/ppc/mpegvideoencdsp.c: fix stack smashing in pix_norm1_altivec() and pix_sum_altivec()
...
The vec_ste calls were mistakenly changed to vec_vsx_st in c5ca76a
, which
caused stack smashing.
Changing them back fixes crashes on ppc64el, when configured with
--toolchain=hardened.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21 03:20:41 +01:00
Michael Niedermayer
6c9dfa5a1b
Merge commit '440119b18836887d98c9e337c5911563bb43588c'
...
* commit '440119b18836887d98c9e337c5911563bb43588c':
libopenh264enc: Move a declaration of a variable into an ifdef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 21:55:23 +01:00
Michael Niedermayer
87c4a80e56
Merge commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e'
...
* commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e':
libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 21:15:25 +01:00
Martin Storsjö
440119b188
libopenh264enc: Move a declaration of a variable into an ifdef
...
This avoids needing an attribute for silencing warnings about
it being unused.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-20 15:02:50 +01:00
Martin Storsjö
bba0247926
libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header
...
The 1.3 release branch of OpenH264 (as well as the master branch)
have been updated so that GCC no longer warns about this variable
as being unused.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-20 15:02:38 +01:00
Anshul Maheshwari
1013c15f72
changed name of erase_display_memory to screen_changed
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 14:40:07 +01:00
Anshul Maheshwari
d6d354254f
Initilaize array to known size
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 14:39:39 +01:00
Anshul Maheshwari
88ba88e887
CHAR_DEBUG to av_dlog
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 14:39:32 +01:00
Anshul Maheshwari
012559f2bb
Cosmetic changes in cc_caption
...
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 14:39:15 +01:00
Michael Niedermayer
ff5b9a1cbe
Revert "avcodec/h264: also show frames with missing fields when CODEC_FLAG2_SHOW_ALL is set"
...
Fixes regression
Fixes Ticket4274
Suggested-by: kierank
This reverts commit fe439c2069
.
2015-01-20 02:51:33 +01:00
Michael Niedermayer
7873f9aa72
avcodec/snowdec: AVMotionVector support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 01:16:25 +01:00
Michael Niedermayer
e069a4bf20
avcodec/snowdec: set AVFrame.pict_type correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 01:10:37 +01:00
wm4
e0e33ebe6b
h264: unref leaking error recovery picture
...
This leaked a frame on each avcodec_flush_buffers() call, if frame
threading was enabled. It caused severe memory usage in player if you
were seeking a lot.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 20:11:39 +01:00
Michael Niedermayer
f9a5a89bbf
avcodec/xsubdec: Check av_mallocz() return codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 17:15:15 +01:00
Michael Niedermayer
438c0a665a
avcodec/xan: Use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 17:12:09 +01:00
Michael Niedermayer
79888388e7
avcodec/svq1enc: fix error handling/cleanup in case of ff_get_buffer() or scratchbuffer alloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 21:25:06 +01:00
Michael Niedermayer
2a3af77284
avcodec/svq1enc: Check memory allocations
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 21:21:44 +01:00
Michael Niedermayer
dff6c9250b
avcodec/mpegvideo_parser: Check the ff_set_dimensions() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 05:08:30 +01:00
Michael Niedermayer
741fa0493b
avcodec/mpegvideo_parser: more robust dimension setup
...
Before this missing seq headers could have led to wrong dimensions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18 04:52:28 +01:00
Clément Bœsch
4d028bf202
avcodec/vp8: remove double ;;
2015-01-18 00:34:19 +01:00
Clément Bœsch
ca3c7be7c6
avcodec/tiffenc: remove double ;;
2015-01-18 00:33:06 +01:00
Timo Rothenpieler
bc3f76779b
avcodec/nvenc: Add support for nvenc api version 5
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 18:24:34 +01:00
Michael Niedermayer
8de0990e9f
avcodec/dvbsubdec: Check get_region() return value
...
Fixes null pointer dereference with DEBUG enabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 16:33:02 +01:00
Michael Niedermayer
f8ff76199c
avcodec/mss12: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 13:01:26 +01:00
Michael Niedermayer
1f4ef3ccae
avcodec/libopusenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 12:58:56 +01:00
Michael Niedermayer
7532f0e14c
avcodec/libmp3lame: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 12:56:19 +01:00
Michael Niedermayer
c4d85fc23c
avcodec/flac_parser: fix handling EOF if no headers are found
...
Fixes assertion failure
Fixes Ticket4269
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 01:56:03 +01:00
Michael Niedermayer
040e5703e6
avcodec/flac_parser: print error messages in case of errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 01:40:39 +01:00
Michael Niedermayer
f96148913b
Fix precission typos
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 22:42:42 +01:00
Michael Niedermayer
2c22042aa0
avcodec/g2meet: Use av_mallocz_array() for framebuffer allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 23:04:59 +01:00
Michael Niedermayer
5989a2b24f
avcodec/g722enc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 23:02:43 +01:00
Michael Niedermayer
71bd6ea0fa
avcodec/flashsv2enc: use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 23:00:52 +01:00
Michael Niedermayer
e7d85186d6
avcodec/parser: Check that the parser return code is valid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 20:58:58 +01:00
Michael Niedermayer
6c3cb02a74
avcodec/flac_parser: Check for av_malloc() failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 17:09:39 +01:00
Michael Niedermayer
5f964c6027
avcodec/flac_parser: Use sizeof(variable) instead of sizeof(type)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 17:09:39 +01:00
agathah
72c61c272c
avcodec/nvenc: fix b frame settings
...
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 16:29:25 +01:00
Michael Niedermayer
330e892c08
Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'
...
* commit 'def69553e745e007925147b2e7e4b32c57d08fdf':
h264_cabac: Break infinite loops
Conflicts:
libavcodec/h264_cabac.c
See: cdf0877bc3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 14:32:33 +01:00
Michael Niedermayer
c5eb725fd3
Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'
...
* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
bsf: check memory allocations
Conflicts:
libavcodec/noise_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 13:47:12 +01:00
Michael Niedermayer
9fb5a91c66
Merge commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39'
...
* commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39':
vp8: improve memory allocation checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15 13:10:48 +01:00