1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Commit Graph

29749 Commits

Author SHA1 Message Date
Grigori Goronzy
f394231f5d Use light autohinting by default in libass
FreeType's native hinter causes rendering errors with many fonts,
especially with broken fonts that unfortunately tend to be used a
lot with SSA/ASS subtitles.  Use the light autohinter for unscaled
OSD by default to avoid these problems.
2009-08-07 00:13:39 +03:00
Grigori Goronzy
1e98ef7789 Change type names to match upstream libass 2009-08-07 00:13:33 +03:00
Uoti Urpala
4a36b51ea6 Merge svn changes up to r29455 2009-07-29 01:32:03 +03:00
Uoti Urpala
c73217c07a Change libass type names to match upstream renames 2009-07-29 01:11:33 +03:00
uau
45b7b9374b stream/realrtsp/real.c: Fix another integer overflow
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29455 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 16:25:03 +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
eugeni
9cd56d5e40 Fix stupid, off-by-one, mistakes in assert() expressions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29448 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-27 19:39:23 +00:00
uau
4dc235eb7c stream/realrtsp/real.c: Fix integer overflow
Pointed-out-by: tixxDZ <tixxdz at gmail dot com> - DZCORE Labs, Algeria


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29447 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-27 16:53:48 +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
Uoti Urpala
29bc25b6d4 configure: Drop "_so" naming for FFmpeg libraries
Externally-compiled libraries are now the only option so change the
options and variables to use the library name only without "_so" or
"_a" suffix. The previous naming was also confusing because the "_so"
libraries could actually be static.
2009-07-27 02:49:33 +03:00
diego
e5751ced4f Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 19:53:00 +00:00
diego
c242fdbfd9 Make diff apply cleanly to our tree again.
The GPL modification notices were dropped, same as for the other diffs we store.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29442 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 19:38:22 +00:00
diego
f9dcd2a235 Set both HAVE_BIGENDIAN and WORDS_BIGENDIAN.
Both definitions are used in different places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29441 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 17:43:06 +00:00
Uoti Urpala
152e480397 vf_uspp: Mark as depending on avcodec API only, not internals
There has been some confusion about whether this filter depends on
libavcodec internals or not. When originally added it included
explicit code to support building with a shared library avcodec, but
it also used the internal dsputil.h header. Later it was marked as
depending on libavcodec internals, then the dsputil.h include was
removed as unnecessary. It seems to build fine without any internal
headers now and has no obvious other usage of internal symbols either,
so I'm enabling the build whenever libavcodec is available.
2009-07-26 20:22:48 +03:00
Uoti Urpala
a92a43b91f build: Readd support for code depending on FFmpeg internals
Add configure option --ffmpeg-source-dir=PATH. If the user specifies
this option then building code that depends on FFmpeg internals is
enabled and the files files which use internal lavf headers will get
them from this path. The FFmpeg libraries linked with must export
needed internal symbols.
2009-07-26 20:22:48 +03:00
Uoti Urpala
dddd7c62c5 vf_pp: Remove deprecated "hex mode" support
Remove code to support specifying arguments in hex form. This code
depended on libpostproc internals, and has been deprecated and
undocumented for years.
2009-07-26 20:22:48 +03:00
Uoti Urpala
78ea550f0f build: Remove code for internal FFmpeg build
Remove some now unnecessary parts that were used for the internal
FFmpeg build, mainly configure tests for FFmpeg features and Makefile
logic for building it.
2009-07-26 20:22:48 +03:00
Uoti Urpala
4ab6e16888 configure: Make multiple --extra-cflags/ldflags additive
This change makes it easier to pass those flags from a build script
while still allowing the user to specify additional flags too.
2009-07-26 20:22:48 +03:00
Uoti Urpala
546c3fb53c Remove internal libass tree
Remove the libass/ directory and use the newest standalone version of
the library instead.
2009-07-26 20:22:43 +03:00
cehoyos
06c122f001 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29440 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 14:40:05 +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
Uoti Urpala
6fbcf16cfb configure: Compile with -O2 instead of -O4
-O4 (which GCC interprets the same as -O3) gives no consistent
performance advantage, being significantly worse than -O2 sometimes.
-O2 gives faster compilation and smaller binary.
2009-07-26 06:16:52 +03:00
Uoti Urpala
9ce0838ffd Use own mp_*_taglists code instead of libavformat internals
Use the version of code under ffmpeg_files/ instead of relying on
libavformat source files to be available.
2009-07-26 06:16:52 +03:00
Uoti Urpala
cd4e8dc1fa Disable functionality requiring libswscale internals
The following are affected: vo_yuv4mpeg, vf_halfpack, vf_palette,
vf_rgb2bgr, vf_yuy2, vo_mga, vo_xmga. In vo_yuv4mpeg, only disable
RGB support (which is probably little used). Others are disabled
completely for now.

