Commit Graph

53 Commits

Author SHA1 Message Date
tateu
93c28a55fd Fix runtime CPU detection in libswscale. 2011-04-27 01:52:36 +02:00
Michael Niedermayer
c55780dcef Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
  libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
  libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
  libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
  libvo-*: Fix up the long codec names
  libavcodec: Mark AVCodec->priv_class const
  swscale: Factorize FAST_BGR2YV12 definition.
  libvo-aacenc: Only produce extradata if the global header flag is set
  lavf: postpone removal of public metadata conversion API
  lavc: postpone removal of request_channels
  lavc: postpone removal of audioconvert and sample_fmt wrappers
  lavf: postpone removal of deprecated avio functions
  libopencore-amr: Cosmetics: Rewrap and align
  libopencore-amr, libvo-amrbwenc: Rename variables and functions
  libopencore-amr: Convert commented out debug logging into av_dlog
  libopencore-amr: Remove an unused state variable
  libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
  libopencore-amr: Remove a useless local variable
  libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
  libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
  libopencore-amr: Don't print carriage returns in log messages
  ...

Conflicts:
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/libvo-aacenc.c
	libavcodec/libvo-amrwbenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-14 03:21:38 +02:00
Luca Barbato
0e1a5434e2 swscale: Factorize FAST_BGR2YV12 definition.
It is used only for x86 so it will eventually be moved with that code
into the x86 arch subdirectory.
2011-04-13 17:24:53 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Ramiro Polla
c12f7b2d2c rgb2rgb: don't misuse HAVE_* defines
Introduce and use COMPILE_TEMPLATE_* instead.

Originally committed as revision 32241 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-14 13:12:11 +00:00
Ramiro Polla
6527e56131 swscale: avoid reading prior to the source buffer in planar2x() MMX2
Originally committed as revision 32221 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-13 14:25:18 +00:00
Ramiro Polla
a51125b52f rgb2rgb: replace shuffle_bytes_2103() by optimized rgb32tobgr32()
Originally committed as revision 32190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-12 13:03:41 +00:00
Ramiro Polla
539ff40c2d rgb2rgb: build SSE2 codepath
Originally committed as revision 32068 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-09-08 13:16:15 +00:00
Måns Rullgård
6a01eab73c Add av_ prefix to bswap macros
Originally committed as revision 31679 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-07-10 22:12:38 +00:00
Reinhard Tartler
2b991422f8 deprecate palette8topacked32 in favor of public API functions sws_convertPalette8ToPacked32 and -24
additionallym deprecate palette8torgb16 and its bgr variant without
replacement. These functions are not meant to be used by applications.

Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340

Originally committed as revision 31301 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-06-01 19:35:16 +00:00
Reinhard Tartler
3d9408f4a7 remove palette8torgb15 and palette8tobgr15
They contain exactly the same code as their 16bit variants, so this is
effectively code de-duplication.

Originally committed as revision 31298 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-06-01 06:53:56 +00:00
Diego Biurrun
819ee683d8 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.

Originally committed as revision 30965 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-03-27 11:31:02 +00:00
Stefano Sabatini
82e5f86bd5 Implement shuffle_bytes_abcd() functions and use them for shuffling
bytes when converting between RGB32 variants.

In particular fix the argb -> rgba and abgr -> bgra conversions.

See the thread:
Subject: [FFmpeg-devel] [RFC] RGB32 / BGR32 ethernal bug
Date: Tue, 26 Jan 2010 01:06:18 +0100

Originally committed as revision 30501 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-02-03 23:46:00 +00:00
Zuxy Meng
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
Ramiro Polla
7d73d1c336 Indent.
Originally committed as revision 29654 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-09-07 16:29:32 +00:00
Ramiro Polla
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
Ramiro Polla
9b734d44ab 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".

Originally committed as revision 29522 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16 00:32:04 +00:00
Måns Rullgård
a898cdc995 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
Originally committed as revision 29439 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-07-26 12:26:32 +00:00
Michael Niedermayer
0411072ee3 Unscaled converters for
YUYV->YUV420P
YUYV->YUV422P
UYVY->YUV420P
UYVY->YUV422P

Originally committed as revision 28997 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-19 03:45:29 +00:00
Cédric Schieli
f8a138be52 When converting from a non alpha format to an alpha format, defaults
Originally committed as revision 28756 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-28 08:01:52 +00:00
Diego Biurrun
f4406ec177 HAVE_3DNOW --> HAVE_AMD3DNOW to sync with latest configure changes.
Originally committed as revision 28358 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-01-25 19:58:33 +00:00
Aurelien Jacobs
b63f641e9b Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 28311 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-01-14 00:13:56 +00:00
Diego Biurrun
1599c47ce3 Remove commented-out duplicate declarations.
Originally committed as revision 28058 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-12-02 00:26:14 +00:00
Diego Biurrun
2ef8819c9a Remove unused declarations.
Originally committed as revision 28057 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-12-02 00:21:37 +00:00
Vitor Sessak
522ce95786 Fix broken palette8to*.
Originally committed as revision 27817 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-10-23 19:13:11 +00:00
Baptiste Coudurier
a6100f39a1 enable yuv422p to uyvy converter
Originally committed as revision 27527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-05 00:25:39 +00:00
Michael Niedermayer
7372e9bbe5 Fix 4 of the unscaled rgb15/16 converters, each of these contained
2-3 bugs each of which made it fail completely, this code clearly
has never been tested and been written by somone who knows the
difference between a potato and a computer is that the first is round.

