672c610d84
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
...
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 22:23:04 +01:00
f9279ee749
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
2014-03-22 06:17:29 -07:00
e98bac82e5
Merge commit '82bb3048013201c0095d2853d4623633d912252f'
...
* commit '82bb3048013201c0095d2853d4623633d912252f':
dsputil: Use correct type in me_cmp_func function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:36:40 +01:00
3775224b2f
Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'
...
* commit '54a6e08a650a71fd375551585b0ea40a3a06d228':
dsputil: Conditionally compile dsputil code on all architectures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:12:11 +01:00
ba85bfabf3
Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'
...
* commit '5169e688956be3378adb3b16a93962fe0048f1c9':
dsputil: Propagate bit depth information to all (sub)init functions
Conflicts:
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-20 22:06:01 +01:00
82bb304801
dsputil: Use correct type in me_cmp_func function pointer
2014-03-20 05:03:23 -07:00
54a6e08a65
dsputil: Conditionally compile dsputil code on all architectures
2014-03-20 05:03:23 -07:00
5169e68895
dsputil: Propagate bit depth information to all (sub)init functions
...
This avoids recalculating the value over and over again.
2014-03-20 05:03:23 -07:00
f3d3e3fa4e
Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'
...
* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
bfin: Use more sensible file names
Conflicts:
libavcodec/bfin/pixels.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:12:45 +01:00
be60e20498
Merge commit '929ec39ec4497827f7530f2aaa31646ef35462ee'
...
* commit '929ec39ec4497827f7530f2aaa31646ef35462ee':
bfin: hpeldsp: Split no_rnd pixel operations off into a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:06:21 +01:00
26f4a50982
Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'
...
* commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730':
bfin: dsputil: Unconditionally compile hpel pixels code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:04:56 +01:00
866e11b33b
Merge commit '13ae97b210f35d77290f4edb0d6846269271729a'
...
* commit '13ae97b210f35d77290f4edb0d6846269271729a':
bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 02:04:42 +01:00
c49797637f
Merge commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5'
...
* commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5':
bfin: Move all assembly declarations only used within one .c file there
Conflicts:
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/vp3_bfin.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:57:41 +01:00
cbf190f7ae
Merge commit '80173c71bab3b8817c148837bdc920557018f428'
...
* commit '80173c71bab3b8817c148837bdc920557018f428':
bfin: hpeldsp: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:56:45 +01:00
3141b04c7f
Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'
...
* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
bfin: Refactor duplicated assembly-related macros
Conflicts:
libavcodec/bfin/hpel_pixels_bfin.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:56:25 +01:00
91a61c4c15
Merge commit 'e99af2a3b1660b4f328335149980064692097cad'
...
* commit 'e99af2a3b1660b4f328335149980064692097cad':
bfin: Refactor duplicated l1_text/l1_data_B macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:49:44 +01:00
edf4261350
Merge commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f'
...
* commit 'a3e7562621bd96ce909e07149c419b6ba85cc54f':
bfin: dsputil: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:48:57 +01:00
a4369dbb8f
Merge commit '1e33095b83addd8d24bc16bd08aa734fa161d515'
...
* commit '1e33095b83addd8d24bc16bd08aa734fa161d515':
bfin: dsputil: Drop broken and trivial profiling code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:48:39 +01:00
2b02c1a698
Merge commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8'
...
* commit 'f5f099766816aab3ad805c63e85f12cb664dc9a8':
bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:43:08 +01:00
c686cf23aa
Merge commit '14efbe694ac5beff98f5c5e652c166603f1738cf'
...
* commit '14efbe694ac5beff98f5c5e652c166603f1738cf':
bfin: dsputil: Drop broken vsad bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:42:47 +01:00
0f95856834
Merge commit '671c8785596ea4a45817ba302289004ff456630a'
...
* commit '671c8785596ea4a45817ba302289004ff456630a':
bfin: dsputil: Remove unused global variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 01:42:20 +01:00
6016b8329b
Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'
...
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852':
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names
Conflicts:
libavcodec/bit_depth_template.c
libavcodec/motionpixels_tablegen.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 00:39:51 +01:00
1c788eaca9
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
...
* commit '831a1180785a786272cdcefb71566a770bfb879e':
Update dsputil- and SIMD-related comments to match reality more closely
Conflicts:
libavcodec/x86/hpeldsp.asm
libavutil/arm/float_dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 23:59:56 +01:00
eb2b8bce39
bfin: Use more sensible file names
...
Drop non-informative _bfin suffix, rename some files for consistency with
other architectures, rename others to reflect their content.
2014-03-13 08:15:53 -07:00
929ec39ec4
bfin: hpeldsp: Split no_rnd pixel operations off into a separate file
...
This saves some space in configurations that do not enable hpeldsp.
2014-03-13 08:15:53 -07:00
a7cc4ac9d9
bfin: dsputil: Unconditionally compile hpel pixels code
...
The functions it contains are used from unconditionally compiled code.
2014-03-13 08:15:53 -07:00
13ae97b210
bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency
2014-03-13 08:15:53 -07:00
bbf0ef57e9
bfin: Move all assembly declarations only used within one .c file there
...
This is done similarly for all other architectures.
2014-03-13 08:15:53 -07:00
80173c71ba
bfin: hpeldsp: K&R formatting cosmetics
2014-03-13 08:15:52 -07:00
da785231ea
bfin: Refactor duplicated assembly-related macros
2014-03-13 08:15:52 -07:00
e99af2a3b1
bfin: Refactor duplicated l1_text/l1_data_B macros
2014-03-13 08:15:52 -07:00
a3e7562621
bfin: dsputil: K&R formatting cosmetics
...
Also add a few #endif comments.
2014-03-13 08:15:52 -07:00
1e33095b83
bfin: dsputil: Drop broken and trivial profiling code
2014-03-13 08:15:52 -07:00
f5f0997668
bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits
...
They were marked as broken and disabled in 2009 and will never get fixed.
2014-03-13 08:15:52 -07:00
14efbe694a
bfin: dsputil: Drop broken vsad bits
...
They were marked as broken and disabled in 2009 and will never get fixed.
2014-03-13 08:15:52 -07:00
671c878559
bfin: dsputil: Remove unused global variable
2014-03-13 08:15:51 -07:00
05563ccacc
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names
...
Also switch from "tbl" to "tab" name suffixes.
2014-03-13 08:12:44 -07:00
831a118078
Update dsputil- and SIMD-related comments to match reality more closely
2014-03-13 05:50:29 -07:00
7b89e24151
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
bfin: vp3: Mark all binary object sections appropriately
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22 16:08:24 +01:00
19987fa18c
bfin: vp3: Mark all binary object sections appropriately
...
This fixes a leftover from e44d7c659b
2014-01-22 05:38:15 -08:00
adc09a353c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: remove disabled bfin asm
Conflicts:
libavcodec/bfin/mpegvideo_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04 03:13:54 +01:00
a3a55645f0
mpegvideo: remove disabled bfin asm
...
It has been disabled as 'broken' over 3 years ago in b716a792
2014-01-03 16:54:24 +01:00
0e3d2b2c8d
Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'
...
* commit '287c8db39e71af7047e551bbfd1264d771cccbc9':
cosmetics: bfin: Fix indentation in the dsputil init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 16:19:59 +02:00
c5a11ab6d1
Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'
...
* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075':
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/bfin/Makefile
libavcodec/bfin/hpel_pixels_bfin.S
libavcodec/bfin/hpeldsp_bfin.c
libavcodec/bfin/hpeldsp_bfin.h
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 14:31:11 +02:00
287c8db39e
cosmetics: bfin: Fix indentation in the dsputil init function
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:29:22 +03:00
bfb41b5039
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:19:13 +03:00
d98c3adef2
Merge commit '015821229f96bf7e677f2a711a58dbea3009f574'
...
* commit '015821229f96bf7e677f2a711a58dbea3009f574':
vp3: Use full transpose for all IDCTs
Conflicts:
libavcodec/vp3.c
libavcodec/vp3dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 00:56:15 +02:00
05bea44393
Merge commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9'
...
* commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9':
vp3: bfin: Transpose the IDCTs
Conflicts:
libavcodec/bfin/vp3_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 00:50:33 +02:00
015821229f
vp3: Use full transpose for all IDCTs
...
This way, the special IDCT permutations are no longer needed. This
is similar to how H264 does it, and removes the dsputil dependency
imposed by the scantable code.
Also remove the unused type == 0 cases from the plain C version
of the idct.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-15 12:32:05 +03:00
5941978e71
vp3: bfin: Transpose the IDCTs
...
While this change isn't bitexact, the IDCTs weren't bitexact to
start with either.
This simplifies decoupling vp3 from dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-15 12:31:52 +03:00
Michael Niedermayer
Diego Biurrun
Anton Khirnov
Martin Storsjö
Ronald S. Bultje