Commit Graph

49738 Commits

Author SHA1 Message Date
Michael Niedermayer
6b2e65078c Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
  dsputil: Move LOCAL_ALIGNED macros to libavutil

Conflicts:
	libavcodec/dvdec.c
	libavcodec/imc.c
	libavcodec/mpegvideo_motion.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:33:57 +01:00
Michael Niedermayer
276c9c0577 Merge commit '059866eb17cd3c66422a61d3e9c3305f55830a50'
* commit '059866eb17cd3c66422a61d3e9c3305f55830a50':
  dsputil: Move WRAPPER8_16_SQ macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:27:44 +01:00
Michael Niedermayer
5fd6d85d17 rnd_avg: fix author attribution
Reference:
commit 41fda91d09
Author: BERO <bero@geocities.co.jp>
Date:   Wed May 14 17:46:55 2003 +0000

    aligned dsputil (for sh4) patch by (BERO <bero at geocities dot co dot jp>)

    Originally committed as revision 1880 to svn://svn.ffmpeg.org/ffmpeg/trunk

commit 8dbe585641
Author: Oskar Arvidsson <oskar@irock.se>
Date:   Tue Mar 29 17:48:59 2011 +0200

    Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.

    This patch lets e.g. dsputil_init chose dsp functions with respect to
    the bit depth to decode. The naming scheme of bit depth dependent
    functions is <base name>_<bit depth>[_<prefix>] (i.e. the old
    clear_blocks_c is now named clear_blocks_8_c).

    Note: Some of the functions for high bit depth is not dependent on the
    bit depth, but only on the pixel size. This leaves some room for
    optimizing binary size.

    Preparatory patch for high bit depth h264 decoding support.

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:22:29 +01:00
Michael Niedermayer
81a11452f8 Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'
* commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf':
  dsputil: Move rnd_avg inline functions to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 14:22:05 +01:00
Michael Niedermayer
a8864615e6 Merge commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b'
* commit 'b9c2408b19dc9408e9dc0ce4a099af529bbfba3b':
  dsputil: Remove commented-out, unused function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:51:47 +01:00
Michael Niedermayer
ffbe19fc84 Merge commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6'
* commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6':
  dsputil: Move ff_shrink* function declarations to separate header
  dsputil: Move ff_svq3 function declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:46:03 +01:00
Michael Niedermayer
0af07495ec Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'
* commit '6a4430407404bfe55581e66a86a496c9adf6fb44':
  dsputil: Move ff_h264_idct function declarations to a separate header

Conflicts:
	libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:40:03 +01:00
Paul B Mahol
e5670cb8a1 lavfi/histogram: make it C90 compliant
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 12:27:49 +00:00
Michael Niedermayer
b05830169d Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'
* commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a':
  dsputil: Move copy_block functions to a separate header
  dsputil: Drop unused functions copy_block{2|4|16}

No functions are droped because they are used in several places.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 13:23:59 +01:00
Paul B Mahol
29a92c0114 histogram filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 11:45:56 +00:00
Michael Niedermayer
e5212354ea Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'
* commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec':
  indeo3: replace use of copy_block4 with put_pixels
  mjpegdec: use put_pixels instead of copy_block8

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 12:37:03 +01:00
Michael Niedermayer
bcb15e66f7 Merge commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c'
* commit 'b5b7b75e91e291c810ebd01868a42b53f267a87c':
  dsputil: Move get_penalty_factor() to the only place it is used.

Conflicts:
	libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 12:05:53 +01:00
Michael Niedermayer
55151aa101 Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'
* commit '0b016eb99d38738e2c53e36549a4732a0f863b2e':
  dsputil: Move ff_block_permute to mpegvideo_enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 11:44:46 +01:00
Michael Niedermayer
a35f5c2233 Merge remote-tracking branch 'rdp/dshow_shared'
* rdp/dshow_shared:
  dshow: attempt to build shared as well as static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 04:06:56 +01:00
James Almer
53b2083f44 sparc: Revert some parameter name changes in dsputil_vis.c
They were renamed by mistake in 25841df.
This should fix compilation failures on sparc.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 02:59:15 +01:00
Michael Niedermayer
a92816c4eb get_se_golomb: fix decoding of very large values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09 01:17:41 +01:00
Diego Biurrun
218aefce44 dsputil: Move LOCAL_ALIGNED macros to libavutil 2013-02-08 23:13:37 +01:00
Diego Biurrun
059866eb17 dsputil: Move WRAPPER8_16_SQ macro to the only place it is used 2013-02-08 23:10:17 +01:00
Diego Biurrun
bf6b3ec924 dsputil: Move rnd_avg inline functions to a separate header 2013-02-08 23:10:17 +01:00
Diego Biurrun
b9c2408b19 dsputil: Remove commented-out, unused function declarations 2013-02-08 23:10:16 +01:00
Michael Niedermayer
b8820e7aa3 dsp: make put_no_rnd_pixels_tab 4x4 big
This makes it match the other tables and fixes out of array acceses.