Originally committed as revision 27519 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 19:49:13 +00:00
Michael Niedermayer
6107059c2c rgb vs bgr fix for the unscaled converters.
Originally committed as revision 27518 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 19:11:39 +00:00
Diego Biurrun
8a3227968c spelling/grammar/wording overhaul
Originally committed as revision 27190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-07-04 13:49:45 +00:00
Baptiste Coudurier
72d6b61074 remove useless casts
Originally committed as revision 26944 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-06-01 03:25:07 +00:00
Baptiste Coudurier
774c386a10 add const, suppress warnings
Originally committed as revision 26943 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-06-01 03:23:50 +00:00
Diego Biurrun
83da2c6f26 Use full path for #includes from another directory.
Originally committed as revision 26702 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-05-09 12:00:25 +00:00
Reimar Döffinger
5802683a97 Make some assembler constants global instead of declaring them multiple times.
Originally committed as revision 25910 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-29 14:58:10 +00:00
Reimar Döffinger
d334c7c237 Use DECLARE_ASM_CONST where possible in libswscale code
Originally committed as revision 25903 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-28 14:38:11 +00:00
Benoit Fouet
30c48a0af4 Cosmetics: whitespaces
Originally committed as revision 25778 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-17 10:24:14 +00:00
Diego Biurrun
b19bcbaa78 license header consistency cosmetics
Originally committed as revision 23722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-05 10:18:58 +00:00
Diego Biurrun
4d7b302c0d Remove redundant fastmemcpy.h #include, it is indirectly #included by avutil.h.
Originally committed as revision 23400 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-28 09:30:56 +00:00
Diego Biurrun
6e42e6c4b4 cosmetics attack, part I: Remove all tabs and prettyprint/reindent the code.
Originally committed as revision 23158 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-28 11:44:49 +00:00
Diego Biurrun
6a4970abd1 cosmetics: Remove trailing whitespace.
Originally committed as revision 23147 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-26 23:07:11 +00:00
Ivo van Poorten
19b202f9d1 fix red_15mask and green_15mask. the previous values were wrong and caused
some SIMD functions to output wrong data.

Originally committed as revision 23021 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-18 16:40:07 +00:00
Ivo van Poorten
ea70817379 cosmetics after last commit; remove superfluous braces
Originally committed as revision 22979 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-11 22:17:58 +00:00
Ivo van Poorten
df170b81d9 Remove code duplication in sws_rgb2rgb_init.
The lists of assignments of all rgbxtoy variants are removed from
sws_rgb2rgb_init and replaced by a single list inside the template file.
This way, multiple lists are generated by the preprocessor and each list
gets its own initialization function. Those are called from the main
sws_rgb2rgb_init function, if applicable.

Originally committed as revision 22978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-11 21:00:25 +00:00
Diego Biurrun
10ef990d96 cosmetics: typo pallete --> palette
Originally committed as revision 21892 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-13 04:32:14 +00:00
Luca Abeni
9bde778e73 Allow to compile swscale's non-SIMD code under the LGPL license.
Since mplayer always define CONFIG_GPL, this commit should not change
anything for mplayer.

Originally committed as revision 21699 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-20 13:09:29 +00:00
Luca Abeni
807e0c6645 Clarify that some of the non-SIMD code is now LGPLed.
All the authours of such code agreed.

Originally committed as revision 21045 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-19 10:38:12 +00:00
Diego Biurrun
3d6a30d948 Use common define for x86_32 and x86_64.
Originally committed as revision 20592 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-01 18:36:20 +00:00
Diego Biurrun
d026b45e73 Change license headers to say 'FFmpeg' instead of 'this program'.
Originally committed as revision 20100 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-07 15:33:14 +00:00
Diego Biurrun
4fadc2b4f1 Add official GPL header to make license explicit as discussed on ffmpeg-devel.
Originally committed as revision 19709 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-06 10:24:19 +00:00
Diego Biurrun
49a0122c99 Fix compilation with MMX disabled, the mmx_null and mmx_one constants don't need to
be protected by HAVE_MMX.

Originally committed as revision 19367 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-11 12:50:14 +00:00
Diego Biurrun
dbdae6ec54 Do not assemble MMX, MMX2 or 3DNOW code unconditionally on X86 and X86_64.
Originally committed as revision 19339 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-05 10:00:54 +00:00