Michael Niedermayer
69ea65b46f
Merge commit ' 3e5898782d'
...
* commit '3e5898782d
2013-08-08 12:11:33 +02:00
Ben Avison
45e10e5c8d
arm: Add assembly version of h264_find_start_code_candidate
...
Before After
Mean StdDev Mean StdDev Change
This function 508.8 23.4 185.4 9.0 +174.4%
Overall 3068.5 31.7 2752.1 29.4 +11.5%
In combination with the preceding patch:
Before After
Mean StdDev Mean StdDev Change
Overall 2925.6 26.2 2752.1 29.4 +6.3%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-08 12:08:34 +03:00
Ben Avison
218d6844b3
h264dsp: Factorize code into a new function, h264_find_start_code_candidate
...
This performs the start code search which was previously part of
h264_find_frame_end() - the most CPU intensive part of the function.
By itself, this results in a performance regression:
Before After
Mean StdDev Mean StdDev Change
Overall time 2925.6 26.2 3068.5 31.7 -4.7%
but this can more than be made up for by platform-optimised
implementations of the function.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-08 12:08:30 +03:00
Ben Avison
7a82022ee2
h264_parser: Initialize the h264dsp context in the parser as well
...
Each AVStream struct for an H.264 elementary stream actually has two
copies of the H264DSPContext struct (and in fact all the other members
of H264Context as well):
((H264Context *) ((AVStream *)st)->codec->priv_data)->h264dsp
((H264Context *) ((AVStream *)st)->parser->priv_data)->h264dsp
but only the first of these was actually being initialised. This
prevented the addition of platform-specific implementations of
parser-related functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-08 12:08:28 +03:00
Kostya Shishkov
3e5898782d
Voxware MetaSound decoder
2013-08-08 10:52:44 +02:00
Michael Niedermayer
1b2a5817fc
Merge commit ' 22c879057e'
...
* commit '22c879057e
2013-08-08 10:49:23 +02:00
Rémi Denis-Courmont
fee9db1fdf
libavcodec: use avpriv_open()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-07 21:13:12 +02:00
Vittorio Giovara
22c879057e
mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-07 20:48:15 +02:00
Michael Niedermayer
2960576378
avcodec/g2meet: fix src pointer checks in kempf_decode_tile()
...
Fixes Ticket2842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-07 16:28:28 +02:00
Michael Niedermayer
5cd57e8758
avcodec/jpeg2000dec: check sample sepration for validity
...
Fixes division by 0
Fixes Ticket2841
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-07 15:09:35 +02:00
Michael Niedermayer
e4eab2d9bd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead
Conflicts:
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-07 12:14:39 +02:00
Kostya Shishkov
f544c58636
deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead
...
Voxware is the name of company, it has produced several audio codecs e.g.
MetaVoice family and MetaSound.
2013-08-07 10:56:18 +02:00
Michael Niedermayer
aa24729c21
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors
Conflicts:
libavcodec/pcm-mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 19:40:50 +02:00
Michael Niedermayer
83db013a06
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avcodec/options: Drop deprecation warning suppression macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 16:48:31 +02:00
Michael Niedermayer
7d03e60c12
Merge commit ' 86f4c59bd6'
...
* commit '86f4c59bd6
2013-08-06 16:37:08 +02:00
Michael Niedermayer
a97f749990
Merge commit ' 4d8d16b596'
...
* commit '4d8d16b596
2013-08-06 16:29:35 +02:00
Michael Niedermayer
9648c8e57b
Merge commit ' bc909626b0'
...
* commit 'bc909626b0
2013-08-06 16:24:08 +02:00
Michael Niedermayer
0df55e1ba8
Merge commit ' a22ae9f0c5'
...
* commit 'a22ae9f0c5
2013-08-06 16:23:32 +02:00
Michael Niedermayer
91062ddef1
Merge commit ' 43bacd5b7d'
...
* commit '43bacd5b7db5f4836f8c
2013-08-06 16:07:37 +02:00
Michael Niedermayer
f606c6e92c
Merge commit ' 090cd06311'
...
* commit '090cd063113a04c18d89
2013-08-06 15:57:35 +02:00
Michael Niedermayer
560e9365b6
Merge commit ' bc54c2ae3c'
...
* commit 'bc54c2ae3c
2013-08-06 15:26:04 +02:00
Michael Niedermayer
318d7a9638
avcodec/vdpau: include attributes.h, needed for attribute_deprecated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 14:49:03 +02:00
Michael Niedermayer
66056f74a1
avcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not defined
...
Similar to 50fb8c1114
2013-08-06 14:48:54 +02:00
Michael Niedermayer
9547e3eef3
Merge commit ' f824535a4a'
...
* commit 'f824535a4a
2013-08-06 14:30:49 +02:00
Michael Niedermayer
c3b2902320
Merge commit ' 2852740e23'
...
* commit '2852740e23
2013-08-06 14:25:26 +02:00
Michael Niedermayer
50fb8c1114
avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined
...
Prevent build failure for applicatins using the old API
This could be replaced be a include of version.h but some applications
would then need extern C wrapers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 14:15:17 +02:00
Michael Niedermayer
3b805dcaa9
Merge commit ' 549294fbbe'
...
* commit '549294fbbe
2013-08-06 13:54:05 +02:00
Michael Niedermayer
bf36dc50ea
Merge commit ' 578ea75a9e'
...
* commit '578ea75a9e
2013-08-06 13:24:22 +02:00
Christian Schmidt
1c6d2bb9a9
pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-06 13:19:29 +02:00
Diego Biurrun
0ba4ea312b
avcodec/options: Drop deprecation warning suppression macros
...
The options table is used in tools built by the host compiler and the
deprecation macros pull in bits that are not safe to use if host and
target compiler differ.
2013-08-06 03:05:03 +02:00
Carl Eugen Hoyos
4c15f3491f
Set bits_per_raw_sample when decoding pnm.
2013-08-06 00:26:21 +02:00
Kostya Shishkov
86f4c59bd6
twinvq: Split VQF-specific part from common TwinVQ decoder core
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-05 20:59:23 +02:00
Diego Biurrun
4d8d16b596
twinvq: Prefix enums and defines shared with VoxWare MetaSound
2013-08-05 20:19:11 +02:00
Kostya Shishkov
bc909626b0
twinvq: move all bitstream reading into single place
...
This is required for the future addition of VoxWare MetaSound decoder, for its
functions are mostly the same but bitstream reader is completely different
and bitstream format is slightly different too.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-05 19:37:47 +02:00
Ben Avison
a22ae9f0c5
mpegts: Remove one 64-bit integer modulus operation per packet
...
The common case of the pointer having increased by one packet (which results
in no change to the modulus) can be detected with a 64-bit subtraction,
which is far cheaper than a division on many platforms.
Before After
Mean StdDev Mean StdDev Change
Divisions 248.3 8.8 51.5 7.4 +381.7%
Overall 2773.2 25.6 2372.5 43.1 +16.9%
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-08-05 19:25:55 +03:00
Luca Barbato
43bacd5b7d
vc1: check mb_height validity.
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-08-05 16:24:13 +02:00
Luca Barbato
090cd06311
vc1: check the source buffer in vc1_mc functions
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-08-05 16:24:13 +02:00
Luca Barbato
9991298f2c
bink: Bound check the quantization matrix.
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-08-05 16:24:13 +02:00
Luca Barbato
bc54c2ae3c
libx264: add shortcut for the bluray compatibility option
...
As for intra-refresh it is just a commodity.
2013-08-05 16:13:35 +02:00
Timothy Gu
3217a706e2
libxvid: Reduce the size of an array
...
It is not possible to have a plugin[] array with 5 or more elements.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 15:11:17 +02:00
Michael Niedermayer
1ccc2157ff
avcodec/libxvid: Partially check plugins array size with assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 15:06:04 +02:00
Michael Niedermayer
412df0a52f
avcodec/libxvid: set lumi_aq for lumimasking
...
Simplifies check and should fix lumi+vari warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 15:06:04 +02:00
Rémi Denis-Courmont
f824535a4a
vdpau: deprecate bitstream buffers within the hardware context
...
The bitstream buffers are now private and freed by libavcodec. For
backward compatibility, the hold bitstream buffer pointer is left NULL
(applications were supposed to av_freep() it).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-05 11:21:36 +02:00
Rémi Denis-Courmont
2852740e23
vdpau: store picture data in picture's rather than codec's context
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-05 11:20:41 +02:00
Rémi Denis-Courmont
549294fbbe
vdpau: deprecate VDPAU codec capability
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-05 11:20:32 +02:00
Rémi Denis-Courmont
578ea75a9e
vdpau: remove old-style decoders
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-05 11:15:49 +02:00
Michael Niedermayer
22458ccbcc
avcodec/tta: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 10:15:03 +02:00
Michael Niedermayer
263da1a8f7
avcodec/eatgq: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 10:14:14 +02:00
Michael Niedermayer
5dff269998
avcodec/diracdec: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 10:13:48 +02:00
Michael Niedermayer
6ed1aa4f85
avcodec/ra144dec: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05 10:13:21 +02:00