Fixes CID980012

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-08 22:55:55 +01:00
James Almer
89946c8403 dxva2: Prevent redefinition of _WIN32_WINNT
Don't redefine _WIN32_WINNT when targeting Win7/8

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-08 14:10:19 +01:00
Michael Niedermayer
47335126c0 ff_end_tag: assert that the start is aligned.
If its start is not aligned then aligning its end will
likely break many demuxers as they check the size and not
the position.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-08 12:51:52 +01:00
Paul B Mahol
810cd0dd9c riff: chunks must be at 2 byte boundary
Fixes #2244.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-08 10:40:41 +00:00
Michael Niedermayer
0d194ee51e vc1dec: Fix destination pointers in context for fields
This replaces a large number of checks for the second field by
fixing the pointers when they are setup

This should also fix I/BI field pictures

Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs

Based on "vc1dec: the second field is written wrong to the picture"
         by Sebastian Sandberg <sebastiand.sandberg@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-08 00:10:29 +01:00
Diego Biurrun
35685a3c2a dsputil: Move ff_shrink* function declarations to separate header 2013-02-07 22:08:19 +01:00
Diego Biurrun
6a44304074 dsputil: Move ff_h264_idct function declarations to a separate header 2013-02-07 22:08:19 +01:00
Diego Biurrun
b9ba5253dd dsputil: Move copy_block functions to a separate header 2013-02-07 22:08:19 +01:00
Mans Rullgard
b9ee5f2cab indeo3: replace use of copy_block4 with put_pixels
The destination is sufficiently aligned for put_pixels here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2013-02-07 22:08:19 +01:00
Diego Biurrun
75d5156ac1 dsputil: Move ff_svq3 function declarations to a separate header 2013-02-07 22:08:19 +01:00
Diego Biurrun
9e31729d69 dsputil: Drop unused functions copy_block{2|4|16} 2013-02-07 22:08:19 +01:00
Mans Rullgard
ed62e6e3c3 mjpegdec: use put_pixels instead of copy_block8
Signed-off-by: Mans Rullgard <mans@mansr.com>
2013-02-07 22:08:19 +01:00
Diego Biurrun
b5b7b75e91 dsputil: Move get_penalty_factor() to the only place it is used. 2013-02-07 22:05:25 +01:00
Diego Biurrun
0b016eb99d dsputil: Move ff_block_permute to mpegvideo_enc 2013-02-07 22:05:25 +01:00
Michael Niedermayer
a8e748eee5 lavf: add seek2any to allow forcing seeking to non keyframes via AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 21:54:41 +01:00
Michael Niedermayer
7c00d853a6 matroskadec: support seek to non keyframes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 21:48:48 +01:00
Stefano Sabatini
c0a4871c16 lavfi/select: correctly set prev_t and prev_pts
In particular, fix trac ticket #2248.
2013-02-07 21:28:46 +01:00
Stefano Sabatini
872855e2a5 lavfi/select: avoid double -> int lossy conversion in debug log 2013-02-07 21:00:54 +01:00
Stefano Sabatini
1afbb4c226 doc/filters: remove another instance of '×'
Fix trac ticket #2247.
2013-02-07 20:28:30 +01:00
Michael Niedermayer
a00c4b4db0 af_biquad: avoid subtraction in loop
17% faster
Note the speedup is smaller if its done before
storing in the context (gcc 4.6.3 core i7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 19:46:02 +01:00
Michael Niedermayer
9f956611e3 af_biquad: unroll loop, remove variable copies
This makes the code about 7% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 19:03:22 +01:00
Michael Niedermayer
4e2c63685e sws: dont write out of array on bigendian
Fixes Ticket2229

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 16:22:51 +01:00
Michael Niedermayer
48870853b2 x86/dsputil: Fix author attribution after code has been moved/splited around
Reference:
commit 3615e2be84
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Dec 2 22:02:57 2003 +0000

    h263_h_loop_filter_mmx

    Originally committed as revision 2553 to svn://svn.ffmpeg.org/ffmpeg/trunk

commit 359f98ded9
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Dec 2 20:28:10 2003 +0000

    h263_v_loop_filter_mmx

    Originally committed as revision 2552 to svn://svn.ffmpeg.org/ffmpeg/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 16:22:51 +01:00
Michael Niedermayer
54d8322355 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dsputil: x86: Fix compile error
  dsputil: x86: Convert h263 loop filter to yasm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 14:35:49 +01:00
Michael Niedermayer
c7002e3d3d Merge commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5'
* commit '12b54a1f39fee22fa0399825ae47a43e60bad4c5':
  mpegvideo: remove an unused function parameter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 14:28:30 +01:00
Michael Niedermayer
1c65393906 Merge commit '605b047bcc48482dc8a356f56629da259fbddbf1'
* commit '605b047bcc48482dc8a356f56629da259fbddbf1':
  rv10: improve buffer size check.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 14:02:23 +01:00
Michael Niedermayer
b8d6108cfc error_resilience: assert that unsupported B frame interpolation isnt used with h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:59:45 +01:00
Michael Niedermayer
7f23b2a9d0 Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'
* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2':
  error_resilience: remove a useless if() and FIXME
  h264: remove silly macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:49:04 +01:00
Michael Niedermayer
d5518545d1 Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'
* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
  h263: remove an unused parameter from ff_h263_decode_init_vlc
  flac: add channel layout masks for streams with 7 or 8 channels.
  flac: don't check the number of channels before setting the channel layout.

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:42:56 +01:00
Michael Niedermayer
60a0bc46cd Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
  h264chroma: x86: Fix building with yasm disabled
  rv34: Drop now unnecessary dsputil dependencies

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 13:35:49 +01:00