731c04ad65
Make selfTest() perform tests where both the input and output formats
...
are supported, avoid pointless loops.
Originally committed as revision 30377 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 21:52:00 +00:00
f28cc5771f
Make const prototypes for input sources of sws_scale_* stricter.
...
Patch by Alexis Ballier gmailify($firstname, $familyname)
Originally committed as revision 30374 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 16:30:20 +00:00
9e5f164dc1
swscale-example: Add comment about the use of av_{malloc,free}.
...
Originally committed as revision 30373 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 15:42:51 +00:00
3aca8b59f6
Remove useless forward declaration.
...
Originally committed as revision 30371 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 11:35:04 +00:00
d5206d3dd6
User friendly warning message that gives out names of source and target formats
...
Originally committed as revision 30370 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 05:21:17 +00:00
51d83986b1
swscale-example: use av_malloc()
...
Image buffers require 16-byte alignment, so av_malloc() should be used.
Fixes crash on PPC.
Originally committed as revision 30369 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 03:47:11 +00:00
2d8d885b06
Split long line.
...
Originally committed as revision 30368 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-18 23:34:07 +00:00
591e465acf
Convert int -> enum PixelFormat in doTest().
...
Originally committed as revision 30367 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-18 23:33:17 +00:00
3c52d4849f
Define out currently unused static functions.
...
Originally committed as revision 30365 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-18 08:42:04 +00:00
c36a4294dc
Remove stray '\' at the end of macro definitions.
...
Originally committed as revision 30362 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 23:29:31 +00:00
90eb284a77
Remove duplicated or pointless newlines.
...
Originally committed as revision 30361 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 23:17:47 +00:00
398c193d0b
Factorize error message logging, log it if the converter cannot be
...
set.
Originally committed as revision 30360 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 23:07:37 +00:00
e36a545de5
Reindent after the last commit.
...
Originally committed as revision 30359 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 23:02:20 +00:00
c0d1dc1c4f
Make the pal2rgbWrapper set and use the converter in pal2rgbWrapper
...
only if the input format is paletted.
Fix potential crashes/weirdness if the input format is non-paletted.
Originally committed as revision 30358 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 23:00:01 +00:00
00c4127ec9
Remove double const
...
Originally committed as revision 30357 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 19:26:35 +00:00
9a180390b9
Factorize error message logging in rgb2rgbWrapper().
...
Originally committed as revision 30356 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 15:11:25 +00:00
1b5d46c6a6
Reindent
...
Originally committed as revision 30350 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 14:25:19 +00:00
d39d7cf693
Remove inline from initFilter()
...
It makes no sense having that function inlined.
Originally committed as revision 30349 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 14:25:17 +00:00
e922e34c96
Add a const qualifier in a cast, fix the gcc warning:
...
swscale.c: In function ‘sws_scale’:
swscale.c:2968: warning: cast discards qualifiers from pointer target type
Originally committed as revision 30341 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 00:26:29 +00:00
5090d8e16a
Add a const qualifier in a cast, fix the gcc warning:
...
swscale.c: In function ‘planarCopy’:
swscale.c:2256: warning: cast discards qualifiers from pointer target type
Originally committed as revision 30340 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-17 00:21:50 +00:00
a630ed3ee9
Fix typo, "get rid off" -> "get rid of".
...
Originally committed as revision 30338 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 22:49:00 +00:00
730cb9dab3
Revert r30331, which broke compilation.
...
swScale_C is not templated if any optimization is to be used and
!runtime_cpudetect.
Originally committed as revision 30334 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 19:51:26 +00:00
73cadb4f13
Prefer enum PixelFormat to int as the parameter type of
...
fmt_depth(fmt).
Originally committed as revision 30333 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 19:32:58 +00:00
bc45751f7f
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’:
Originally committed as revision 30332 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 19:22:30 +00:00
80853cfc6a
Factorize the code which calls the non optimized C functions in
...
getSwsFunc().
Originally committed as revision 30331 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 19:19:54 +00:00
c70f1401df
Prefer "to %s%s" over "to%s %s", slightly more readable.
...
Originally committed as revision 30330 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 19:14:29 +00:00
a9e2878c48
Simplify code in sws_getContext() which logs if the destination format
...
support dithering, remove the const char *dither variable and use a
literal string instead.
Originally committed as revision 30329 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 19:11:03 +00:00
9556124c97
Document some of SwsContext.
...
Originally committed as revision 30328 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 19:04:55 +00:00
0cc854e377
Reuse h{lum,chr}Filter{,Pos} variables for MMX2 fast_bilinear horizontal scaler.
...
Originally committed as revision 30327 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 18:39:06 +00:00
d95c863850
Factorize code which logs the source and destination formats in
...
sws_getContext().
Originally committed as revision 30326 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 18:36:21 +00:00
3e906f4cfb
Simplify reset_ptr(): employ usePal() macro rather than enumerating
...
all the paletted formats.
Originally committed as revision 30317 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 11:08:16 +00:00
e8393e1cb8
Add symbol versioning for shared libraries
...
Based on patch by Reinhard Tartler <siretart tauware de>
Originally committed as revision 30315 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-16 04:48:55 +00:00
2e3e8031ec
Don't initialize normal horizontal filter if MMX2 filter is used.
...
Originally committed as revision 30313 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-15 19:50:59 +00:00
a959e24780
Const correctness for src pointer. Remove all constness related warnings in
...
libswscale.
Originally committed as revision 30306 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-15 08:51:51 +00:00
3bfbbef64d
Fix typo.
...
Originally committed as revision 30304 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-15 00:39:25 +00:00
00c081a8f0
Remove unused clip_table code.
...
Originally committed as revision 30303 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-14 19:12:42 +00:00
efc034cc0f
Add const qualifier to rgb48 to YV12 functions' src.
...
Originally committed as revision 30301 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-14 06:19:45 +00:00
a3e35e2852
Add missing parameter to rgb48 to YV12 functions.
...
Originally committed as revision 30300 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-14 06:19:10 +00:00
28b2866f45
/nop is illegal with Apple's older version of gas, this was fixed elsewhere
...
but not here since it was unused before now.
Originally committed as revision 30289 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-12 19:03:09 +00:00
845e37e770
Make sure that sfence is used after any non temporal stores.
...
Originally committed as revision 30287 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-12 02:34:33 +00:00
52c0fcaf52
Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for
...
multiple times.
Originally committed as revision 30273 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-11 08:21:31 +00:00
996de2fefa
cosmetics: {} placement.
...
Originally committed as revision 30272 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-11 07:30:28 +00:00
23b0072ad7
MMX(2) accelerated yuv420->rgb24 routine, trivial as essentially as it just
...
swaps R and B inputs for the existing yuv420->bgr24 routine.
Originally committed as revision 30254 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-09 17:20:49 +00:00
4b19045566
Remove unused PREFETCHW macro
...
Originally committed as revision 30253 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-09 14:44:20 +00:00
1b168a428d
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.
Originally committed as revision 30246 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-08 19:31:33 +00:00
8e9767f6fd
Implement sws_isSupportedInput() and sws_isSupportedOutput().
...
Originally committed as revision 30236 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-07 19:07:47 +00:00
bb34acd8a4
Remove const to avoid a bunch of GCC warnings against discarded qualifiers and
...
incompatible pointer type.
Originally committed as revision 30234 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-07 07:13:18 +00:00
634116df3e
Prefer enum PixelFormat over int for the type of the format parameter
...
of getSubSampleFactors().
Originally committed as revision 30184 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-03 15:20:07 +00:00
997980f0d8
Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for the
...
swscale_configuration() and swscale_license() functions, consistent
with the rest of FFmpeg.
Originally committed as revision 30180 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-03 14:35:20 +00:00
f412d5e97a
Simplify usePal() macro, make it use av_pix_fmt_descriptors.
...
Originally committed as revision 30172 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-03 00:22:49 +00:00
b3cf7cb144
Simplify getSubSampleFactors(), make it use the values provided by
...
av_pix_fmt_descriptors().
Originally committed as revision 30171 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-03 00:09:24 +00:00
f514b4f937
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.
Originally committed as revision 30160 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-01 09:46:24 +00:00
c887b30d79
Remove unused variable, fixes the warning:
...
libswscale/swscale_template.c:2575: warning: unused variable ‘srcFormat’
Originally committed as revision 30132 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-28 12:05:20 +00:00
aaba7e6c66
Remove parameters no longer used in h[yc]scale().
...
Originally committed as revision 30099 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-21 01:59:34 +00:00
a1f4b4bb6e
Move fast bilinear scaler code to the existing h[yc]scale_fast() functions.
...
Originally committed as revision 30098 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-21 01:54:59 +00:00
bb53e1d188
Rename function pointers used to convert from the input pixel format to the
...
intermediate YV12 to a more descriptive name.
Originally committed as revision 30097 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-21 01:41:29 +00:00
e7a47515ab
Check if chroma horizontal scaler is needed in sws_init_swScale().
...
Originally committed as revision 30096 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-21 01:34:45 +00:00
6f9771d7a6
Remove unused fields from SwsContext.
...
Originally committed as revision 30095 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-21 01:30:55 +00:00
d3243d1431
Indentation.
...
Originally committed as revision 30087 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-20 17:42:35 +00:00
e77ddfa293
Indent.
...
Originally committed as revision 30086 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-20 17:15:01 +00:00
b501a1f56a
Set fast_bilinear functions in sws_init_swScale().
...
Originally committed as revision 30085 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-20 17:09:46 +00:00
bae76dc3eb
Set horizontal scaler's range conversion in context in sws_init_swScale().
...
Originally committed as revision 30082 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-20 16:32:58 +00:00
84011f10d5
Set horizontal scaler's src offsets in context in sws_init_swScale().
...
Originally committed as revision 30081 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-20 16:21:25 +00:00
a8bcc7b42b
Document the differences between the two asm fragments in initMMX2HScaler().
...
Originally committed as revision 29978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-07 03:52:55 +00:00
75084e47ff
Start using intermediate buffers at index 0.
...
These index variables are incremented before each use, so they should be
initialized to -1.
Originally committed as revision 29977 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-06 22:01:25 +00:00
e470691aa8
Fix compilation with runtime cpu detection.
...
All functions in swscale_template.c should be declared with the RENAME macro.
Originally committed as revision 29976 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-05 09:44:19 +00:00
f415be684d
Add support for nv12/nv21 input.
...
Originally committed as revision 29974 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-12-03 18:18:13 +00:00
a9af75ae85
Make sws_format_name() use av_pix_fmt_descriptors.
...
This also introduces a dependency of libswscale on libavutil.
Originally committed as revision 29968 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-26 21:08:45 +00:00
bd381fd3f6
Add functions to return library license and library configuration.
...
Originally committed as revision 29932 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-18 17:16:02 +00:00
8cbcb1c732
Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable
...
hardware.
Original patch by NVIDIA corporation.
Originally committed as revision 29885 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-10 19:11:13 +00:00
b411dfff4c
Use enum PixelFormat instead of int for srcFormat and dstFormat.
...
Originally committed as revision 29857 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-08 23:31:43 +00:00
2e0a80a128
Document sws_freeContext().
...
Originally committed as revision 29844 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-11-07 09:23:11 +00:00
a520e9f235
Document slice ordering assumption done by sws_scale().
...
Originally committed as revision 29804 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-10-30 14:13:25 +00:00
53e5462040
Replace manual gcc version check by AV_GCC_VERSION_AT_LEAST macro.
...
Originally committed as revision 29701 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-22 14:38:49 +00:00
c866c7d041
Cleanup buffer debugs in swScale().
...
Originally committed as revision 29686 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-16 22:34:48 +00:00
953c821f9b
Use correct buffers in vertical scaler in unscaled YV12 case.
...
Originally committed as revision 29685 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-16 22:31:43 +00:00
749fac310c
Reset slice direction at end of each frame.
...
Originally committed as revision 29675 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-13 01:49:40 +00:00
9451b59fc6
Remove ; after while(0) in macros.
...
Originally committed as revision 29674 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-12 20:10:22 +00:00
30715d4273
Document that slices can be bottom to top or top to bottom.
...
Originally committed as revision 29665 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-09 21:43:25 +00:00
7d73d1c336
Indent.
...
Originally committed as revision 29654 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-07 16:29:32 +00:00
9cf484d06e
Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label
...
parameters.
Originally committed as revision 29652 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-06 00:07:35 +00:00
c2613a3137
Indent.
...
Originally committed as revision 29651 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-05 23:35:59 +00:00
991e579cae
Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
...
Patch by Lars Täuber <lars <dot> taeuber <at> gmx <dot> net>.
Originally committed as revision 29650 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-05 23:33:11 +00:00
67c2c5bb2e
Curly brackets cosmetics for previous commit.
...
Originally committed as revision 29587 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-29 23:08:32 +00:00
1ddb5747df
Check for return value of initFilter().
...
Originally committed as revision 29586 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-29 23:06:22 +00:00
dd653355fa
Revert mistakenly commited hunk.
...
Originally committed as revision 29585 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-29 23:03:14 +00:00
7248797c03
swscale: Check for return values of malloc.
...
Originally committed as revision 29584 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-29 23:02:01 +00:00
111641a97a
swscale-example: Free memory used by input data.
...
Originally committed as revision 29583 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-29 03:36:09 +00:00
0607b09069
Restore comment that was partially removed.
...
Originally committed as revision 29582 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-29 02:44:03 +00:00
89fb9516af
swscale-example: Rename src->ref so as to not confuse with src being used in doTest().
...
Originally committed as revision 29548 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-23 20:31:38 +00:00
7da35acdab
swscale-example: Use SWS_BILINEAR instead of hardcoded value.
...
Originally committed as revision 29547 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-23 20:29:49 +00:00
a48ce2c3a7
Fix inconsistent indentation.
...
Originally committed as revision 29545 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-22 19:30:19 +00:00
1b03a9d607
Check return values of sws_allocVec() and sws_getConstVec().
...
Originally committed as revision 29543 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-20 01:55:45 +00:00
64d39b7c76
Free initial swscale context, too. Avoids a valgrind warning.
...
Originally committed as revision 29538 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-19 08:21:55 +00:00
7b67bd92f4
Remove useless casts of malloc return value.
...
Originally committed as revision 29537 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-19 08:18:53 +00:00
1aff375d41
Introduce and use sws_allocVec().
...
Originally committed as revision 29536 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-19 01:33:17 +00:00
20484b90ec
Reuse sws_getConstVec() where possible.
...
Originally committed as revision 29535 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-19 01:32:06 +00:00
6b052ba88f
swscale-example: Make selection of dstW, dstH, and flags more clear.
...
Originally committed as revision 29527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-17 02:06:00 +00:00
c255994b29
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".
Originally committed as revision 29524 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16 21:37:07 +00:00
dd68318cee
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.
Originally committed as revision 29523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16 21:11:28 +00:00
Stefano Sabatini
Alexis Ballier
Ramiro Polla
Zuxy Meng
Måns Rullgård
David Conrad
Reimar Döffinger
Diego Biurrun
NVIDIA Corporation
Carl Eugen Hoyos
Lars Täuber