1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 12:22:22 +00:00
Commit Graph

726 Commits

Author SHA1 Message Date
ramiro
dadbe620d6 Add missing parameter to rgb48 to YV12 functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30300 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-14 06:19:10 +00:00
conrad
f3f11efc7a /nop is illegal with Apple's older version of gas, this was fixed elsewhere
but not here since it was unused before now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30289 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 19:03:09 +00:00
zuxy
52b2e49c29 Make sure that sfence is used after any non temporal stores.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30287 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 02:34:33 +00:00
zuxy
7c79acf4b2 Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for
multiple times.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30273 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 08:21:31 +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
ed8a43de8f MMX(2) accelerated yuv420->rgb24 routine, trivial as essentially as it just
swaps R and B inputs for the existing yuv420->bgr24 routine.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30254 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 17:20:49 +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
c894574236 Ignore 0-height slice in sws_scale, otherwise a final 0-height slice will
cause libswscale to assume the incorrect slice order and complain about
slices starting in the middle.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30246 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-08 19:31:33 +00:00
stefano
3f1a03feb1 Implement sws_isSupportedInput() and sws_isSupportedOutput().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30236 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-07 19:07:47 +00:00
zuxy
0c7fcdd42e Remove const to avoid a bunch of GCC warnings against discarded qualifiers and
incompatible pointer type.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30234 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-07 07:13:18 +00:00
stefano
763360ccad Prefer enum PixelFormat over int for the type of the format parameter
of getSubSampleFactors().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30184 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 15:20:07 +00:00
stefano
e8d92b1e66 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for the
swscale_configuration() and swscale_license() functions, consistent
with the rest of FFmpeg.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30180 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:35:20 +00:00
stefano
e786fb79c5 Simplify usePal() macro, make it use av_pix_fmt_descriptors.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30172 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:22:49 +00:00
stefano
f192bfea2a Simplify getSubSampleFactors(), make it use the values provided by
av_pix_fmt_descriptors().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30171 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 00:09:24 +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
779c4a0df5 Remove unused fields from SwsContext.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30095 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-21 01:30:55 +00:00
ramiro
032a777827 Indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30087 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 17:42:35 +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
b5b701c544 Document the differences between the two asm fragments in initMMX2HScaler().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29978 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-07 03:52:55 +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
stefano
5b7ed8dad5 Make sws_format_name() use av_pix_fmt_descriptors.
This also introduces a dependency of libswscale on libavutil.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29968 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-26 21:08:45 +00:00
diego
6ef6b3c1e2 Add functions to return library license and library configuration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29932 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-18 17:16:02 +00:00
cehoyos
2b93a48ac8 Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable
hardware.

