Rainer Hochecker
bceeccc648
dxva2: bump maximum number of slieces for mpeg2
...
Suggested by heleppkes on https://trac.ffmpeg.org/ticket/3133
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-27 14:24:29 +01:00
Lukasz Marek
9d087ab5ef
ffplay: remove redundant prototype
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-27 13:36:01 +01:00
Michael Niedermayer
6369766f01
avcodec/huffyuv: support gbrp9/10/12/14
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-27 02:11:29 +01:00
Michael Niedermayer
7cf8918b0d
avcodec/huffyuv: update years in copyright
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-27 01:45:57 +01:00
Michael Niedermayer
17e7048d30
Merge commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1'
...
* commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1':
x86inc: Speed up assembling with Yasm
See: 4d55fe7204
2014-01-26 23:42:20 +01:00
Michael Niedermayer
896d6a7736
Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'
...
* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
avformat: utils: K&R formatting cosmetics
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 23:35:38 +01:00
Ronald S. Bultje
c2871568cf
vp9: fix invalid ref frame w/h on size change.
...
Fixes invalid reads and crashes in vp90-2-05-resize.webm and fuzzed6.ivf.
The output is still not identical to what libvpx does (because we don't
actually scale in MC).
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 20:16:01 +01:00
Ronald S. Bultje
d9343c3484
vp9: disable use_last_frame_mvs on resolution change (scalable).
...
Prevents some invalid memory accesses after resolution change in
vp90-2-05-resize.webm, and libvpx does this too.
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 20:15:45 +01:00
Michael Niedermayer
e6c0da70fc
avcodec/huffyuvdec: optimize >8bps VLC reading
...
97479 -> 54891 decicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 19:59:57 +01:00
Loren Merritt
b7d0d10a1d
x86inc: Speed up assembling with Yasm
...
Work around Yasm's inefficiency with handling large numbers of variables
in the global scope.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-01-26 18:40:08 +01:00
Stefano Sabatini
37baa2af43
configure: add missing dependency for the remuxing example
2014-01-26 18:31:03 +01:00
Diego Biurrun
50ecf15712
avformat: utils: K&R formatting cosmetics
...
Also adjust some comment wording / spelling and reorder header #includes.
2014-01-26 18:09:00 +01:00
Stefano Sabatini
9651239f67
ffmpeg: use intermediary variables in reap_filters, increase readability
2014-01-26 18:06:39 +01:00
Stefano Sabatini
68c5ba1f05
doc/filters: re-edit notes on filtergraph escaping
...
State the escaping rules more explicitly, reword various sentences and
drop confusing quoting example.
Should fix trac issue #3334 .
2014-01-26 18:06:39 +01:00
Michael Niedermayer
599e629f88
avcodec/huffyuvenc: fix end pointer for stats_out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 16:24:36 +01:00
Michael Niedermayer
a301bb63f0
avcodec/huffyuvenc: fail if stats_out is too small instead of silently truncating
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 16:23:45 +01:00
Michael Niedermayer
bc11b2c3e6
fate: add test for 16bps ffvhuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 04:51:38 +01:00
Jean First
91489d28ba
avcodec/libfdk_aacenc: enable 7.1 channel encoding
...
7.1(wide) and 7.1(wide-side) channel layouts are supported in fdk_aac since october 2013 (commit fa3eba1644)
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 03:31:42 +01:00
Michael Niedermayer
c46faacdf4
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: clang: explicitly state dep file and rule name in DEPFLAGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 03:23:51 +01:00
Michael Niedermayer
0e2dd05c22
Merge commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3'
...
* commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3':
configure: add missing x86 dependency for i686
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 03:19:38 +01:00
Michael Niedermayer
7667afffb8
avcodec/mpeg12dec: Revert Change to mpeg2_fast_decode_block_non_intra
...
This fixes the speed regression from 20626f53e9
2014-01-26 02:57:40 +01:00
Michael Niedermayer
6a92598e14
avcodec/mpeg12dec: Redesign index checks for mpeg2_fast_decode_block_intra
...
This fixes the speed regression from 20626f53e9
2014-01-26 02:57:29 +01:00
Michael Niedermayer
20626f53e9
Merge commit '6d93307f8df81808f0dcdbc064b848054a6e83b3'
...
* commit '6d93307f8df81808f0dcdbc064b848054a6e83b3':
mpeg12: check scantable indices in all decode_block functions
Benchmarks
Before:
1878 decicycles in mpeg2_decode_block_non_intra, 8388487 runs, 121 skips
1700 decicycles in mpeg2_decode_block_intra, 4194239 runs, 65 skips
1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388492 runs, 116 skips
1669 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips
--
2056 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips
2346 decicycles in mpeg1_decode_block_intra, 32768 runs, 0 skips
2011 decicycles in mpeg1_fast_decode_block_inter, 65533 runs, 3 skips
----------------
After:
1858 decicycles in mpeg2_decode_block_non_intra, 8388490 runs, 118 skips
1691 decicycles in mpeg2_decode_block_intra, 4194233 runs, 71 skips
1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips
1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips
--
2010 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips
2322 decicycles in mpeg1_decode_block_intra, 32766 runs, 2 skips
1995 decicycles in mpeg1_fast_decode_block_inter, 65535 runs, 1 skips
All benchmarks are the best scores of several runs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 02:52:21 +01:00
Michael Niedermayer
3e6088f732
avutil/internal.h: add timer.h back
...
Without this a developer would have to add a include every time he
wants to benchmark some code, this is a moderate inconvenience.
This reverts the specific hunk from fb0c9d41d6
2014-01-26 02:23:26 +01:00
Michael Niedermayer
965fa6b0d9
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
...
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec':
avutil: remove timer.h include from internal.h
Conflicts:
libavcodec/ffv1dec.c
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 01:54:55 +01:00
Michael Niedermayer
53167ecfdb
avcodec/huffyuv: support AV_PIX_FMT_YUV(A)4XYP16 and GRAY16
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26 00:23:03 +01:00
Janne Grunau
9e057f53aa
configure: clang: explicitly state dep file and rule name in DEPFLAGS
...
Fixes dependency file generation with gas-preprocessor.pl and clang.
Flags copied from GCC and tested with Apple's clang from Xcode 5 and
5.1 and clang 3.2, 3.3, 3.4 on Linux.
2014-01-25 21:50:21 +01:00
Janne Grunau
fb87e69ff7
configure: add missing x86 dependency for i686
2014-01-25 21:50:20 +01:00
Janne Grunau
6d93307f8d
mpeg12: check scantable indices in all decode_block functions
...
Add checks to the fast functions used with CODEC_FLAGS2_FAST and move
the check for all other functions to before the invalid memory is
accessed. Fixes https://trac.videolan.org/vlc/ticket/9713 with
CODEC_FLAGS2_FAST.
CC: libav-stable@libav.org
2014-01-25 21:50:20 +01:00
Janne Grunau
fb0c9d41d6
avutil: remove timer.h include from internal.h
...
Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
2014-01-25 21:50:20 +01:00
Michael Niedermayer
214a3b8bf9
avfilter/vf_scale: simplify alignment code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 16:54:24 +01:00
Michael Niedermayer
1e48c39ece
avfilter/vf_scale: do aspect ratio and scale factor compensation together
...
Fixes rounding error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 16:48:13 +01:00
Michael Niedermayer
682ddb89cf
Merge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg
...
* 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg :
Documentation for scale filter factor
Documentation for scale filter factor
Fixed factor for scale filter
Factors for scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 16:35:07 +01:00
Michael Niedermayer
018e2b57ca
avcodec/libx264: also consider ticks per frame for fps/timebase setup
...
Setting fps = 1/timebase is not correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 16:31:30 +01:00
Clément Bœsch
5f4d04d084
x86/lossless_videodsp: silly one-line cosmetic.
2014-01-25 16:24:50 +01:00
Lars Kiesow
c49b036096
Documentation for scale filter factor
2014-01-25 15:34:23 +01:00
Lars Kiesow
69b1d1d99b
Documentation for scale filter factor
2014-01-25 15:02:15 +01:00
Lars Kiesow
e395f8de5a
Fixed factor for scale filter
2014-01-25 15:00:02 +01:00
Lars Kiesow
7fc4c18463
Factors for scale filter
2014-01-25 14:40:48 +01:00
Clément Bœsch
5267e85056
x86/lossless_videodsp: use common macro for add and diff int16 loop.
2014-01-25 14:27:37 +01:00
Clément Bœsch
cddbfd2a95
x86/lossless_videodsp: simplify and explicit aligned/unaligned flags
2014-01-25 11:59:43 +01:00
Ramiro Polla
78a9f185eb
lavfi/drawtext: add option for drawing border around text
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 04:59:28 +01:00
Ramiro Polla
222fb8276d
lavfi/drawtext: get bitmap from glyph in a separate step
...
This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 04:46:38 +01:00
Michael Niedermayer
5554c6dd45
Merge remote-tracking branch 'rbultje/vp9-simd'
...
* rbultje/vp9-simd:
vp9: fix memory corruption if header decoding fails after size change.
vp9/x86: use explicit register for relative stack references.
vp9/x86: iwht4x4 (lossless) mmx.
vp9/x86: 4x4 iadst SIMD (ssse3) variants.
vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 01:43:54 +01:00
Michael Niedermayer
4b84a69ebb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dxtory: compressed RGB555/RGB565 decoding support
Conflicts:
libavcodec/dxtory.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 01:39:19 +01:00
Michael Niedermayer
2d0d1f7eb3
Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'
...
* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
dxtory: add more compressed and uncompressed modes
Conflicts:
libavcodec/dxtory.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 01:33:42 +01:00
Ronald S. Bultje
4147b337c1
vp9: fix memory corruption if header decoding fails after size change.
2014-01-24 19:25:26 -05:00
Ronald S. Bultje
c9e6325ed9
vp9/x86: use explicit register for relative stack references.
...
Before this patch, we explicitly modify rsp, which isn't necessarily
universally acceptable, since the space under the stack pointer might
be modified in things like signal handlers. Therefore, use an explicit
register to hold the stack pointer relative to the bottom of the stack
(i.e. rsp). This will also clear out valgrind errors about the use of
uninitialized data that started occurring after the idct16x16/ssse3
optimizations were first merged.
2014-01-24 19:25:25 -05:00
Ronald S. Bultje
97474d527f
vp9/x86: iwht4x4 (lossless) mmx.
2014-01-24 19:25:25 -05:00
Ronald S. Bultje
d43efa68bd
vp9/x86: 4x4 iadst SIMD (ssse3) variants.
...
Cycle measurements for intra itxfm_4x4_add on ped1080p.webm:
idct_idct: 66 -> 67 cycles (noise measurement)
idct_iadst: 199 -> 79 cycles
iadst_idct: 165 -> 70 cycles
iadst_iadst: 183 -> 82 cycles
2014-01-24 19:25:25 -05:00