vo_mga and vo_xmga are disabled by preventing configure from enabling
them. The rest is placed under LIBSWSCALE_INTERNALS variable which
isn't currently enabled anywhere.
2009-07-26 06:16:52 +03:00
Uoti Urpala
d6c410b54c Replace libavutil internal header #includes with MPlayer copies
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
2009-07-26 06:16:43 +03:00
Uoti Urpala
a810867d04 configure: Improve pkg-config tests for FFmpeg libraries
Tests for libavcodec, libavformat, libavutil and libswscale used the
CFLAGS from pkg-config in a test compile but did not add them to the
flags used during the main build, so the compiler could fail to find
the headers then. Add the flags to the commands used during the main
build too. libpostproc had no pkg-config test at all. Add one.
2009-07-26 06:15:30 +03:00
Uoti Urpala
a009d56d4d Add copies of needed internal FFmpeg files under ffmpeg_files/
MPlayer used to depend on having an FFmpeg tree available at build
time to provide this code, and FFmpeg changes occasionally broke
the MPlayer build as a result. Some of the relevant functionality also
depends on FFmpeg library symbols that are not part of the FFmpeg API,
meaning that library changes could break MPlayer after the build. Add
a copy of the relevant functionality to the MPlayer tree and use that
instead.

The added files are:
- The headers bswap.h, intreadwrite.h and x86_cpu.h from libavutil.
  Some MPlayer code uses the functionality defined as macros and
  static inline functions in these headers.
- Architecture-specific internal files used by the above headers.
  These are in the subdirectories: x86/, arm/, bfin/, sh4/.
- taglists.[ch], which provides the codec tables from
  libavformat/riff.c and two functions to access them from
  libavformat/utils.c.

Most of the headers are copied from FFmpeg revision 19452 with only
the include guard names changed. A "common.h" include in bswap.h was
changed to "libavutil/common.h" as it should use the installed header.
Taglists.c contains snippets from the relevant files with some
changes like renamed identifiers.
2009-07-26 06:15:30 +03:00
Uoti Urpala
97bd0624df Remove libswscale directory in MPlayer sources
libswscale will be used through FFmpeg.
2009-07-26 06:15:30 +03:00
Uoti Urpala
d1a54d5696 Remove unnecessary libavutil/internal.h includes
These includes were added earlier after the definition of the
DECLARE_ALIGNED and DECLARE_ASM_CONST macros were moved to this
header in FFmpeg. However now those macros are again in the public
mem.h header, and there is no need to include internal.h.
2009-07-26 06:15:19 +03:00
cladisch
de3d544c43 Use the correct OSS format, where possible, for mplayer's packed 24-bit
format (AFMT_x24_xE would be 32-bit aligned).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29438 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-24 10:35:22 +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
ptt
b1666a747d grammar and sentence fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29436 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-22 19:32:17 +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
cladisch
dc8bb7837a Use correct ALSA sample format for 24-bit samples packed in three bytes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29434 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-21 08:20:22 +00:00
diego
4593633f58 Bandaid compilation fix: Disable ivtv VIDIX driver until a proper test exists.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29433 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 21:24:45 +00:00
diego
bcd7541f4e The Makefile variable names for external libraries in FFmpeg changed.
Adapt their names in config.mak, closes Bugzilla #1513.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29432 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 21:09:00 +00:00
diego
b91c49e4b0 Move some variable declarations up to avoid the warnings:
vidix/ivtv_vid.c: In function 'ivtv_probe':
vidix/ivtv_vid.c:305: warning: ISO C90 forbids mixed declarations and code
vidix/ivtv_vid.c: In function 'ivtv_query_fourcc':
vidix/ivtv_vid.c:405: warning: ISO C90 forbids mixed declarations and code


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29431 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 20:59:32 +00:00
diego
944f7811c5 Remove redundant ivtv VIDIX driver variable declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29430 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 17:05:42 +00:00
diego
e696ba4ba0 The ivtv vo driver and the ivtv VIDIX driver are unrelated; do not disable the
VIDIX driver when the ivtv vo driver has been disabled.
patch by Martin Dauskardt, martin.dauskardt gmx de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29429 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 17:03:28 +00:00
iive
968a51cfef Handle 24bit audio formats natively by ALSA.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29428 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 10:26:48 +00:00
iive
f6c25fd5c5 Fix 24bit audio playback.
The reordering channels code had reoccurring bug
where in switch(samplesize) block the
case 3 (3 bytes) doesn't end with break;
leading to execution of the next case 4 too.
This mangles the already processed data and
causes massive memory corruption.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29427 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-19 09:55:29 +00:00
diego
e2ae312a37 Change libamr support to libopencore-amr support.
libamr support was removed from FFmpeg.
based on a patch by Andrew Wason, rectalogic rectalogic com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29426 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-18 15:07:26 +00:00
eugeni
bad51c711f Make sure clip coordinates are inside the screen area.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29425 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-18 11:33:03 +00:00