RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
63,463 Commits 36 Branches 398 Tags 234 MiB
Commit Graph

545 Commits

Author SHA1 Message Date
Michael Niedermayer 47fc82b5b3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dsputil: Move DV-specific ff_zigzag248_direct table to dvdata

Conflicts:
	libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-05 19:43:28 +02:00
Diego Biurrun 5f92204370 dsputil: Move DV-specific ff_zigzag248_direct table to dvdata 2014-04-04 19:08:05 +02:00
Michael Niedermayer 2d15e0c01d 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>
 2014-03-26 15:36:27 +01:00
Michael Niedermayer b4f64c58fc 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>
 2014-03-26 15:24:50 +01:00
Michael Niedermayer e9c6b93bda Merge commit '2c01ad8b206d326700974438f7193f22be416eb1' 
* commit '2c01ad8b206d326700974438f7193f22be416eb1':
  dsputil_template: Detemplatize the code

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 14:59:50 +01:00
Michael Niedermayer 3262069101 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>
 2014-03-26 14:40:49 +01:00
Michael Niedermayer 152c8fd856 Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f' 
* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 14:32:24 +01:00
Diego Biurrun 92ba965103 dsputil: Move draw_edges and clear_block* out of dsputil_template 
The functions are not used templatized.
 2014-03-26 04:31:27 -07:00
Diego Biurrun da5be23525 dsputil: Move RV40-specific bits into rv40dsp 2014-03-26 04:31:27 -07:00
Diego Biurrun 2c01ad8b20 dsputil_template: Detemplatize the code 
The indirection makes no sense without multiple instantiation.
 2014-03-26 04:31:27 -07:00
Diego Biurrun e7373585f8 dsputil_template: Move bits that are used templatized into separate file 
This allows detemplatizing the bits that are not instantiated twice.
 2014-03-26 04:31:27 -07:00
Diego Biurrun d3c3c1664a dsputil: Move hpel_template #include out of dsputil_template 
Multiple inclusion makes no sense as it is only used in the 8-bit case.
 2014-03-26 04:31:26 -07:00
Michael Niedermayer 9d6a27d533 Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f' 
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 23:26:23 +01:00
Diego Biurrun 57f09608e1 dsputil: Move thirdpel-related bits into their own context 2014-03-22 06:17:30 -07:00
Michael Niedermayer 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
Michael Niedermayer 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
Diego Biurrun 82bb304801 dsputil: Use correct type in me_cmp_func function pointer 2014-03-20 05:03:23 -07:00
Diego Biurrun 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
Michael Niedermayer 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
Michael Niedermayer 16f619f57c Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150' 
* commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150':
  dsputil: Merge variable declarations and initializations

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:37:28 +01:00
Michael Niedermayer dd7c2e9bce Merge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92' 
* commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92':
  dsputil: K&R formatting cosmetics

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:31:48 +01:00
Michael Niedermayer ea2bd139b7 Merge commit '0a8f91b1fbc1b627d8db8c734c812beb32102936' 
* commit '0a8f91b1fbc1b627d8db8c734c812beb32102936':
  dsputil: Remove disabled avg_no_rnd_qpel leftovers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 00:07:47 +01:00
Michael Niedermayer 3fc2362aef Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 
* commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143':
  Remove all SPARC architecture optimizations

Conflicts:
	Makefile
	configure
	libavcodec/sparc/dsputil_vis.c
	libavcodec/sparc/dsputil_vis.h
	libavcodec/sparc/hpeldsp_vis.c
	libavcodec/sparc/simple_idct_vis.c
	libavcodec/sparc/vis.h
	libswscale/sparc/yuv2rgb_vis.c
	libswscale/swscale_internal.h

If someone wants to maintain these (or other) SPARC optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:35:47 +01:00
Michael Niedermayer 7ac1e27f0f Merge commit 'd6096a67422534918405abb46dafbbac4608cbc3' 
* commit 'd6096a67422534918405abb46dafbbac4608cbc3':
  Remove all SH4 architecture optimizations

Conflicts:
	libavcodec/sh4/dsputil_sh4.c
	libavcodec/sh4/dsputil_sh4.h
	libavcodec/sh4/idct_sh4.c
	libavcodec/sh4/sh4.h

