]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Sat, 28 Jun 2014 18:35:27 +0000 (20:35 +0200)]
avfilter/dctdnoiz: rewrite [f/i]dct
This removes the avcodec dependency and make the code almost twice as
fast. More to come.
The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).
Michael Niedermayer [Tue, 5 Aug 2014 14:15:22 +0000 (16:15 +0200)]
avdevice/lavfi: Simplify non-AV stream check
Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 12:42:35 +0000 (14:42 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not automatically map subtitles if the decoder and encoder properties are different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 7 Aug 2014 05:12:46 +0000 (02:12 -0300)]
lavf: remove nonexistent functions from the version file
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 7 Aug 2014 05:12:45 +0000 (02:12 -0300)]
lavc: remove nonexistent functions from the version file
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 7 Aug 2014 11:16:38 +0000 (13:16 +0200)]
Do not automatically map subtitles if the decoder and encoder properties are different.
Fixes ticket #3819.
James Almer [Thu, 7 Aug 2014 03:43:03 +0000 (00:43 -0300)]
lavd/dshow: use av_codec_get_id()
ff_codec_get_id() is a lavf internal function
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 7 Aug 2014 04:22:48 +0000 (01:22 -0300)]
avcodec/raw: add avpriv_get_raw_pix_fmt_tags()
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 10:16:49 +0000 (12:16 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 7 Aug 2014 07:55:40 +0000 (09:55 +0200)]
lavf/mpegts: Do not return the result of a (void) function from a void function.
Fixes compilation with Sun C 5.10.
Carl Eugen Hoyos [Thu, 7 Aug 2014 07:12:34 +0000 (09:12 +0200)]
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
This is a workaround for the issue that stream probing can use
the score of another codec type for mpeg stream autodetection.
Fixes ticket #3821.
James Almer [Wed, 6 Aug 2014 23:59:56 +0000 (20:59 -0300)]
lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()
The were wrongly being exported and used by libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:53:30 +0000 (02:53 +0200)]
Merge commit '
b50173a4dd47b9c3c89845b781fa958ccf860929 '
* commit '
b50173a4dd47b9c3c89845b781fa958ccf860929 ':
movenc: fix QT chapter track character encoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:42:15 +0000 (02:42 +0200)]
Merge commit '
da9cc22d5bd5f59756c2037b02966376da2cf323 '
* commit '
da9cc22d5bd5f59756c2037b02966376da2cf323 ':
movenc: add track title to tracks
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:35:39 +0000 (02:35 +0200)]
Merge commit '
d9432789bd119f0e37bcf65cebda05d36aafd4ed '
* commit '
d9432789bd119f0e37bcf65cebda05d36aafd4ed ':
movenc: remove pointless loop around BITEXACT test
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:27:07 +0000 (02:27 +0200)]
avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"
Add padding, clear size, use the correct pointer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Aug 2014 00:06:45 +0000 (02:06 +0200)]
Merge commit '
7b588bb691644e1b3c168b99accf74248a24e3cf '
* commit '
7b588bb691644e1b3c168b99accf74248a24e3cf ':
svq1: do not modify the input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 23:56:28 +0000 (01:56 +0200)]
Merge commit '
c7d9b473e28238d4a4ef1b7e8b42c1cca256da36 '
* commit '
c7d9b473e28238d4a4ef1b7e8b42c1cca256da36 ':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 23:29:42 +0000 (01:29 +0200)]
Merge commit '
a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812 '
* commit '
a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812 ':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
See:
ad002e1a13a8df934bd6cb2c84175a4780ab8942
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 6 Aug 2014 22:07:59 +0000 (19:07 -0300)]
libavcodec/rawdec: remove old ff_find_pix_fmt() function
It's been dead code for more than a year
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 19:21:53 +0000 (21:21 +0200)]
avformat/dtsdec: check more of the dca headers in dts_probe()
Fixes misdetection of 664461_flac_16_44100_2.wav
Fixes Ticket3830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 19:29:36 +0000 (21:29 +0200)]
avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Thu, 31 Jul 2014 18:51:40 +0000 (11:51 -0700)]
movenc: fix QT chapter track character encoding
An encoding ("encd") box is required to tell QT that the string is UTF8
John Stebbins [Thu, 31 Jul 2014 17:00:05 +0000 (10:00 -0700)]
movenc: add track title to tracks
John Stebbins [Wed, 6 Aug 2014 14:42:18 +0000 (07:42 -0700)]
movenc: remove pointless loop around BITEXACT test
Anton Khirnov [Sun, 3 Aug 2014 08:14:48 +0000 (10:14 +0200)]
svq1: do not modify the input packet
The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.
Also, check the size of the header, avoiding invalid reads on truncated
data.
CC:libav-stable@libav.org
Michael Niedermayer [Wed, 6 Aug 2014 18:35:53 +0000 (20:35 +0200)]
Merge commit '
ed6d9ce914d552eeda16af857da97c4b1aea1e3f '
* commit '
ed6d9ce914d552eeda16af857da97c4b1aea1e3f ':
configure: Include the armcc build number in the compiler identification
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 6 Aug 2014 10:56:34 +0000 (10:56 +0000)]
cdgraphics: do not return 0 from the decode function
0 means no data consumed, so it can trigger an infinite loop in the
caller.
CC:libav-stable@libav.org
Anton Khirnov [Wed, 6 Aug 2014 10:46:50 +0000 (10:46 +0000)]
cdgraphics: switch to bytestream2
Fixes possible invalid memory accesses on corrupted data.
CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674
Michael Niedermayer [Wed, 6 Aug 2014 18:27:52 +0000 (20:27 +0200)]
Merge commit '
cbc808d726afdf53d866264722785c1304c17390 '
* commit '
cbc808d726afdf53d866264722785c1304c17390 ':
jpeg2000: enable 4 component pixel formats
See:
f0358dc1d30cd4f4862489ab95c4d408b00a8b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 6 Aug 2014 07:43:43 +0000 (07:43 +0000)]
x86: sbrdsp/fft: reuse ps_neg constant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 6 Aug 2014 07:43:42 +0000 (07:43 +0000)]
x86: diracdsp: reuse constants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 6 Aug 2014 07:43:41 +0000 (07:43 +0000)]
x86: dwt: better share constants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 6 Aug 2014 07:43:40 +0000 (07:43 +0000)]
x86: better share ff_pw_2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Wed, 6 Aug 2014 07:43:39 +0000 (07:43 +0000)]
x86: vpx/h264/hevc/mpeg2: share constants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 28 Jul 2014 08:51:29 +0000 (11:51 +0300)]
configure: Include the armcc build number in the compiler identification
This tries to find the most expressive part of the output of
armcc --vsn to include, giving a compiler identification of
"ARM Compiler 5.04 update 2 (build 82)" instead of just
"ARM Compiler 5.04" for armcc 5.0.
4.x versions of armcc output the following, for "armcc --vsn":
ARM C/C++ Compiler, RVCT4.0 [Build 925]
For evaluation purposes only
Software supplied by: ARM Limited
ARM C/C++ Compiler, 4.1 [Build 894]
For evaluation purposes only
Software supplied by: ARM Limited
5.0 versions output this:
Product: ARM Compiler 5.04
Component: ARM Compiler 5.04 update 2 (build 82)
Tool: armcc [
5040081 ]
For evaluation purposes only
Software supplied by: ARM Limited
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 6 Aug 2014 13:43:38 +0000 (15:43 +0200)]
avcodec: Change get_pixels() to ptrdiff_t linesize
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 12:05:03 +0000 (14:05 +0200)]
avutil/cpu: check av_parse_cpu_caps() table during cpu-test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 12:21:24 +0000 (14:21 +0200)]
avutil/cpu: Make cpu flag names match between cpu-test and av_parse_cpu_caps() tables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 11:59:18 +0000 (13:59 +0200)]
avutil/cpu: add aarch64 entries to 2nd table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 6 Aug 2014 10:07:08 +0000 (11:07 +0100)]
jpeg2000: enable 4 component pixel formats
Bug-Id: 721
CC: libav-stable@libav.org
Sample-Id: 31230.mov
Christophe Gisquet [Mon, 4 Aug 2014 20:29:37 +0000 (22:29 +0200)]
hevc_deblock: change tc type
The x86 asm expects int32_t so use that type.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Wed, 6 Aug 2014 00:59:15 +0000 (17:59 -0700)]
transcode_aac: fix const return value
Fixes Trac #3613.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Aug 2014 01:51:49 +0000 (03:51 +0200)]
doc/muxers: document which applications are known to need disable_chpl.
Thanks to: John Stebbins <stebbins@jetheaddev.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 23:16:56 +0000 (01:16 +0200)]
avutil/cpu: output cpu data to stdout
Errors go to stderr, but the cpu stats are non error output for cputest
This fixes echoing the cpu test results
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 23:17:51 +0000 (01:17 +0200)]
tests/fate/libavutil: switch cpu-test back to runecho so its results are vissible
(needs next commt too)
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 23:45:29 +0000 (01:45 +0200)]
avutil/pixelutils: check for malloc failure
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 23:27:38 +0000 (01:27 +0200)]
avutil/pixelutils: avoid on stack arrays
The arrays are fairly large and could cause problems on some embedded systems
also they are not endian safe as they mix 32 and 8bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 22:35:53 +0000 (00:35 +0200)]
avutil/cpu: fix cpu-test to work with ffmpegs cpuflags syntax
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 22:07:08 +0000 (00:07 +0200)]
Merge commit '
a7153444df9040bf6ae103e0bbf6104b66f974cb '
* commit '
a7153444df9040bf6ae103e0bbf6104b66f974cb ':
huffyuvdec: check width size for yuv422p
Conflicts:
libavcodec/huffyuvdec.c
See:
6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 21:40:58 +0000 (23:40 +0200)]
Merge commit '
70cd3b8e659c3522eea5c16a65d14b8658894a94 '
* commit '
70cd3b8e659c3522eea5c16a65d14b8658894a94 ':
mmvideo: check horizontal coordinate too
See:
8d3c99e825317b7efda5fd12e69896b47c700303
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Aug 2014 23:54:33 +0000 (00:54 +0100)]
huffyuvdec: check width size for yuv422p
Avoid out of array accesses.
CC: libav-stable@libav.org
Bug-Id: CVE-2013-0848
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 3 Aug 2014 18:24:18 +0000 (19:24 +0100)]
mmvideo: check horizontal coordinate too
Fixes out of array accesses.
Bug-Id: CVE-2013-3672
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Clément Bœsch [Tue, 5 Aug 2014 19:15:13 +0000 (21:15 +0200)]
avfilter/select: fix "t" eval variable comment
Clément Bœsch [Sat, 2 Aug 2014 16:59:02 +0000 (18:59 +0200)]
avfilter/select: remove optional avcodec dependency
Clément Bœsch [Sat, 2 Aug 2014 16:58:39 +0000 (18:58 +0200)]
avfilter/mp_decimate: remove avcodec dependency
Clément Bœsch [Sat, 2 Aug 2014 16:57:32 +0000 (18:57 +0200)]
avfilter/deshake: remove avcodec dependency
Clément Bœsch [Sat, 2 Aug 2014 16:56:01 +0000 (18:56 +0200)]
build: remove wrong avcodec dep in decimate
This was probably a mistake with mpdecimate. The decimate filter doesn't
depend on avcodec.
Clément Bœsch [Sat, 2 Aug 2014 16:54:43 +0000 (18:54 +0200)]
avutil: add pixelutils API
Michael Niedermayer [Tue, 5 Aug 2014 17:40:23 +0000 (19:40 +0200)]
Merge commit '
849b9d34c7ef70b370c53e7af3940f51cbc07d0f '
* commit '
849b9d34c7ef70b370c53e7af3940f51cbc07d0f ':
wmalosslessdec: fix mclms_coeffs* array size
See:
ec9578d54d09b64bf112c2bf7a34b1ef3b93dbd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 17:31:08 +0000 (19:31 +0200)]
Merge commit '
15201e256035a3e8f9d3d7b96fc327467e1a8ead '
* commit '
15201e256035a3e8f9d3d7b96fc327467e1a8ead ':
configure: check $as first before using $gas as GNU as
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 17:10:05 +0000 (19:10 +0200)]
Merge commit '
d395895cdb2ac8c95bd488549e7f893bd4dcc248 '
* commit '
d395895cdb2ac8c95bd488549e7f893bd4dcc248 ':
fate: generate tests/pixfmts.mak for all targets requiring it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 16:16:46 +0000 (18:16 +0200)]
avformat/iff: Fix "source comment"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 14:31:21 +0000 (16:31 +0200)]
avfilter/vf_noise: make constant things const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 7 Feb 2014 14:07:23 +0000 (15:07 +0100)]
wmalosslessdec: fix mclms_coeffs* array size
Fixes corruption of context
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Bug-Id: CVE-2014-2098
Signed-off-by: Anton Khirnov <anton@khirnov.net>
mrskman [Mon, 4 Aug 2014 09:40:47 +0000 (11:40 +0200)]
avfilter/avf_showwaves: New p2p mode for showwaves filter
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 11:58:10 +0000 (13:58 +0200)]
Merge commit '
0897d2fdc7755849c3ae58d8b543ef734c200d3c '
* commit '
0897d2fdc7755849c3ae58d8b543ef734c200d3c ':
movenc: Add option to disable nero chapters
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 11:52:32 +0000 (13:52 +0200)]
Merge commit '
2601a9447efb778930b01ac58d2cc1d02498db4e '
* commit '
2601a9447efb778930b01ac58d2cc1d02498db4e ':
mpegts: Add HEVC definitions
Conflicts:
libavformat/mpegts.h
See:
b2880a3de9e3e160c47c069abcc8cb60015407b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 11:45:07 +0000 (13:45 +0200)]
Merge commit '
89616408e38ac7257e36976723df0e23d6ee1157 '
* commit '
89616408e38ac7257e36976723df0e23d6ee1157 ':
mpegts: Define the section length with a constant
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 11:22:34 +0000 (13:22 +0200)]
Merge commit '
701e8b42e12ad625c64ceae2252acb1de390278c '
* commit '
701e8b42e12ad625c64ceae2252acb1de390278c ':
vc-1: Optimise parser (with special attention to ARM)
Conflicts:
libavcodec/vc1_parser.c
See:
a0d7f9ec9a10d935b83a47dbcb2cd85dcc007738
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 5 Aug 2014 10:08:09 +0000 (12:08 +0200)]
configure: check $as first before using $gas as GNU as
llvm's integrated assembler supports the AArch64 asm on darwin since
August 2014. So check $as first before using gas-preprocessor.pl via
$gas. Makes the checks specific for that the architecture specific asm
needs. PPC Altivec and AArch64 needs on ':vararg' for macro arguments.
Arm needs in addition the '.altmacro' directive.
Michael Niedermayer [Tue, 5 Aug 2014 10:59:02 +0000 (12:59 +0200)]
Merge commit '
adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed '
* commit '
adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed ':
vc-1: Add platform-specific start code search routine to VC1DSPContext.
Conflicts:
configure
libavcodec/arm/vc1dsp_init_arm.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
See:
9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 5 Aug 2014 10:45:30 +0000 (12:45 +0200)]
Merge commit '
db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 '
* commit '
db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 ':
h264: Move start code search functions into separate source files.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_init_arm.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/startcode.c
libavcodec/startcode.h
See:
270cede3f3772117454a14b620803d731036942d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 5 Aug 2014 07:39:00 +0000 (09:39 +0200)]
fate: generate tests/pixfmts.mak for all targets requiring it
All subtargets which should run the fate-filter-pixdesc% need to
generate and include tests/pixfmts.mak. Most noteable missing target was
fate itself.
John Stebbins [Mon, 4 Aug 2014 20:13:44 +0000 (13:13 -0700)]
movenc: Add option to disable nero chapters
And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Femi Adeyemi-Ejeye [Wed, 30 Apr 2014 15:58:09 +0000 (16:58 +0100)]
mpegts: Add HEVC definitions
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
James Almer [Mon, 4 Aug 2014 02:53:40 +0000 (23:53 -0300)]
x86/vp9lpf: use fewer instructions in SPLATB_MIX
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Bernd Kuhls [Mon, 4 Aug 2014 19:12:29 +0000 (21:12 +0200)]
Fix compile error on bfin.
After the removal of all Blackfin architecture optimizations in
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=
b55d3bbeed375f7b74442c4dd274d116a3e3d2e1
some includes were left behind leading to a compile error:
CC libavformat/adtsenc.o
In file included from ./libavcodec/get_bits.h:35,
from ./libavcodec/ac3_parser.h:27,
from libavformat/ac3dec.c:23:
./libavcodec/mathops.h:43:29: error: bfin/mathops.h: No such file or directory
This compile error was found by buildroot autobuild system:
http://autobuild.buildroot.net/results/ae0/
ae056f267e907091d09d2a1546d6f1ae02fa23b9 /
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 23:43:21 +0000 (01:43 +0200)]
swscale/swscale_internal: fix ya16 -> rgba
Fixes Ticket644
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Mon, 4 Aug 2014 20:06:59 +0000 (22:06 +0200)]
lavd/avfoundation: Add device category.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 23:20:03 +0000 (01:20 +0200)]
Merge commit '
eee813eec7d3c0b0689f80665d3f796401742935 '
* commit '
eee813eec7d3c0b0689f80665d3f796401742935 ':
fate: Only generate tests/pixfmts.mak if some pixfmts fate test is run
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 23:15:00 +0000 (01:15 +0200)]
Merge commit '
990e2f3555bb0adae122d3599938ddcfee46e2d1 '
* commit '
990e2f3555bb0adae122d3599938ddcfee46e2d1 ':
avcodec: Suppress deprecation warnings from DTG code scheduled for removal
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 22:43:06 +0000 (00:43 +0200)]
Merge commit '
086a541857812b2e0435db38fbabfddc7d19e53c '
* commit '
086a541857812b2e0435db38fbabfddc7d19e53c ':
fate: png-suite
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 22:33:27 +0000 (00:33 +0200)]
swscale/swscale_unscaled: fix ya16 input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 20:51:19 +0000 (22:51 +0200)]
Merge commit '
60cbd6ad84de0931314030b81df87b69d6196587 '
* commit '
60cbd6ad84de0931314030b81df87b69d6196587 ':
tiff: support reading gray+alpha at 8 bits
Conflicts:
libavcodec/tiff.c
See:
f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 20:45:33 +0000 (22:45 +0200)]
Merge commit '
bcc5f69b33e27b5e11aaea8304ee02f8d895cdab '
* commit '
bcc5f69b33e27b5e11aaea8304ee02f8d895cdab ':
tiff: support reading gray+alpha at 16 bits
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 20:37:17 +0000 (22:37 +0200)]
Merge commit '
e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe '
* commit '
e64f0bf2d2b1347ec9461f0e82852a62e8c6ffbe ':
png: support reading gray+alpha at 16 bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 20:33:54 +0000 (22:33 +0200)]
Merge commit '
2257165bff243534982f4ddabae4e65e2a35f2ab '
* commit '
2257165bff243534982f4ddabae4e65e2a35f2ab ':
png: disable broken MMX/SIMD code for bpp <= 2
See:
d1c48025a71e9e190d79115759c10f5807f4d0a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 20:26:13 +0000 (22:26 +0200)]
Merge commit '
f84a1b597c29dc035b8d5529ef88c2d7ff057820 '
* commit '
f84a1b597c29dc035b8d5529ef88c2d7ff057820 ':
swscale: support AV_PIX_FMT_YA16 as input
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 3 Aug 2014 17:27:07 +0000 (19:27 +0200)]
mpegts: Define the section length with a constant
The specification says the value is expressed in 10 bits including
the 4-byte CRC.
Ben Avison [Mon, 21 Jul 2014 13:53:09 +0000 (14:53 +0100)]
vc-1: Optimise parser (with special attention to ARM)
The previous implementation of the parser made four passes over each input
buffer (reduced to two if the container format already guaranteed the input
buffer corresponded to frames, such as with MKV). But these buffers are
often 200K in size, certainly enough to flush the data out of L1 cache, and
for many CPUs, all the way out to main memory. The passes were:
1) locate frame boundaries (not needed for MKV etc)
2) copy the data into a contiguous block (not needed for MKV etc)
3) locate the start codes within each frame
4) unescape the data between start codes
After this, the unescaped data was parsed to extract certain header fields,
but because the unescape operation was so large, this was usually also
effectively operating on uncached memory. Most of the unescaped data was
simply thrown away and never processed further. Only step 2 - because it
used memcpy - was using prefetch, making things even worse.
This patch reorganises these steps so that, aside from the copying, the
operations are performed in parallel, maximising cache utilisation. No more
than the worst-case number of bytes needed for header parsing is unescaped.
Most of the data is, in practice, only read in order to search for a start
code, for which optimised implementations already existed in the H264 codec
(notably the ARM version uses prefetch, so we end up doing both remaining
passes at maximum speed). For MKV files, we know when we've found the last
start code of interest in a given frame, so we are able to avoid doing even
that one remaining pass for most of the buffer.
In some use-cases (such as the Raspberry Pi) video decode is handled by the
GPU, but the entire elementary stream is still fed through the parser to
pick out certain elements of the header which are necessary to manage the
decode process. As you might expect, in these cases, the performance of the
parser is significant.
To measure parser performance, I used the same VC-1 elementary stream in
either an MPEG-2 transport stream or a MKV file, and fed it through avconv
with -c:v copy -c:a copy -f null. These are the gperftools counts for
those streams, both filtered to only include vc1_parse() and its callees,
and unfiltered (to include the whole binary). Lower numbers are better:
Before After
File Filtered Mean StdDev Mean StdDev Confidence Change
M2TS No 861.7 8.2 650.5 8.1 100.0% +32.5%
MKV No 868.9 7.4 731.7 9.0 100.0% +18.8%
M2TS Yes 250.0 11.2 27.2 3.4 100.0% +817.9%
MKV Yes 149.0 12.8 1.7 0.8 100.0% +8526.3%
Yes, that last case shows vc1_parse() running 86 times faster! The M2TS
case does show a larger absolute improvement though, since it was worse
to begin with.
This patch has been tested with the FATE suite (albeit on x86 for speed).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Ben Avison [Mon, 21 Jul 2014 13:53:08 +0000 (14:53 +0100)]
vc-1: Add platform-specific start code search routine to VC1DSPContext.
Initialise VC1DSPContext for parser as well as for decoder.
Note, the VC-1 code doesn't actually use the function pointer yet.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Ben Avison [Mon, 21 Jul 2014 15:25:48 +0000 (16:25 +0100)]
h264: Move start code search functions into separate source files.
This permits re-use with parsers for codecs which use similar start codes.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Mon, 4 Aug 2014 20:12:24 +0000 (22:12 +0200)]
Merge commit '
e9abafca278f87e1ecc6d50091d99b73ff63c9a6 '
* commit '
e9abafca278f87e1ecc6d50091d99b73ff63c9a6 ':
avutil: add AV_PIX_FMT_YA16 pixel format
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 19:48:00 +0000 (21:48 +0200)]
Merge commit '
e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 '
* commit '
e96c3b81cadd0ba84d43b1f3a54980df3785d9a5 ':
avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/raw.c
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 19:33:07 +0000 (21:33 +0200)]
Merge commit '
e0d73fda361729d207e51fa2afd8ba6102e58d98 '
* commit '
e0d73fda361729d207e51fa2afd8ba6102e58d98 ':
avutil: add alias names for gray 8/16 colour spaces
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 19:24:24 +0000 (21:24 +0200)]
Merge commit '
d2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26 '
* commit '
d2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26 ':
pixdesc: Support pixelformat aliases
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Aug 2014 19:18:13 +0000 (21:18 +0200)]
Merge commit '
5420099cab1e915b191cceccec4364f54cec6e52 '
* commit '
5420099cab1e915b191cceccec4364f54cec6e52 ':
swscale: correctly pad destination buffer in rgb conversion
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 3 Aug 2014 13:21:15 +0000 (06:21 -0700)]
fate: Only generate tests/pixfmts.mak if some pixfmts fate test is run
Diego Biurrun [Mon, 4 Aug 2014 10:39:34 +0000 (03:39 -0700)]
avcodec: Suppress deprecation warnings from DTG code scheduled for removal