Original patch by NVIDIA corporation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 19:11: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
stefano
3591832515 Document sws_freeContext().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29844 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 09:23:11 +00:00
stefano
9e259c79bd Document slice ordering assumption done by sws_scale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29804 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-30 14:13:25 +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
b2b8779831 Reset slice direction at end of each frame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29675 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-13 01:49:40 +00:00
ramiro
03343659ca Remove ; after while(0) in macros.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29674 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-12 20:10:22 +00:00
ramiro
927afdcf6d Document that slices can be bottom to top or top to bottom.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29665 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-09 21:43:25 +00:00
ramiro
af8ff1be74 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29654 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-07 16:29:32 +00:00
ramiro
eb4187bb17 Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
parameters.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29652 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-06 00:07:35 +00:00
ramiro
8e6405bb82 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29651 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-05 23:35:59 +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
c9a80aa682 Curly brackets cosmetics for previous commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29587 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:08:32 +00:00
ramiro
53f310c52c Check for return value of initFilter().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29586 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:06:22 +00:00
ramiro
db1c65dc6c Revert mistakenly commited hunk.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29585 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:03:14 +00:00
ramiro
7f0e696575 swscale: Check for return values of malloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29584 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 23:02:01 +00:00
ramiro
289d5fc85e swscale-example: Free memory used by input data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29583 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 03:36:09 +00:00
ramiro
52b42d8abc Restore comment that was partially removed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29582 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-29 02:44:03 +00:00
ramiro
ec7e2695a6 swscale-example: Rename src->ref so as to not confuse with src being used in doTest().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29548 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-23 20:31:38 +00:00
ramiro
ed3cf3036c swscale-example: Use SWS_BILINEAR instead of hardcoded value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29547 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-23 20:29:49 +00:00
ramiro
62123551eb Fix inconsistent indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29545 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-22 19:30:19 +00:00
ramiro
728be1cb1a Check return values of sws_allocVec() and sws_getConstVec().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29543 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-20 01:55:45 +00:00
reimar
9d6b461605 Free initial swscale context, too. Avoids a valgrind warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29538 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 08:21:55 +00:00
reimar
78fb0e7f16 Remove useless casts of malloc return value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29537 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 08:18:53 +00:00
ramiro
67636ed48b Introduce and use sws_allocVec().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29536 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 01:33:17 +00:00
ramiro
0f89c75f31 Reuse sws_getConstVec() where possible.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29535 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-19 01:32:06 +00:00
ramiro
69cb72414a swscale-example: Make selection of dstW, dstH, and flags more clear.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29527 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-17 02:06:00 +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
28b847afce BGR32 MMX special convertor.
Patch by Peter Schlaile < peter at schlaile dot de >

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29515 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-14 02:15:28 +00:00
ramiro
58a12d7901 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29512 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 19:03:14 +00:00
ramiro
7eaf60438b swscale-example: Don't check for chroma planes in mono formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29511 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 18:39:39 +00:00
ramiro
301a0e4940 MMX2 horizontal scaler: Determine code size at runtime.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29510 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 18:31:07 +00:00
ramiro
a409c31dd1 Protect mmx2 filter code buffers so they are not executable and writeable at
the same time (only mmap for now).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29509 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 18:29:54 +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
ramiro
f4002b6be9 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29506 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 13:18:59 +00:00
ramiro
3c4aba428f swscale-example: Remove hack to end loop by setting variables to break.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29505 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 11:48:06 +00:00
ramiro
fef358505e swscale-example: Don't return random value from main().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29504 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 11:34:27 +00:00
ramiro
4f3fd1c7ea swscale-example: Check for Gray formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29503 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-13 11:33:18 +00:00
diego
180b6a88e4 Remove disabled debug code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29485 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-10 10:53:32 +00:00
ramiro
80c0fb98ba Put some altivec code under COMPILE_ALTIVEC, and not HAVE_ALTIVEC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29484 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-09 15:34:57 +00:00
kostya
1e1a332bbf Remove 'offset' argument from PUTRGB* macros since it's unneeded and caused
pixel swapping during some YUV2RGB conversions.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29483 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-09 15:04: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
cehoyos
fa7e2d8f5c Fix regression when converting to nv12/nv21.
Patch by Guennadi Liakhovetski,  g D liakhovetski A gmx D de 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29464 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-01 21:30:36 +00:00
ramiro
7c240e0268 MMX2 scaler: Remove {} block leftover from factorization in initMMX2Scaler().
Merge variable declarations to previous {} block and indent.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29454 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 05:45:47 +00:00
ramiro
878623ad28 MMX2 scaler: factorize initMMX2Scaler().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29453 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 05:42:46 +00:00
ramiro
7b6fecc8b3 MMX2 scaler: add variable to ease factorization of initMMX2Scaler().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29452 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 05:41:22 +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
deb168fc34 Remove useless code.
flags can never be any other kind of scaling algorithm inside this if().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29449 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 04:46:39 +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
mru
b3186ed071 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29439 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 12:26:32 +00:00
mru
623a2c32b9 Remove unnecessary #include <unistd.h>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29437 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-23 15:23:03 +00:00
ramiro
3490d7cbfa Remove unused variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29435 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-21 20:17:15 +00:00
ramiro
1351150b15 Remove dependency from swscale_internal.h to lavu/internal.h, it is no longer
needed for DECLARE_ALIGNED.
Remove dependency from swscale-example.c to swscale_internal.h by duplicating
the necessary code. The duplicated code is a hack and should be removed once a
cleaner pixel format information system exists. swscale-example.c is example
code on how to use the library and therefore shouldn't rely on internal
headers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29415 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-09 02:27:39 +00:00
diego
cd6a9ea77a The AltiVec code in libswscale no longer is under GPL.
Remove one erroneous preprocessor check for CONFIG_GPL in the AltiVec code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29412 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-05 20:10:59 +00:00
mru
ea03c9b95a Use enum PixelFormat in sws_format_name() prototype
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29409 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-01 12:40:28 +00:00
diego
114b73816f AltiVec code and runtime cpudetect do not require CONFIG_GPL.
Make sure the latter is only checked for x86 optimizations, which are GPL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29390 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-25 20:06:03 +00:00
diego
e4ac99c4db The AltiVec optimizations of libswscale are no longer under GPL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29389 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-25 11:27:36 +00:00
diego
052fee1295 PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29388 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-25 10:14:05 +00:00
vitor
990a1eb471 Do not call rgb2rgbWrapper() for rgb48*, there is no special converter
yet for those formats


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29371 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-17 18:40:19 +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
diego
3971067764 Fix compilation: #undef standard library functions that are
forbidden within FFmpeg, but allowed in example code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29354 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-11 15:15:43 +00:00
diego
0fa66fd738 Add libavutil/internal.h #include, required for the DECLARE_ALIGNED macro.
This fixes swscale-example compilation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29353 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-11 10:19:04 +00:00
stefano
825adf684d Remove '\p' doxygen markup, as it should improve plain text doxy
readability.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29351 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-06 09:37:46 +00:00
ramiro
594de0a0dd Use DECLARE_ALIGNED macro instead of __attribute__((aligned)) for ppc code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29350 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-04 22:50:38 +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
ramiro
b12a88e01d Use DECLARE_ALIGNED macro instead of gcc __attribute__.
Patch by Pavel Pavlov <pavel at summit-tech dot ca>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29348 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-04 21:55:52 +00:00
kostya
570d0b83bd Testing RGB48 variants requires bigger stride in swscale-example.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29343 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-02 15:35:58 +00:00
kostya
615d3ead23 YUV into RGB48 BE/LE conversion support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29342 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-02 12:30:11 +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
kostya
5b29003e0c Let SwScaler know that RGB48 BE/LE is 16-bits per component format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29317 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-19 17:37:58 +00:00
kostya
3da99d2524 Make SwScaler recognize RGB48 BE/LE colourspaces (not support though).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29316 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-19 17:26:22 +00:00
diego
f46dc0b514 Add const qualifier to param argument of sws_getContext() and
sws_getCachedContext().  Fixes the warning:
swscale.c:3408: warning: assignment discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29288 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-10 14:00:00 +00:00
diego
859c7ee1e3 Move preprocessor condition before variable declaration, fixes the warning:
libswscale/swscale.c:1795: warning: unused variable 'flags'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29287 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-10 11:37:04 +00:00
diego
e4c9161560 Add missing const qualifiers to AltiVec function parameters where appropriate.
Fixes a couple of 'discards qualifiers from pointer target type' warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29281 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 10:56:37 +00:00
vitor
19c12794ad Fix sliced yuv410 -> yuv420 conversion
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29272 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 20:41:04 +00:00
michael
271357149a Change VOFW for x86 to 5120, it allows larger images to be scaled and was
not slower. Other archs are not changed as the larger VOFW was slower on PPC.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29256 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 01:34:16 +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
sdrik
c8509646d5 Remove useless duplicated code in yuv2rgb_c_32, yuva2rgba_c and yuva2argb_c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29240 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-27 14:25:44 +00:00
cehoyos
ca205c9d8f Make reset_ptr() void.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29229 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 22:19: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
michael
b724d63b87 Merge gray->gray converters into planarCopy(), this should also make planarCopy()
useable for other 16bit formats once we support them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29216 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-21 00:08:06 +00:00
michael
56702531e2 Add macro to check for 16bit per sample.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29215 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-21 00:03:00 +00:00
michael
9cdb6b4821 Make sure src/dst are NULL when they arent used, some code uses this to
simpify checks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29214 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-21 00:01:59 +00:00
michael
1423dd2165 Use generic BE check instead of checking for gray16LE.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29213 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 21:05:32 +00:00
michael
36fd4baa05 add isBE()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29212 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 21:04:55 +00:00
michael
abfb150159 Remove 2 useless += at the end of rgb16to15(), found by CSA.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29189 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-18 22:27:36 +00:00
stefano
9be7c4ad97 Rename swscale_avoption.c to options.c.
Consistent with lavc and lavf.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29188 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-18 13:52:00 +00:00
stefano
d5b3f76234 Make sws_setColorspaceDetails() return -1 if the destination format is
not supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29187 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-18 11:53:59 +00:00
stefano
685890259f Move sws_[gs]etColorspaceDetails() documentation from swscale.c to
swscale.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29186 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-18 11:45:31 +00:00
diego
f97bdd7504 whitespace cosmetics: Break some overly long lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29180 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-14 14:39:04 +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
diego
e72dc59c77 Move addition of MMX-OBJS to OBJS into common.mak instead of duplicating it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29175 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-12 22:49:58 +00:00
diego
0160ed61b3 whitespace cosmetics: Reindent a few lines and break a few excessively long lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29174 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-12 22:43:03 +00:00
ramiro
ca242e5f73 Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 20:21:21 +00:00
ramiro
b2baebacd3 swscale: Remove X86 commented out code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29149 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-05 19:17:53 +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
ramiro
f89e6c2334 swscale: {}-related cosmetics.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29144 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 22:43:24 +00:00
ramiro
8b6298459d swscale: Add const to some swScale functions' parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29143 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 22:41:46 +00:00
ramiro
96323d1d5d swscale: Remove mmx2 params from h[yc]scale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29129 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 18:34:11 +00:00
ramiro
9574441a1c swscale: Split h[yc]scale_fast() into their own functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29128 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 18:32:49 +00:00
ramiro
755c96e953 swscale: Execute sfence and emms depending on runtime flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29127 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 18:31:22 +00:00
mru
32739e5d34 Make examples and test progs depend on libraries
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29119 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-01 00:54:23 +00:00
diego
1967c9844f Add missing $(EXESUF) to example/test program dependency declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29114 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-31 16:52:24 +00:00
reimar
e0fb449076 Use correct PRId64 instead of "lld" in printf string, fixes compiler warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29107 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-30 12:23:28 +00:00
diego
c3cf2ce654 Generalize example target rule in common.mak so that it sets a -example$(EXESUF)
suffix for all example files instead of doing this in individual Makefiles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29100 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 14:35:38 +00:00
diego
04327ae83a Move swscale AltiVec template code to ppc subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29099 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 14:18:44 +00:00
diego
f9aefa045f Relicense file to LGPL with the permission of Romain Dolbeau, the author.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29097 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 13:47:30 +00:00