If someone wants to maintain these (or other) SH4 optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 22:06:01 +01:00
Diego Biurrun 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
Diego Biurrun 635ec127d4 dsputil: Merge variable declarations and initializations 2014-03-13 08:12:44 -07:00
Diego Biurrun bb12c2e9c0 dsputil: K&R formatting cosmetics 2014-03-13 08:12:39 -07:00
Diego Biurrun 0a8f91b1fb dsputil: Remove disabled avg_no_rnd_qpel leftovers 2014-03-13 08:10:52 -07:00
Diego Biurrun b4dd424d96 Remove all SPARC architecture optimizations 
SPARC is no longer being used in any multimedia-related fields and the
VIS optimizations only represent a maintenance burden.
 2014-03-13 05:50:28 -07:00
Diego Biurrun d6096a6742 Remove all SH4 architecture optimizations 
SH4 has been end-of-lifed and no more test machines are available.
 2014-03-13 05:50:28 -07:00
Diego Biurrun 9103185bd1 dsputil: Drop ff_check_alignment() function 
The function is supposed to confirm that the compiler provided enough
alignment, but in practice it is only run in certain code paths and
insufficient alignment problems are restricted to legacy compilers.
 2014-03-13 05:50:28 -07:00
Michael Niedermayer f70d7eb20c Move add/diff_int16 to lossless_videodsp 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-20 21:32:47 +01:00
Michael Niedermayer da0684820a avcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil 
This also fixes masking the bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-20 04:06:04 +01:00
Michael Niedermayer 8e70fdab36 Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3' 
* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
	libavcodec/arm/ac3dsp_init_arm.c
	libavcodec/arm/ac3dsp_neon.S
	libavcodec/x86/ac3dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-09 04:12:40 +01:00
Diego Biurrun 4958f35a2e dsputil: Move apply_window_int16 to ac3dsp 
The (optimized) functions are used nowhere else.
 2013-12-08 17:57:15 +01:00
Michael Niedermayer be2312aa8f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo

If someone optimizes dct_quantize for non x86 SIMD, then this
probably needs to be reverted.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-02 10:59:48 +01:00
Diego Biurrun 7ffaa19570 dsputil: x86: Move ff_inv_zigzag_direct16 table init to mpegvideo 
The table is MMX-specific and used nowhere else.
 2013-12-02 04:05:18 +01:00
Michael Niedermayer f21ca39e81 Merge commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b' 
* commit 'd1916d13e28b87f4b1b214231149e12e1d536b4b':
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
	libavcodec/dsputil.c

See: 454a11a1c9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-28 22:02:55 +01:00
Michael Niedermayer d1916d13e2 dsputil/pngdsp: fix signed/unsigned type in end comparison 
Fixes out of array accesses and integer overflows.
 2013-11-28 15:37:55 +01:00
Diego Biurrun c7f7bfc9e3 Remove all Alpha architecture optimizations 
Alpha has been end-of-lifed and no more test machines are available.
 2013-11-13 20:45:49 +01:00
Michael Niedermayer a30f7918b5 Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6' 
* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 17:42:56 +01:00
Diego Biurrun 0338c39698 dsputil: Split off H.263 bits into their own H263DSPContext 2013-11-08 12:40:47 +01:00
Michael Niedermayer ae57e82469 avcodec/dsputil: add 12bit simple idct 
Will be needed for jpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 01:19:37 +02:00
Michael Niedermayer 454a11a1c9 avcodec/dsputil: fix signedness in sizeof() comparissions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 23:40:47 +02:00
Michael Niedermayer f896f92337 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:15:54 +02:00
Michael Niedermayer 477641e9f8 Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b' 
* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:32:05 +02:00
Diego Biurrun 67e6a9f558 cosmetics: Place arch initialization calls in alphabetical order 2013-08-29 11:24:14 +02:00
Diego Biurrun a64f6a04ac dsputil: x86: Hide arch-specific initialization details 
Also give consistent names to init functions.
 2013-08-28 23:59:24 +02:00
Michael Niedermayer 0aa095483d Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487' 
* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
  avcodec: Add av_cold attributes to init functions missing them

Conflicts:
	libavcodec/aacpsy.c
	libavcodec/atrac3.c
	libavcodec/dvdsubdec.c
	libavcodec/ffv1.c
	libavcodec/ffv1enc.c
	libavcodec/h261enc.c
	libavcodec/h264_parser.c
	libavcodec/h264dsp.c
	libavcodec/h264pred.c
	libavcodec/libschroedingerenc.c
	libavcodec/libxvid_rc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/proresdsp.c
	libavcodec/rangecoder.c
	libavcodec/videodsp.c
	libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-05 11:34:29 +02:00
Diego Biurrun 6fee1b90ce avcodec: Add av_cold attributes to init functions missing them 2013-05-04 21:09:45 +02:00