Commit Graph
167 Commits
Author SHA1 Message Date
diego 28ff7246a0 libswscale: Relicense almost all x86 assembler optimizations as LGPL.
This is of course done with permissions from the authors. The only GPL
component left are MMX optimizations for YUV to RGB conversion.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30965 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 11:31:02 +00:00
diego 0f759a5da0 Replace wrong condition name in #endif comment by correct instance.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30938 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 09:58:45 +00:00
michael 75f3bd09ea try to avoid returning odd slices.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30847 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 21:39:27 +00:00
ramiro eb846cb700 Reorder buffer debug. Also print out if slice was buffered.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30722 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-23 16:46:43 +00:00
michael 156399b7aa Use isAnyRGB() where possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30435 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 08:03:28 +00:00
michael 378e6bf192 Rename isRGB() and isBGR() as their meaning is confusing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30433 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 07:40:14 +00:00
stefano ae2e7d7298 Declare with av_unused the variable alpMmxFilter, fix the gcc warning:
swscale_template.c: In function ‘swScale_C’:
swscale_template.c:2580: warning: unused variable ‘alpMmxFilter’
swscale_template.c: In function ‘sws_init_swScale_C’:


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30332 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:22:30 +00:00
ramiro 14fe9544f9 Reuse h{lum,chr}Filter{,Pos} variables for MMX2 fast_bilinear horizontal scaler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30327 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 18:39:06 +00:00
zuxy 0bd2e793c1 Const correctness for src pointer. Remove all constness related warnings in
libswscale.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30306 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 08:51:51 +00:00
ramiro 83ff693d41 cosmetics: {} placement.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30272 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 07:30:28 +00:00
zuxy 9e5a65dcbe Remove unused PREFETCHW macro
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30253 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 14:44:20 +00:00
reimar 17c214c820 Do not needlessly use the BP register in x86_64-specific code, there are
enough other registers available that are less likely to cause issues.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30160 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 09:46:24 +00:00
diego f20cd805ec Remove unused variable, fixes the warning:
libswscale/swscale_template.c:2575: warning: unused variable ‘srcFormat’


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30132 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 12:05:20 +00:00
ramiro 34fb57ce56 Remove parameters no longer used in h[yc]scale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30099 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:59:34 +00:00
ramiro 767326f484 Move fast bilinear scaler code to the existing h[yc]scale_fast() functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30098 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:54:59 +00:00
ramiro 0ebdb661a6 Rename function pointers used to convert from the input pixel format to the
intermediate YV12 to a more descriptive name.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30097 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:41:29 +00:00
ramiro 342009a438 Check if chroma horizontal scaler is needed in sws_init_swScale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30096 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:34:45 +00:00
ramiro b8d5738c09 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30086 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 17:15:01 +00:00
ramiro c082aa34ad Set fast_bilinear functions in sws_init_swScale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30085 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 17:09:46 +00:00
ramiro 2d4a819ef5 Set horizontal scaler's range conversion in context in sws_init_swScale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30082 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 16:32:58 +00:00
ramiro 08f9e35211 Set horizontal scaler's src offsets in context in sws_init_swScale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30081 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 16:21:25 +00:00
ramiro 71f9e96fc7 Start using intermediate buffers at index 0.
These index variables are incremented before each use, so they should be
initialized to -1.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29977 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-06 22:01:25 +00:00
ramiro 63e520efbf Fix compilation with runtime cpu detection.
All functions in swscale_template.c should be declared with the RENAME macro.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29976 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-05 09:44:19 +00:00
ramiro bf29785d5a Add support for nv12/nv21 input.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29974 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-03 18:18:13 +00:00
cehoyos bc1ee4ca03 Use enum PixelFormat instead of int for srcFormat and dstFormat.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29857 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-08 23:31:43 +00:00
diego 5b3208baf2 Replace manual gcc version check by AV_GCC_VERSION_AT_LEAST macro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29701 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-22 14:38:49 +00:00
ramiro d41ec8ed48 Cleanup buffer debugs in swScale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29686 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 22:34:48 +00:00
ramiro b769ea34ea Use correct buffers in vertical scaler in unscaled YV12 case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29685 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 22:31:43 +00:00
ramiro 6d1176f071 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
Patch by Lars Täuber <lars <dot> taeuber <at> gmx <dot> net>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29650 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-05 23:33:11 +00:00
ramiro 808ac07940 More indentation changes leftover from r29522:
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29524 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 21:37:07 +00:00
ramiro b490da35c8 Cosmetics:
- Place curly brackets in the same line as while/for/if/switch/else/do;
- Place curly brackets at column 0 in the next line starting a function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29523 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 21:11:28 +00:00
ramiro 88dafbd9a5 Indent libswscale:
- Use 4 spaces throughout for indentation;
- Fix inconsistent indentation;
- Indent function calls and declarations aligning arguments on multiple lines
  to the column after the opening parentheses;
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29522 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-16 00:32:04 +00:00
ramiro ca774579f7 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29518 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 02:35:55 +00:00
ramiro 15fb97be65 Vertical yuv -> yuv16 scaler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29517 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-14 15:52:40 +00:00
ramiro 6f79fc6ff9 Remove duplicate define (it is the same in the lum code).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29508 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 18:28:55 +00:00
ramiro 054bb3016f Rename "funny" code to "mmx2 filter" code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29507 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 18:28:17 +00:00
diego 1407950a2f Remove disabled crufty code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29482 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-08 15:18:48 +00:00
ramiro e0af29f2c3 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29451 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 05:14:47 +00:00
ramiro ddbb0bc0db Remove duplicate horizontal scaling when there aren't enough lines in a slice
to output the dstY line.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29450 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 05:13:36 +00:00
ramiro 53d5120152 Do not misuse HAVE_ defines. Introduce COMPILE_TEMPLATE_ defines and use them
instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29446 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-27 06:47:41 +00:00
ramiro d7a50940f7 Factorize x86 fast_bilinear assembly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29445 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-27 06:22:00 +00:00
ramiro a7c8120418 Fix assembly comments for x86 fast_bilinear so they match the C code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29444 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-27 06:20:17 +00:00
ramiro 79cbf2cc39 Kill warnings of possibly unused variables by using av_unused.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29355 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-11 17:10:54 +00:00
ramiro 0318aa32cf Replace more uses of __attribute__((aligned)) by DECLARE_ALIGNED.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29349 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-04 22:10:52 +00:00
kostya 071cdc07aa Partial (low bits ignored, no direct transcoding into other RGB formats) support
for inputting RGB48BE/LE.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29341 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-02 12:28:49 +00:00
kostya f7d2053641 Move colorspace conversion functions implemented in pure C from template
into swscale.c



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29320 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-25 16:42:54 +00:00
sdrik 1a132a4acd Fix chroma shift when scaling from ARGB on LE and BGRA on BE
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29242 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-02 08:40:53 +00:00
michael 7a07a0fcb0 Planar 16bit 420 422 444 YUV support (output is only supported in some
unscaled convertions).
This, like gray16 converts down to 8bit, which is a big FIXME & patch welcome,
we should preserve more bits.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29217 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-21 01:08:03 +00:00
sdrik d323bf6135 Do not use abgrToA for both luma and alpha channel in hyscale.
This fixes RGB32 (et al.) scaling.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29179 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-14 14:11:57 +00:00
ramiro 9442096523 swscale: Use function pointers for swScale functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29145 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 22:45:02 +00:00