]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 29 Mar 2014 14:03:24 +0000 (15:03 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Add dvd subtitle support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Mar 2014 13:33:10 +0000 (14:33 +0100)]
Merge commit '
85698be461c07be10d873dd34348bcfe9ffc56e0 '
* commit '
85698be461c07be10d873dd34348bcfe9ffc56e0 ':
cmdutils: Mark exit_program as av_noreturn
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Mar 2014 03:25:50 +0000 (04:25 +0100)]
avcodec/vp7: check buffer size
Fixes overread
Fixes Ticket 3501
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 29 Mar 2014 02:18:45 +0000 (03:18 +0100)]
avcodec/xbmdec: redesign parser to handle more cases
The new code is more tolerant on the syntax
Fixes decoding of bm1.xbm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 23:16:43 +0000 (00:16 +0100)]
avformat/img2_alias_pix: rewrite probe function
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 23:18:56 +0000 (00:18 +0100)]
avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 16:24:48 +0000 (17:24 +0100)]
avformat/img2dec: Use avformat probing interface to identify format if it has not been otherwise identified
This is used only for distinguishing .pix formats for now.
Which is the only case that has image2 demuxers currently
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 16:24:10 +0000 (17:24 +0100)]
avformat: add image2 brender pix demuxer
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 16:23:32 +0000 (17:23 +0100)]
avformat: add image2 alias pix demuxer
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 20:03:14 +0000 (21:03 +0100)]
avformat/img2dec: make image2dec capable to be used from seperate demuxers
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 15:10:10 +0000 (16:10 +0100)]
avfilter/lavfutils: call av_find_stream_info() before reading various information about the stream
No testcase with unmodified source is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 15:03:33 +0000 (16:03 +0100)]
cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE
This fixes cases where the codec is detect later than the stream creation
No testcase with unmodified source known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Tue, 18 Mar 2014 14:50:25 +0000 (08:50 -0600)]
movenc: Add dvd subtitle support
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Fri, 28 Mar 2014 11:41:15 +0000 (12:41 +0100)]
fate/aliaspix: Use standard test sample
This also uses samples with odd resolution which should provide better coverage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 10:32:51 +0000 (11:32 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add a bmpparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 09:59:16 +0000 (10:59 +0100)]
Merge commit '
fb5cf145b6bcfa4f83af94398e5560c1132cc410 '
* commit '
fb5cf145b6bcfa4f83af94398e5560c1132cc410 ':
bmp: add a standalone parser
Conflicts:
Changelog
libavcodec/bmp_parser.c
libavcodec/version.h
See:
011ce89dba5c0c764abc5f39acb6368f580742e3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:49:22 +0000 (05:49 +0100)]
Merge commit '
991362fab49b60d34d89b7b7d6dd00fbec3ce022 '
* commit '
991362fab49b60d34d89b7b7d6dd00fbec3ce022 ':
fate: add XBM tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:34:25 +0000 (05:34 +0100)]
avcodec/xbmdec: support X10 format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:33:13 +0000 (05:33 +0100)]
avcodec/xbmdec: merge ptr increase into dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 04:23:46 +0000 (05:23 +0100)]
Merge commit '
678082b409aca711f9cf991df6b0200116489322 '
* commit '
678082b409aca711f9cf991df6b0200116489322 ':
X-Bitmap decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavcodec/xbmdec.c
See:
a0340dfbd78df7639715056937011d2d414aaeed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 03:45:24 +0000 (04:45 +0100)]
Merge commit '
792e4c21f212979f0e29bcdf107cb6b4f51645a4 '
* commit '
792e4c21f212979f0e29bcdf107cb6b4f51645a4 ':
xbm: use av_frame_free on close
Conflicts:
libavcodec/xbmenc.c
No change as the buggy code is not part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 03:41:16 +0000 (04:41 +0100)]
Merge commit '
a7a5e3850ecd94e726ad2272295b9e6c91841cf8 '
* commit '
a7a5e3850ecd94e726ad2272295b9e6c91841cf8 ':
fate: add PAF audio and video tests
Conflicts:
tests/fate/audio.mak
tests/fate/video.mak
See:
101615c7ff37afe5e6a951838cbbbb92b7485473
See:
409cc4588329633326b32a5245b085c543689471
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 03:31:42 +0000 (04:31 +0100)]
Merge commit '
70daeacd6ef8b354dd7d2d77ad393831a5bbf033 '
* commit '
70daeacd6ef8b354dd7d2d77ad393831a5bbf033 ':
PAF demuxer and decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h
See:
7de4a16508cb9bd2d40855f7114dea14329ef62a , and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 28 Mar 2014 02:26:43 +0000 (03:26 +0100)]
Merge commit '
d37c96213a2a9e1fd8669122d5405f4ce6a99ed8 '
* commit '
d37c96213a2a9e1fd8669122d5405f4ce6a99ed8 ':
lavc: restore copy_block{4,16} functions
Conflicts:
libavcodec/copy_block.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 27 Mar 2014 23:40:43 +0000 (00:40 +0100)]
cmdutils: Mark exit_program as av_noreturn
rogerdpack [Thu, 27 Mar 2014 19:44:20 +0000 (13:44 -0600)]
dshow: show device name when outputting buffer overflow log message
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 17 Mar 2014 14:30:05 +0000 (15:30 +0100)]
fate: add a bmpparser test
Paul B Mahol [Sun, 5 Aug 2012 23:46:41 +0000 (23:46 +0000)]
bmp: add a standalone parser
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Thu, 27 Mar 2014 23:03:38 +0000 (00:03 +0100)]
avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults
fixes x264opts opengop=1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 17 Mar 2014 00:24:30 +0000 (01:24 +0100)]
fate: add XBM tests
Vittorio Giovara [Sat, 22 Mar 2014 04:33:27 +0000 (05:33 +0100)]
X-Bitmap decoder
Vittorio Giovara [Mon, 17 Mar 2014 00:20:53 +0000 (01:20 +0100)]
xbm: use av_frame_free on close
Paul B Mahol [Sun, 8 Jul 2012 22:16:12 +0000 (22:16 +0000)]
fate: add PAF audio and video tests
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Paul B Mahol [Fri, 21 Mar 2014 16:28:47 +0000 (16:28 +0000)]
PAF demuxer and decoder
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Vittorio Giovara [Mon, 10 Mar 2014 16:05:12 +0000 (17:05 +0100)]
lavc: restore copy_block{4,16} functions
They were removed in
9e31729d692f1e721b7ed1a3a0f51b68c064d68f .
Timothy Gu [Thu, 27 Mar 2014 02:06:30 +0000 (19:06 -0700)]
x86: convert DNxHDenc inline asm to yasm
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Thu, 27 Mar 2014 02:06:29 +0000 (19:06 -0700)]
dnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as stride
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 21:14:26 +0000 (22:14 +0100)]
avcodec: Make ff_print_debug_info2() independant of Picture struct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 21:07:49 +0000 (22:07 +0100)]
avcodec/brenderpix: propagate error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 21:06:59 +0000 (22:06 +0100)]
avcodec/brenderpix: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 20:32:38 +0000 (21:32 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add BRender PIX tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 20:03:35 +0000 (21:03 +0100)]
Merge commit '
ae17878fb2ab100264226c84c58f5b95a703312f '
* commit '
ae17878fb2ab100264226c84c58f5b95a703312f ':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See:
492a5f835c59ab7c2e347d3579d8bf6148ae0a0 , and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 19:10:51 +0000 (20:10 +0100)]
Merge commit '
c3a0b3eb64be441ca897629e8ecd80d5b51fded7 '
* commit '
c3a0b3eb64be441ca897629e8ecd80d5b51fded7 ':
arm: build: Maintain decoder objects separate from infrastructure objects
Conflicts:
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 26 Mar 2014 23:52:13 +0000 (00:52 +0100)]
fate: add BRender PIX tests
Aleksi Nurmi [Wed, 26 Mar 2014 23:45:15 +0000 (00:45 +0100)]
BRender PIX image decoder
Further enhancements by Vittorio Giovara and Paul B Mahol.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diego Biurrun [Thu, 27 Mar 2014 09:56:07 +0000 (10:56 +0100)]
arm: build: Maintain decoder objects separate from infrastructure objects
Michael Niedermayer [Thu, 27 Mar 2014 03:40:48 +0000 (04:40 +0100)]
avcodec/vp7: Fix null pointer dereference in vp7_decode_frame_header()
This simply copies the "interframe without a prior keyframe" check
thats done later into vp7_decode_frame_header()
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 03:23:15 +0000 (04:23 +0100)]
configure: fix VP7 standalone build
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Wed, 26 Mar 2014 18:24:35 +0000 (19:24 +0100)]
Fix spelling errors in texi files: more informations --> more information allows to --> allows one to
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Wed, 26 Mar 2014 18:13:35 +0000 (19:13 +0100)]
Fix texinfo error due to wrong @subsubsection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 00:59:32 +0000 (01:59 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add Alias PIX tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 27 Mar 2014 00:10:28 +0000 (01:10 +0100)]
Merge commit '
e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b '
* commit '
e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b ':
Alias PIX image encoder and decoder
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 22:58:48 +0000 (23:58 +0100)]
libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 22:52:09 +0000 (23:52 +0100)]
avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of the buffer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Thu, 20 Mar 2014 02:12:18 +0000 (03:12 +0100)]
fate: add Alias PIX tests
Vittorio Giovara [Thu, 20 Mar 2014 00:15:25 +0000 (01:15 +0100)]
Alias PIX image encoder and decoder
Michael Niedermayer [Wed, 26 Mar 2014 20:22:50 +0000 (21:22 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 19:59:57 +0000 (20:59 +0100)]
Merge commit '
b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa '
* commit '
b9eb03416d93a5c4ece27ffef5e6e11c81bec6fa ':
truehd: break out part of output_data into platform-specific callback.
Conflicts:
libavcodec/mlpdec.c
See:
b01a2562ae3ff50198ba189c878023ee4ac34c72
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 19:58:03 +0000 (20:58 +0100)]
Merge commit '
fcf5fc444522d24caa9907225802817ae788f511 '
* commit '
fcf5fc444522d24caa9907225802817ae788f511 ':
truehd: tune VLC decoding for ARM.
Conflicts:
libavcodec/mlpdec.c
See:
e555e1bc39ea71d46a07d0bb847fb426c2dd4d80
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ben Avison [Thu, 20 Mar 2014 18:59:17 +0000 (18:59 +0000)]
truehd: break out part of output_data into platform-specific callback.
Verified with profiling that this doesn't have a measurable effect upon
overall performance.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 19:50:17 +0000 (20:50 +0100)]
Merge commit '
483321fe789566dcb27b6387c00ea16dd86bc587 '
* commit '
483321fe789566dcb27b6387c00ea16dd86bc587 ':
truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.
See:
89135716fd4c2963e01e0155547c47bf709f1aa3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ben Avison [Thu, 20 Mar 2014 18:59:16 +0000 (18:59 +0000)]
truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.
Profiling results for overall audio decode and the rematrix_channels function
in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 370.8 17.0 348.8 20.1 99.9% +6.3%
6:2 function 46.4 8.4 45.8 6.6 18.0% +1.2% (insignificant)
8:2 total 343.2 19.0 339.1 15.4 54.7% +1.2% (insignificant)
8:2 function 38.9 3.9 40.2 6.9 52.4% -3.2% (insignificant)
6:6 total 658.4 15.7 604.6 20.8 100.0% +8.9%
6:6 function 109.0 8.7 59.5 5.4 100.0% +83.3%
8:8 total 896.2 24.5 766.4 17.6 100.0% +16.9%
8:8 function 223.4 12.8 93.8 5.0 100.0% +138.3%
The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 19:42:35 +0000 (20:42 +0100)]
Merge commit '
4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b '
* commit '
4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b ':
truehd: break out part of rematrix_channels into platform-specific callback.
See:
3f4e73afe92743e96a633aa5b80416e4714e4783
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ben Avison [Thu, 20 Mar 2014 18:59:15 +0000 (18:59 +0000)]
truehd: break out part of rematrix_channels into platform-specific callback.
Verified with profiling that this doesn't have a measurable effect upon
overall performance.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 19:26:26 +0000 (20:26 +0100)]
Merge commit '
15a29c39d9ef15b0783c04b3228e1c55f6701ee3 '
* commit '
15a29c39d9ef15b0783c04b3228e1c55f6701ee3 ':
truehd: add hand-scheduled ARM asm version of mlp_filter_channel.
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/mlpdsp_init_arm.c
See:
87b128d5ef6aeb01cc8bba167c929c74cbf2e7c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ben Avison [Thu, 20 Mar 2014 18:59:14 +0000 (18:59 +0000)]
truehd: add hand-scheduled ARM asm version of mlp_filter_channel.
Profiling results for overall audio decode and the mlp_filter_channel(_arm)
function in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 380.4 22.0 370.8 17.0 87.4% +2.6% (insignificant)
6:2 function 60.7 7.2 36.6 8.1 100.0% +65.8%
8:2 total 357.0 17.5 343.2 19.0 97.8% +4.0% (insignificant)
8:2 function 60.3 8.8 37.3 3.8 100.0% +61.8%
6:6 total 717.2 23.2 658.4 15.7 100.0% +8.9%
6:6 function 140.4 12.9 81.5 9.2 100.0% +72.4%
8:8 total 981.9 16.2 896.2 24.5 100.0% +9.6%
8:8 function 193.4 15.0 103.3 11.5 100.0% +87.2%
Experiments with adding preload instructions to this function yielded no
useful benefit, so these have not been included.
The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 19:05:57 +0000 (20:05 +0100)]
avfilter/vf_pullup: add comment to explain memset(0)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ben Avison [Thu, 20 Mar 2014 18:58:40 +0000 (18:58 +0000)]
truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output.
Profiling results for overall decode and the output_data function in
particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 339.6 15.1 329.3 16.0 95.8% +3.1% (insignificant)
6:2 function 24.6 6.0 9.9 3.1 100.0% +148.5%
8:2 total 324.5 15.5 323.6 14.3 15.2% +0.3% (insignificant)
8:2 function 20.4 3.9 9.9 3.4 100.0% +104.7%
6:6 total 572.8 20.6 539.9 24.2 100.0% +6.1%
6:6 function 54.5 5.6 16.0 3.8 100.0% +240.9%
8:8 total 741.5 21.2 702.5 18.5 100.0% +5.6%
8:8 function 63.9 7.6 18.4 4.8 100.0% +247.3%
The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ben Avison [Thu, 20 Mar 2014 18:58:39 +0000 (18:58 +0000)]
truehd: break out part of output_data into platform-specific callback.
Verified with profiling that this doesn't have a measurable effect upon
overall performance.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ben Avison [Thu, 20 Mar 2014 18:58:38 +0000 (18:58 +0000)]
truehd: tune VLC decoding for ARM.
Profiling on a Raspberry Pi revealed the best performance to correspond
with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function
in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 348.8 20.1 339.6 15.1 88.8% +2.7% (insignificant)
6:2 function 38.1 8.1 26.4 4.1 100.0% +44.5%
8:2 total 339.1 15.4 324.5 15.5 99.4% +4.5%
8:2 function 33.8 7.0 27.3 5.6 99.7% +23.6%
6:6 total 604.6 20.8 572.8 20.6 100.0% +5.6%
6:6 function 95.8 8.4 68.9 8.2 100.0% +39.1%
8:8 total 766.4 17.6 741.5 21.2 100.0% +3.4%
8:8 function 106.0 11.4 86.1 9.9 100.0% +23.1%
Signed-off-by: Martin Storsjö <martin@martin.st>
Ben Avison [Thu, 20 Mar 2014 18:58:37 +0000 (18:58 +0000)]
truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.
Profiling results for overall audio decode and the rematrix_channels function
in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 370.8 17.0 348.8 20.1 99.9% +6.3%
6:2 function 46.4 8.4 45.8 6.6 18.0% +1.2% (insignificant)
8:2 total 343.2 19.0 339.1 15.4 54.7% +1.2% (insignificant)
8:2 function 38.9 3.9 40.2 6.9 52.4% -3.2% (insignificant)
6:6 total 658.4 15.7 604.6 20.8 100.0% +8.9%
6:6 function 109.0 8.7 59.5 5.4 100.0% +83.3%
8:8 total 896.2 24.5 766.4 17.6 100.0% +16.9%
8:8 function 223.4 12.8 93.8 5.0 100.0% +138.3%
The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ben Avison [Thu, 20 Mar 2014 18:58:36 +0000 (18:58 +0000)]
truehd: break out part of rematrix_channels into platform-specific callback.
Verified with profiling that this doesn't have a measurable effect upon
overall performance.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ben Avison [Thu, 20 Mar 2014 18:58:35 +0000 (18:58 +0000)]
truehd: add hand-scheduled ARM asm version of mlp_filter_channel.
Profiling results for overall audio decode and the mlp_filter_channel(_arm)
function in particular are as follows:
Before After
Mean StdDev Mean StdDev Confidence Change
6:2 total 380.4 22.0 370.8 17.0 87.4% +2.6% (insignificant)
6:2 function 60.7 7.2 36.6 8.1 100.0% +65.8%
8:2 total 357.0 17.5 343.2 19.0 97.8% +4.0% (insignificant)
8:2 function 60.3 8.8 37.3 3.8 100.0% +61.8%
6:6 total 717.2 23.2 658.4 15.7 100.0% +8.9%
6:6 function 140.4 12.9 81.5 9.2 100.0% +72.4%
8:8 total 981.9 16.2 896.2 24.5 100.0% +9.6%
8:8 function 193.4 15.0 103.3 11.5 100.0% +87.2%
Experiments with adding preload instructions to this function yielded no
useful benefit, so these have not been included.
The assembly version has also been tested with a fuzz tester to ensure that
any combinations of inputs not exercised by my available test streams still
generate mathematically identical results to the C version.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 26 Mar 2014 17:37:15 +0000 (18:37 +0100)]
avfilter/vf_pullup: zero freed memory for saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Tue, 25 Mar 2014 12:53:11 +0000 (13:53 +0100)]
vf_pullup: simplify, fix double free error
The memory allocation for f->diffs was freed multiple times in some
corner cases. Simplify the code so that this doesn't happen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 17:22:49 +0000 (18:22 +0100)]
avutil/frame: undeprecate AVFrame.motion_val API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 17:09:23 +0000 (18:09 +0100)]
avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets
Fixes h264_mp4toannexb_bsf_failure.mkv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 15:55:46 +0000 (16:55 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init
Conflicts:
libavcodec/x86/rnd_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 14:53:33 +0000 (15:53 +0100)]
Merge commit '
55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6 '
* commit '
55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6 ':
hpeldsp_template: Move content to hpeldsp
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 14:40:50 +0000 (15:40 +0100)]
Merge commit '
09d4389de10b03ea65a84eaf3d6c4b7a7538ad75 '
* commit '
09d4389de10b03ea65a84eaf3d6c4b7a7538ad75 ':
hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 14:36:27 +0000 (15:36 +0100)]
Merge commit '
92ba965103d3884609730ba9bf293772dc78a9ef '
* commit '
92ba965103d3884609730ba9bf293772dc78a9ef ':
dsputil: Move draw_edges and clear_block* out of dsputil_template
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 14:24:50 +0000 (15:24 +0100)]
Merge commit '
da5be235250a61d6994408b054e3e3acf2e0f90f '
* commit '
da5be235250a61d6994408b054e3e3acf2e0f90f ':
dsputil: Move RV40-specific bits into rv40dsp
Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 14:08:46 +0000 (15:08 +0100)]
Merge commit '
8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed '
* commit '
8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed ':
hpeldsp_template: Detemplatize the code
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 13:59:50 +0000 (14:59 +0100)]
Merge commit '
2c01ad8b206d326700974438f7193f22be416eb1 '
* commit '
2c01ad8b206d326700974438f7193f22be416eb1 ':
dsputil_template: Detemplatize the code
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 13:50:47 +0000 (14:50 +0100)]
Merge commit '
aba70bb5387f12dfa5e6cd8cb861c9c7e668151f '
* commit '
aba70bb5387f12dfa5e6cd8cb861c9c7e668151f ':
Add missing headers to make template files compile (more) standalone
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 13:40:49 +0000 (14:40 +0100)]
Merge commit '
e7373585f827d4ec05d952daa3877e8decfe3c08 '
* commit '
e7373585f827d4ec05d952daa3877e8decfe3c08 ':
dsputil_template: Move bits that are used templatized into separate file
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 13:32:12 +0000 (14:32 +0100)]
Merge commit '
d3c3c1664a958923f234283e66fbcbfe69a6927f '
* commit '
d3c3c1664a958923f234283e66fbcbfe69a6927f ':
dsputil: Move hpel_template #include out of dsputil_template
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 26 Mar 2014 13:16:44 +0000 (14:16 +0100)]
Merge commit '
d0aabeab23755ee906440505ad2097c0f1493e80 '
* commit '
d0aabeab23755ee906440505ad2097c0f1493e80 ':
x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation
See:
c8246d37664af9feb23edede944846687aea787a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 29 Jan 2014 11:49:24 +0000 (12:49 +0100)]
x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init
There is no point in having a separate file just for the instantiation
that provides the public functions.
Diego Biurrun [Fri, 10 Jan 2014 14:01:04 +0000 (15:01 +0100)]
hpeldsp_template: Move content to hpeldsp
There is no point in having this separate; it is not used as a template.
Diego Biurrun [Fri, 10 Jan 2014 15:37:23 +0000 (16:37 +0100)]
hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions
Diego Biurrun [Tue, 7 Jan 2014 23:43:09 +0000 (00:43 +0100)]
dsputil: Move draw_edges and clear_block* out of dsputil_template
The functions are not used templatized.
Diego Biurrun [Wed, 18 Dec 2013 22:27:35 +0000 (23:27 +0100)]
dsputil: Move RV40-specific bits into rv40dsp
Diego Biurrun [Fri, 10 Jan 2014 13:57:59 +0000 (14:57 +0100)]
hpeldsp_template: Detemplatize the code
The indirection makes no sense without multiple instantiation.
Diego Biurrun [Thu, 9 Jan 2014 11:09:35 +0000 (12:09 +0100)]
dsputil_template: Detemplatize the code
The indirection makes no sense without multiple instantiation.
Diego Biurrun [Thu, 9 Jan 2014 09:27:20 +0000 (10:27 +0100)]
Add missing headers to make template files compile (more) standalone
Diego Biurrun [Wed, 8 Jan 2014 23:56:33 +0000 (00:56 +0100)]
dsputil_template: Move bits that are used templatized into separate file
This allows detemplatizing the bits that are not instantiated twice.
Diego Biurrun [Tue, 7 Jan 2014 23:06:52 +0000 (00:06 +0100)]
dsputil: Move hpel_template #include out of dsputil_template
Multiple inclusion makes no sense as it is only used in the 8-bit case.
Diego Biurrun [Wed, 26 Mar 2014 10:58:58 +0000 (11:58 +0100)]
x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation
This fixes FATE with mmxext CPUFLAGS set.
Michael Niedermayer [Wed, 26 Mar 2014 02:36:24 +0000 (03:36 +0100)]
avcodec/h261: move b_stride/b_xy under the if() where they are used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>