Commit Graph

751 Commits

Author SHA1 Message Date
wm4 d080d1d39a command: export VO video width/height as properties
Add new properties "dwidth" and "dheight", which contain the video
size as known by the VO (not necessarily what the VO makes out of them,
i.e. without window scaling and panscan).
2013-03-26 01:29:53 +01:00
wm4 42b47624f8 demux_mkv: support V_UNCOMPRESSED video tracks
Tested with a sample generated by: ffmpeg -i in.mkv -an -vcodec rawvideo out.mkv

Also add proper dependencies for the Matroska Perl stuff in Makefile.
2013-01-24 17:45:13 +01:00
kax4 13bc19d880 osxbundle: fix unicode support in fonts.conf
Looks like unicode support was broken with this simple `fonts.conf`. Copy more
(all) of fontconfig's default `fonts.conf`.

Fixes #13

Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
2013-01-07 21:09:11 +01:00
Stefano Pigozzi 51c98619c8 osxbundle: print meaningful error when a dylib is missing
If one of the bundled libraries is pointing to a missing dylib stop the
bundling and exit with an error. This can happen if the user uninstalled a
dependency after he built the binary/libraries.
2012-12-16 10:56:25 +01:00
Stefano Pigozzi 4c95f545d3 osxbundle: add fonts.conf to distributed bundle
The osxbundle target creates a bundle that is supposed to be distributable
to third parties. As they may not have fontconfig installed they miss a
fonts.conf pointing to the usual fonts directories in OSX.

For people installing from source and using from the terminal this commit
changes nothing. You just have to make sure that your fontconfig is installed
with a sane configuration (XQuartz does). If you are installing fontconfig from
source you can force a sane OSX default using `--with-add-fonts`. For example:

  `./configure --with-add-fonts=/Library/Fonts,~/Library/Fonts`

Homebrew already addressed this with mxcl/homebrew@b242883
2012-12-15 17:38:00 +01:00
wm4 7087fc50fc TOOLS: remove checktree.sh
Nice idea, but essentially useless. Unmaintained even in mplayer-svn.

Remove broken remains of the checkheaders target too.
2012-11-14 11:26:43 +01:00
Rudolf Polzer bd48deba77 mpv_identify: stop using \n; fix property name handling
Dashes are not valid in shell variable names. This changes them to
underscores.
2012-11-12 17:54:45 +01:00
Kovensky fae7307931 Port several python scripts to Perl
file2string.pl and vdpau_functions.pl are direct ports.
matroska.py was reimplemented as the Parse::Matroska module in CPAN,
and matroska.pl was made a client of Parse::Matroska.
A copy of Parse::Matroska is included in TOOLS/lib, and matroska.pl
looks there first when trying to load the module.

osxbundle.py was not ported since I have no means to verify it.
Python is always available on OSX though, so there is no harm in
removing the check for it on configure.
2012-11-08 00:28:59 +01:00
Stefano Pigozzi a20c9576be osxbundle: run install_name_tool -id only on direct dependencies
It looks like that only `install_name_tool -change` must be applied
recursively. This allows to bundle up all our stuff without thinkering with
the Mach-O headerpad size (which could even be impossible for libraries we
don't compile and link ourselves).
2012-11-06 00:06:16 +01:00
Stefano Pigozzi c4f68de145 TOOLS: add script for osx bundle generation
Add a make task and python script to create a Mac OS X Application Bundle
to be used when compiling with the --enable-macosx-finder and
--enable-macosx-bundle configure flags.

The main svg icon was created by me and heavily inspired by Apple's iTunes
and AppStore icon designs. We are still looking for something better.
For the audio, movie and subtitles icons I added the main logo to MPlayer OSX
Extended icons.

Use with `make osxbundle` after running configure and make.
2012-10-16 07:15:12 +02:00
wm4 85d185441a Merge branch 'input_changes' into master
Conflicts:
	DOCS/man/en/vo.rst
	etc/input.conf
	input/input.c
	m_property.c
2012-10-12 11:53:53 +02:00
wm4 65fc530f0c Rename to "mpv"
This changes the name of this project to mpv. Most user-visible mentions
of "MPlayer" and "mplayer" are changed to "mpv". The binary name and the
default config file location are changed as well.

The new default config file location is: ~/.mpv/

Remove etc/mplayer.desktop. Apparently this was for the MPlayer GUI,
which has been removed from mplayer2 ages ago.

We don't have a logo, and the MS Windows resource files sort-of require
one, so leave etc/mplayer.ico/.xpm as-is.

Remove the debian and rpm packaging scripts. These contained outdated
dependencies and likely were more harmful than useful. (Patches which
add working and well-tested packaging are welcome.)
2012-10-12 10:14:32 +02:00
wm4 a2adb6b333 TOOLS/mplayer2_identify.sh: program property is not readable
And it never was. This property is write-only and exists only for
setting the program. Making it readable is possible, but would require
demuxer changes.
2012-10-12 10:10:32 +02:00
wm4 4e2fab5846 commands: rename properties, update input.conf
Use "-" instead of "_" in property names. The intent is that property
names and options names should be the same (if they refer to the same
thing), and options use "-" as word separator.

Rename some other properties too, e.g. "switch_audio" -> "audio".

Add a way to translate the old property names to the new ones, similar
to the input command legacy bridge.

Update input.conf. Use the new property names, and don't use legacy
commands.
2012-10-12 10:10:30 +02:00
Kovensky f9f6ded36c Fix string.format compatibility with Python 2.6 2012-10-01 14:28:29 +02:00
wm4 6fb0e6bf1c build: use "python" instead of "python3" as interpreter name
This works regardless whether "python" starts a Python 2 or Python 3
interpreter.
2012-09-29 16:22:01 +02:00
wm4 0ee09dcdbe build: make Python scripts compatible with Python 2.x
They were originally written for Python 3.x. Changing them to work on
Python 2.x as well is trivial. Tested with Python 2.7.3 and 3.2.3.
2012-09-29 15:53:54 +02:00
Rudolf Polzer c22482e08d TOOLS: fix first frame pts for dlopen/telecine.so
When the first frame of a telecine pattern did not generate an output
frame (because it is a 0 or a 1), this could lead to the first two
output frames getting equal pts values.

When the first frame of a telecine pattern generates exactly one output
frame (i.e. when the telecine pattern starts with 2 or 3), then the
output was correct before this comment, and still is unchanged.

When the first frame of a telecine pattern generates more than one
output frame (i.e. when it starts with 4 to 9), then output pts are
still broken. This is not really solvable without knowing the frame
duration, or delaying output by one frame.
2012-09-28 13:43:59 +02:00
Rudolf Polzer 5617bf483e TOOLS: add a new file identifier tool
It can provide properties of a file to the user on stdout, or when sourced by a
script, put them into its variables.
2012-09-18 21:08:20 +02:00
Rudolf Polzer 6371787b89 vf_dlopen: vf_rectangle filter moved to dlopen (unix only)
It is unix only, because vf_dlopen filters have no way to receive input (yet)
2012-09-18 21:08:20 +02:00
Rudolf Polzer 9343c1d3ab vf_dlopen: improve performance for 1-frame-for-1-frame filters
This is done by requesting a buffer from the next filter in the chain, instead
of always allocating our own. This allows the next filter to e.g. ensure its
own preferred memory layout.
2012-09-18 21:08:20 +02:00
Rudolf Polzer 2adc81f0a2 vf_dlopen: add a generic filter to load external filters
Usage: -vf dlopen=filename.so:args...

Examples of such filters are provided in TOOLS/vf_dlopen/
2012-08-23 13:13:53 +02:00
wm4 5b39a8255e TOOLS/uncrustify.cfg: add uncrustify profile for code reformatting
There is lots of badly and inconsistently formatted code left, which
leaves us with the frequent need for cleaning up. This uncrustify
profile can be used for automatic reformatting. The author of this file
is (perhaps) uau.

It's different from mplayer-svn's TOOLS/mp-uncrustify-style.cfg. The
differences and origins of these files are unclear, but the file added
with this commit is probably more consistent with the heavily cleaned
up areas of mplayer2 and this fork.
2012-08-06 19:17:21 +02:00
wm4 1ee740cceb TOOLS/fil2string.py: fix for use with binary files
The script was written to be able to deal with binary files, but it had
a bug corrupting some data: e.g. a byte sequence 0x1 0x37 was printed as
"\17" (0x1 = escaped as "\1", and 0x37 = kept as literal "7"), which
would be interpreted as single character 0xF.

Always pad octal literals to length 3, which makes the escape sequences
unambiguous.
2012-07-28 23:36:08 +02:00
wm4 6dc1249625 TOOLS: remove useless crap
Most of the scripts in TOOLS seem entirely useless. Remove them.
There were about 3 types of scripts:
- apparent developer tools (like file format dumpers, benchmarks)
  => I doubt any mplayer developer still alive even uses these
- helpers for encoding or ripping stuff
  => mencoder is gone, at least from this version of mplayer
- helpers meant for users (launching mplayer in weird ways, etc.)
  => just no, it will cause you more pain than gain
So no, there is nothing useful.

Under the scripts not deleted, these are needed for building mplayer:
  file2string.py
  matroska.py
  vdpau_functions.py
These might have _some_ use (but still questionable):
  binary_codecs.sh
  checktree.sh
2012-07-28 20:44:58 +02:00
wm4 7d4576cf79 Remove TOOLS/realcodecs
I have no idea what these are about, but it's probably useless outdated
crap. According to TOOLS/README, they are wrappers around
some Real binary codecs. They were added in 2003, and never touched
again (except for cosmetic changes).
2012-07-28 20:44:25 +02:00
Uoti Urpala 2ba8b91a97 build, codec-cfg.c: simplify builtin codecs.conf handling
The player can read codec mapping (codecs.conf) from an external file
or use embedded defaults. Before, the defaults were stored in the
player binary in the form of final already-parsed data structures.
Simplify things by storing the text of the codecs.conf file instead,
and parse that at runtime the same way an external file would be
parsed.

To create the previous parsed form, the build system first compiled a
separate binary named "codec-cfg", which parsed etc/codecs.conf and
then wrote the results as a C data structure that could be compiled
into the program. The new simple conversion of codecs.conf into a C
string is handled by the new script TOOLS/file2string.py.

After removing the codec-cfg binary, HOST_CC is no longer used for
anything. Remove the --host-cc configure option and associated logic.

Also remove the codec2html and codec-cfg-test functionality. Building
those was already broken and nobody cared.

There was a broken 3-character-long "fourcc" entry in etc/codecs.conf.
This happened to be accepted before but triggered a parse error after
the changes. Remove the broken entry and make the parsing functions
explicitly test for this error.
2012-07-16 21:08:42 +03:00
Uoti Urpala 39a45c7a17 build: use python3 to generate some files previously in git
Some files used during build are generated with Python scripts in
TOOLS/. Before, the generated files were included in the git tree.
Start creating them at build time. This introduces a build-dependency
on python3.

The files in question are:
libvo/vdpau_template.c
libmpdemux/ebml_types.h
libmpdemux/ebml_defs.c
2012-07-16 21:08:42 +03:00
wm4 0440460d0c vo_vdpau: implement screenshots 2011-11-25 23:56:28 +02:00
Uoti Urpala f06fe7f80e TOOLS/matroska.py: recognize CodecName 2011-04-08 01:20:35 +03:00
siretart 65cc2366a3 TOOLS/: minor fixes in tool code
Fix printf format string warning

fixes this warning:
asfinfo.c: In function 'print_video_header':
asfinfo.c:158: warning: format '%.4s' expects type 'char *', but argument 3 has type 'long int *'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32774 b3059339-0415-0410-9bf9-f77b7e298cf2

add missing fclose

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32775 b3059339-0415-0410-9bf9-f77b7e298cf2

add missing fclose()

found by cppcheck:
[avisubdump.c:199]: (error) Resource leak: f

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32776 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
Uoti Urpala f50f34245e Merge branch 'sub'
* sub:
  sub/OSD: move some related files to sub/
  subtitles: options: enable -ass by default
  subtitles: change default libass rendering style
  demux_mkv, chapters: change millisecond arithmetic to ns
  cleanup: rename ass_* functions to mp_ass_*
  subs: use correct font aspect ratio for libass + converted subs
  cleanup: some random minor code simplification and cleanup
  vf_vo: fix EOSD change detection bug
  sd_ass: remove subreader use, support plaintext markup
  subtitles: style support for common SubRip tags and MicroDVD
  core: ordered chapters: fix bad subtitle parameter
  subs/demux: don't try to enable sub track when creating it
  subtitles/demux: store duration instead of endpts in demux packets
  subtitles: add framework for subtitle decoders
  options: add special -leak-report option
  subtitles: remove code trying to handle text subs with libavcodec
  cleanup: move MP_NOPTS_VALUE definition to mpcommon.h
  subtitles: move global ass_track to struct osd_state
  core: move most mpcommon.c contents to mplayer.c
  core: move global "subdata" and "vo_sub_last" to mpctx
  subtitles: remove sub_last_pts hack
  options: move -noconfig to option struct, simplify
2011-01-26 20:42:15 +02:00
Uoti Urpala c9026cb321 sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
Clément Bœsch 3a7b071517 TOOLS: Remove most of the mencoder scripts and references 2011-01-25 03:15:26 +02:00
Uoti Urpala 5a3edf4c07 TOOLS/matroska.py: recognize 3 more elements
Add definitions for DisplayUnit, OutputSamplingFrequency and
FileDescription in matroska.py. Regenerate the C template files to
allow using all current definitions in code.
2010-11-21 14:20:38 +02:00
cboesch fe3c4810e1 cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 13:11:20 +02:00
Uoti Urpala 259ab1fe2d TOOLS/matroska.py: recognize MaxCache element 2010-11-08 18:05:12 +02:00
siretart c1515ae3aa TOOLS/binary_codecs.sh: make indentation consistent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32561 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:47:32 +02:00
Uoti Urpala 3a1f89810f TOOLS/matroska.py: stop cleanly at EOF of complete file when parsing
When using the script to parse a Matroska file, the script used to
exit with an exception at EOF. Change it to exit quietly instead if
the file was parsed successfully. Keep showing an exception if EOF is
encountered in the middle of an element (truncated file).
2010-11-02 04:18:37 +02:00
Uoti Urpala 49096c7ae2 TOOLS/matroska.py: change to python3 syntax 2010-11-02 04:18:37 +02:00
siretart 79347eaedb TOOLS/binary_codecs.sh: avoid creating fake "bestsites"
Do not create a fake 'bestsites' if neither 'fping' nor 'netselect' is
installed.

change developed by A Mennucc <mennucc1 [at] debian [dot] org>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32485 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
siretart b1f187eb48 TOOLS/binary_codecs.sh: fix obsolete dpkg syntax
Use 'dpkg --print-architecture', the option
--print-installation-architecture is deprecated.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32484 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
diego b1013d34ad TOOLS/subrip: fix linking failure
Work around linking failure due to unresolved reference to mplayer_version.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32328 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
reimar fe6c4fcae2 cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)
Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace some sizeof(type) by sizeof(*pointer)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizoef(type) by sizeof(*ptrvar).
Besides being consistent with FFmpeg style,
this reduces the size of a patch to rename these
types to not conflict with the windows.h definitions.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(type) by sizeof(*ptrvar)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove a useless cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(type)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove a useless cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace several sizeof(WAVEFORMATEX)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace one more instance of sizeof(WAVEFORMATEX); fix compilation.
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid some pointless uses of sizeof() and one related cast.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge one malloc() + memset() invocation into calloc().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(WAVEFORMATEX) occurrences.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace malloc+memset by calloc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2

Replace sizeof(BITMAPINFOHEADER)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego 713284ea26 build: Rename configure.log file to config.log
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31415 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:08:56 +02:00
Uoti Urpala 7a190c461b TOOLS/matroska.py: recognize ChapCountry 2010-10-21 21:47:12 +03:00
Anton Khirnov de42015a97 demux_mkv: read tags. 2010-05-22 06:40:34 +03:00
Uoti Urpala cbc6eabb9f TOOLS/matroska.py: support 8-byte floats in parsing mode
Support parsing and printing the value of 8-byte floats when using the
script to parse and display contents of Matroska files.
2010-03-11 23:42:20 +02:00
Uoti Urpala e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala 90f5873f1a Merge svn changes up to r30675 2010-03-10 00:47:25 +02:00
Uoti Urpala 13221a7165 Merge svn changes up to r30663
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02:00
diego b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
attila fad137d7fe mention that on windows, you've to use the netstream.exe to build the
netstream binary


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30743 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 12:49:49 +00:00
diego 8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:02:49 +00:00
diego 8990266157 TOOLS/realcodecs: Remove pointless '#if 1' preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30652 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 09:46:31 +00:00
diego ce3ffd4292 Add standard license header to C tools missing them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30458 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 13:35:03 +00:00
Uoti Urpala c710c5ee50 Merge branch 'matroska' 2010-01-28 00:56:26 +02:00
Uoti Urpala 5f631d1c08 matroska: add new parsing code
Add a new EBML parser implementation that should allow significant
improvements to the Matroska demuxer. The new parsing code is not
actually used yet by the demuxer. The only changes to existing code in
this commit are to generate the MATROSKA_ID_* / EBML_ID_* macro
definitions from the new implementation and to rename some of them
(the new implementation uses names matching the official Matroska spec).

The main parser implementation is added in ebml.c. There are two new
generated files, ebml_defs.c and ebml_types.h, that contain
definitions of EBML elements. Those are generated by the new script
TOOLS/matroska.py. There's a new Makefile target "generated_ebml" that
run the script to refresh the content of the generated files.
2010-01-27 14:26:43 +02:00
Uoti Urpala e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
compn a30dbabd9f clean up netstream docs in TOOLS/README
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30406 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 15:41:58 +00:00
Uoti Urpala 14bb3416c7 vo_vdpau: Add support for high-quality scaling feature
Part of the code is currently under #ifdef to allow compilation with
older VDPAU library versions; that can be removed later.

Partially based on a patch by Carl Eugen Hoyos.
2009-11-15 18:39:48 +02:00
Uoti Urpala 201bef7ee1 Implement vsync-aware frame timing for VDPAU
Main things added are custom frame dropping for VDPAU to work around
the display FPS limit, frame timing adjustment to avoid jitter when
video frame times keep falling near vsyncs, and use of VDPAU's timing
feature to keep one future frame queued in advance.

NVIDIA's VDPAU implementation refuses to change the displayed frame
more than once per vsync. This set a limit on how much video could be
sped up, and caused problems for nearly all videos on low-FPS video
projectors (playing 24 FPS video on a 24 FPS projector would not work
reliably as MPlayer may need to slightly speed up the video for AV
sync). This commit adds a framedrop mechanism that drops some frames
so that no more than one is sent for display per vsync. The code
tries to select the dropped frames smartly, selecting the best one to
show for each vsync. Because of the timing features needed the drop
functionality currently does not work if the correct-pts option is
disabled.

The code also adjusts frame timing slightly to avoid jitter. If you
for example play 24 FPS video content on a 72 FPS display then
normally a frame would be shown for 3 vsyncs, but if the frame times
happen to fall near vsyncs and change between just before and just
after then there could be frames alternating between 2 and 4
vsyncs. The code changes frame timing by up to one quarter vsync
interval to avoid this.

The above functionality depends on having reliable vsync timing
information available. The display refresh rate is not directly
provided by the VDPAU API. The current code uses information from the
XF86VidMode extension if available; I'm not sure how common cases
where that is inaccurate are. The refresh rate can be specified
manually if necessary.

After the changes in this commit MPlayer now always tries to keep one
frame queued for future display using VDPAU's internal timing
mechanism (however no more than 50 ms to the future). This should make
video playback somewhat more robust against timing inaccuracies caused
by system load.
2009-11-15 12:45:58 +02:00
Uoti Urpala 3f215c9f8e Merge branch 'vdpau' into build
* vdpau: (22 commits)
  VO: Prefer vo_vdpau over vo_xv again
  vo_vdpau: Fix X event handling bugs
  vo_vdpau: Fix memory corruption bug with MP_IMGTYPE_NUMBERED
  core/VO: Allow VO drivers to add/modify frames
  video_out.h: Cosmetics
  VO interface: Remove obsolete draw_frame() from new interface
  vo_vdpau: Support recovering from VDPAU display preemption
  vo_vdpau: Support updating OSD while paused
  vo_vdpau.c: Reindent control() switch statement
  vo_vdpau: Allocate one large surface for EOSD content
  vo_vdpau.c: cosmetics
  vo_vdpau: reindent after GUI code removal
  vo_vpdau: Clean up uninit logic
  vo_vdpau: Make CHECK_ST macro safer
  vo_vdpau: Move all remaining static/global variables to context
  vo_vdpau: Move things to context struct
  vo_vdpau: Make info struct const
  vo_vdpau: Replace global function table with context variable
  vo_vdpau: Move VDPAU interface pointers into one struct
  vo_vdpau: Add template file for VDPAU functions
  ...
2009-09-19 00:28:17 +03:00
Uoti Urpala e1ecc43152 Merge svn changes up to r29684 2009-09-16 22:28:12 +03:00
diego 2acf75aeed Convert to UTF-8.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29670 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 18:35:10 +00:00
diego 37677802e5 Fix bashism: Use '$(( ))' syntax instead of '(( ))' for arithmetic expressions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29669 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 18:29:34 +00:00
diego b70a91d505 Avoid bash-specific 'let' syntax in shell scripts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29653 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-07 10:37:16 +00:00
Uoti Urpala 3b3dfc02ac vo_vdpau: Support recovering from VDPAU display preemption
Add code to reinitialize all VDPAU objects if a display preemption
condition occurs. Reinitializing them in the middle of playback will
cause video corruption at least until the next keyframe when using
hardware decoding, but decoding does seem to recover after a keyframe.
2009-09-07 03:12:02 +03:00
Uoti Urpala d9cea6a98b vo_vdpau: Allocate one large surface for EOSD content
Create a single large bitmap surface for EOSD objects and pack all the
bitmap rectangles inside that. The old code created a separate bitmap
surface for every bitmap and then resized the cached surfaces when
drawing later frames. The number of surfaces could be large (at least
about 2000 for one sample subtitle script) so this was very
inefficient. The old code also used a very simple strategy for pairing
existing surfaces to new bitmaps; it could resize tiny surfaces to
hold large glyphs while using existing large surfaces to hold tiny
glyphs and as a result allocate arbitrarily much more total surface
area than was necessary.

The new code only supports using a single surface, freeing it and
allocating a larger one if necessary. It would be possible to support
multiple surfaces in case of hitting the maximum bitmap surface size,
but I'll wait to see if that is actually needed before implementing
it. NVIDIA seems to support bitmap surface sizes up to 8192x8192, so
it would take either a really pathological subtitle script rendered at
a high resolution or an implementation with lower limits before
multiple surfaces would be necessary.

The packing algorithm should successfully pack the bitmaps into a
surface of size w*h as long as the total area of the bitmaps does not
exceed 16/17 (w-max_bitmap_width)*(h-max_bitmap_height), so there
should be no totally catastrophic failure cases. The 16/17 factor
comes from approximate sorting used in the algorithm. On average
performance should be better than this minimum guaranteed level.
2009-09-05 06:25:47 +03:00
Uoti Urpala 575331d73c Merge branch 'vdpau_old' into vdpau 2009-08-31 22:18:51 +03:00
Uoti Urpala dc44507f2a vo_vdpau: Add template file for VDPAU functions
Add a template file that contains a single listing of various
information needed about the VDPAU interface functions, and is then
included multiple times to create required declarations and tables.
Previously some of the information needed to be duplicated for each of
those uses.
2009-08-29 20:18:42 +03:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
siretart 5e08e6c4b5 commit remaining binary_codecs.sh changes from debian.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29228 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 21:01:07 +00:00
siretart 0688204a7d check for missing libstdc++
this version of the check assumes that we run on a system with apt-get
installed and configured. We should probably check that this is actually
true. Or more ideally add support for yum for fedora systems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29227 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 20:59:46 +00:00
siretart fc7d8af3b4 more cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29226 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 20:56:59 +00:00
diego 72451328bc whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29225 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 18:54:22 +00:00
siretart e3f02a93cc Part 3 of syncing binary_codecs.sh with Debian
This patch contains no functional changes again, only whitespace fixes
that has been misse from Part 1 have been included.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29223 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 08:46:05 +00:00
siretart 23f4613d63 Part 2 of syncing binary_codecs.sh with Debian
This patch contains the OKed parts of Diego's review from 23. Apr 2009


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29222 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-23 08:37:20 +00:00
siretart 329513035e Part 1 of syncing binary_codecs.sh with Debian
This patch contains no functional changes, only whitespace fixes from
Debian.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29220 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-22 20:46:33 +00:00
diego e530d4b467 Replace duplicated code by a macro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28938 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-12 11:55:26 +00:00
diego 143a63fd9e Fix and restructure fastmemcpybench. It is now one binary that runs all
available memcpy variants and prints benchmark results about them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28929 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-10 10:05:09 +00:00
reimar 591ce556b7 Make fastmemcpybench almost working - only thing missing is a way to
override HAVE_MMX etc. from config.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28906 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 12:59:14 +00:00
diego 807b942713 comment/output cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28904 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 11:32:43 +00:00
diego a0bce02b7c whitespace cosmetics:
- Remove all tabs and trailing whitespace.
- Indent with 4 spaces.
- K&R-ify and prettyprint some parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28903 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 11:28:31 +00:00
michael 1f61255588 Add test for C memcpy()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28894 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 15:56:20 +00:00
michael 1a493bf6a8 Resurrect script needed for easy use of fastmemcpybench.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28893 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 15:43:52 +00:00
michael b638947171 Revert
r3082 | michael | 2001-11-23 13:00:40 +0100 (Fri, 23 Nov 2001) | 2 lines
	missaligned arrays, as nick requested
Reason: idiotic idea


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28890 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 15:20:14 +00:00
diego 6d7d713ac9 Remove now unnecessary linking hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28781 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 15:51:43 +00:00
diego b598021ed9 HAVE_WINSOCK2_H is now a 0/1 definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28443 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 15:15:07 +00:00
diego 824abb5a65 Add missing 'void' keyword to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:48:03 +00:00
diego 21f5949d4a Relicense to GPLv2 or later with the author's permission.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28230 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 11:46:34 +00:00
diego 15fd1a1636 Fix reference to wrong DLL filename in header comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28229 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 11:45:39 +00:00
diego c2913af38f Fix confused references to DLL filenames.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28228 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 23:16:36 +00:00
diego 26b29f4f2d Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should
be the most correct and portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:17:56 +00:00
diego 6b52a2e974 Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
Neither variant is valid C99 syntax, but __asm__ is the most portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:59:27 +00:00
diego 17f509905c Rename stream/netstream.h to stream/stream_netstream.h; netstream.h to make it
clearer that netstream.h belongs to stream_netstream.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27779 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 17:01:40 +00:00
diego 78066d185e Remove MinGW cruft.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27695 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-03 23:44:40 +00:00
diego a2ad015203 cosmetics: prettyprinting
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27668 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-28 10:14:45 +00:00
diego 4ca1fa0a08 Upgrade license of LGPL 2 or later files to LGPL 2.1 or later.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27614 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 05:40:29 +00:00
diego 583ba8dcb7 Remove encode2mpeglight, it is only an outdated stripped-down version of the
tool maintained externally at http://encode2mpeg.sf.net/.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27537 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 12:58:23 +00:00
diego 5e5c1feb69 license header cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27536 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:39:12 +00:00
diego f2b8ab9994 Fix incorrect FSF address in license header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27535 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:21:18 +00:00
diego 3af860b877 Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
This is what it is called in FFmpeg and more consistent with other
names for similar conditionals. This fixes a potential compilation
failure on MinGW, as described in Bugzilla #1262.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 20:05:08 +00:00
diego e588ab056d Change a bunch of video-output-specific preprocessor directives from a HAVE_
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 17:38:11 +00:00
diego 9c355fec91 Rename binary-codecs.sh to binary_codecs.sh as it is called in Debian.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27384 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-31 22:40:22 +00:00
diego 8b9c830dc3 Revert previous broken rename of binary-codecs.sh that had random changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27383 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-31 22:38:34 +00:00
diego 26a047a816 Rename binary-codecs.sh once more to binary_codecs.sh as it is called in Debian.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27382 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-31 09:49:16 +00:00
diego afc12ef42b Rename install-w32codecs.sh --> binary-codecs.sh.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27381 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-31 09:36:18 +00:00
diego 6ab83c724c Run bash-specific shell scripts with bash, not sh.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27231 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-07 09:32:21 +00:00
diego badc033ef7 Give all shell scripts a .sh suffix for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27230 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-07 09:30:22 +00:00
diego 1ebc859ff8 Replace bash-specific [[]] construct by proper a proper [] test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27229 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-07 06:47:01 +00:00
diego 07e557c6d9 Replace == in []/test constructs with =, == is a bashism.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27228 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-07 06:43:45 +00:00
diego 9713f2a22f Remove unnecessary function keyword from shell script function declarations,
it is a bashism.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27227 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-07 06:30:24 +00:00
diego f9810c0dfb Fix the linking of TOOLS/netstream and TOOLS/vivodump.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26995 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 13:28:25 +00:00
diego 5423c418c2 cosmetics: Remove useless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:42:28 +00:00
diego b10c35e0ed Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:02:27 +00:00
diego 5af496679d Remove loader/wine/avifmt.h #include, the AVI types declared there conflict
with the ones from libmpdemux/aviheader.h, which is #included below.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26612 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:06:33 +00:00
diego 4180db130e Add missing string.h #include to fix a bunch of implicit declaration warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26611 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:03:32 +00:00
diego b5ea65c04f Remove unused fast_memcpy() function and link against the object that
contains fast_memcpy() instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26610 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 14:00:32 +00:00
diego 375be23d2c Disable unused function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26608 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 13:57:15 +00:00
diego c5d5fe98b2 Mark all functions that are only used within the file as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26607 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 13:53:40 +00:00
diego e8d9d7db4e Remove useless 0 flag from s printf conversion specifier, fixes the warning:
TOOLS/movinfo.c:332: warning: '0' flag used with '%s' printf format


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26506 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:24:54 +00:00
diego f19af4d788 Remove redundant definitions that are already present on the command line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26488 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 08:52:05 +00:00
diego 88961299aa Merge TOOLS/Makefile into the top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26487 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 08:50:38 +00:00
diego 513aaf0695 Remove pointless '0' flag from fprintf call, fixes the warning:
warning: '0' flag ignored with precision and '%d' printf format


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26481 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-21 05:43:49 +00:00
diego 71d7b8f747 Add $(EXESUF) to netstream rule.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26480 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-20 22:11:38 +00:00
diego a3271c2409 Only build modify_reg on x86.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26479 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-20 22:08:10 +00:00
diego d989dc71e2 Simplify list of files to remove on make clean.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26478 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-20 22:07:34 +00:00
diego 30028e3e7b fastmemcpybench is a phony target. Do not try to remove a file by that name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26477 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-20 21:59:19 +00:00
diego 293e11bc0f Remove Win32 linker option for netstream. Other winsock using code does not
need it, it should be set from configure and the reason why it was set in
the first place has been lost in the mists of time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26387 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 07:37:27 +00:00
diego 24ce48897e Do not build subrip with debugging symbols.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26371 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:03:08 +00:00
diego 4eea61ddb3 cosmetics: Group dependency declarations together.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26370 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:02:22 +00:00
diego 2c6ac409a5 Remove redundant compilation commands that shadow builtin rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26369 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:00:42 +00:00
diego 47a0430fea List libraries to link to in dependency list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26368 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:54:49 +00:00
diego 58983c3d2e cosmetics: Add CFLAGS to compilation commands everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26367 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:50:30 +00:00
diego e74dfd1bd1 Remove unnecessary ../libmpcodecs/img_format.o from list subrip objects.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26366 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:42:18 +00:00
diego ad908d5198 Update for latest changes to linking dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26365 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:39:07 +00:00
diego 6063301513 Add MPLAYER_ prefix to multiple inclusion guard of generated file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26089 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 12:53:11 +00:00
diego 962433eda2 Add multiple inclusion guards to generated header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25893 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 18:42:00 +00:00
diego 2697136bbb Change format string so that the table is nicely aligned.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25892 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 18:40:01 +00:00
diego 7a1f275849 The alaw tables should be const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25891 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 18:38:47 +00:00
diego 72b5d885bc Move compare.c to TOOLS, add it to the Makefile and document it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25830 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 00:05:48 +00:00
reimar 2ce545224d Fix usage example comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25798 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 14:28:48 +00:00
reimar ced77b5b8f Add the edge-enhancement filter based on edgedetect I had lying around.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25789 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 10:49:21 +00:00
diego 1660147878 Relicense to GPL v2 or later with Reimar's permission.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25633 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 21:19:59 +00:00
diego 6da8e4a81d Remove compilation command from source file, it is already in the Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25571 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:53:51 +00:00
diego 4a36933f7b Fix license header to read Lesser General Public License 2.1,
a Lesser General Public License 2 never existed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25570 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:52:23 +00:00
diego 9cf25c26ad unrarlib.o no longer exists, link against unrar_exec.o.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25569 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 19:43:36 +00:00
diego 8c0a903ccb Fix printf format string length modifiers, removes about a trillion warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25341 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 14:39:19 +00:00
diego 0cfa7f03f7 Comment out unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25340 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 14:13:34 +00:00
diego f059a5570e Remove unused parameters from main(), fixes the warnings:
netstream.c:340: warning: unused parameter 'argc'
netstream.c:340: warning: unused parameter 'argv'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25338 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 13:18:27 +00:00
diego d123fad2bd Fix printf format string length modifiers, removes the warnings:
vivodump.c:213: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long int'
vivodump.c:220: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25337 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 13:16:10 +00:00
diego 0822727933 Fix printf format string length modifiers, removes the warnings:
asfinfo.c: In function 'print_wave_header':
asfinfo.c:114: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
asfinfo.c:115: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
asfinfo.c: In function 'print_video_header':
asfinfo.c:140: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
asfinfo.c:141: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
asfinfo.c:142: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
asfinfo.c:145: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
asfinfo.c:146: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
asfinfo.c: In function 'main':
asfinfo.c:174: warning: format '%X' expects type 'unsigned int', but argument 2 has type 'long int'
asfinfo.c:220: warning: format '%d' expects type 'int', but argument 6 has type 'long unsigned int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25336 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 13:11:26 +00:00
ivo 56f0494615 suppress silly messages when checktree is not called from the root of the tree
but nevertheless has no specific arguments to work with. it will traverse
the tree from there, but obviously cannot find our externals.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25312 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-05 23:44:31 +00:00
ivo 86edf7b297 only check source code for gnuisms
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25311 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-05 23:41:59 +00:00
ivo 64d1a0d366 simpler and more easily expandable test whether we need a shortlist that
only contains .[ch] files


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25310 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-05 23:39:01 +00:00
ivo 9495e9701b test for presence of .svn directory if we are supposed to traverse the tree
according to svn info
.svn might be missing (i.e. after svn export)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25309 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-05 23:36:03 +00:00
ivo a46d864303 when gathering the list of files to check via svn info, also include
libpostproc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25305 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-05 17:42:56 +00:00
ivo 2ac12d82d8 cosmetics/indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25289 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-03 21:45:43 +00:00
ivo 284673cbf5 when gathering the list of files to check via svn info, also include
externals (libav*)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25288 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-03 21:43:48 +00:00
ivo 66a1addb00 add functions that are not specifically marked as being deprecated or obsolete,
but which are dangerous to use (possible race conditions, undefined filemode,
et cetera; use tmpfile(3) instead).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25287 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-03 21:40:54 +00:00
reimar 844c8ffc48 Mark several uses of vo_functions_t as const to stop some of the current
hacks e.g. in vidix code from spreading.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25247 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:24:23 +00:00
ivo d3fbd9a436 10l for me. I should read my own comments just above it ;)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25220 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-30 23:02:32 +00:00
ivo dd9d075405 less code for initializing default settings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25219 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-30 23:01:30 +00:00
ivo 33ef887d5b add test for deprecated and obsolete functions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25218 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-30 22:52:56 +00:00
compn 962a99ead2 simple avoid wine complaints fix by sherpya
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24797 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-17 02:24:50 +00:00
diego c8ae1836e6 cosmetics: misc typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24615 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-25 16:34:23 +00:00
diego 06facf3a90 According to MSDN a thread must call CoUninitialize once for each successful
call it has made to CoInitialize or CoInitializeEx, including any call that
returns S_FALSE. Only the CoUninitialize call corresponding to the CoInitialize
or CoInitializeEx call that initialized the library can close it.
patch by Gianluigi Tiesi, mplayer netfarm it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24596 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-23 20:37:33 +00:00
compn a4e3bde0af vfw2menc works on linux/windows
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24547 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-16 18:34:20 +00:00
compn 7207dc5fd4 vfw2menc works on linux and windows x86 only
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24544 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-16 15:14:56 +00:00
diego c20f7e99c4 Mark xx function as returning char, fixes:
avi-fix.c:18: warning: return type defaults to 'int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24255 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 10:41:16 +00:00
diego c66a69924b Remove nonsensical #ifdef.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24254 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 10:38:35 +00:00
diego e6eeef436b Simplify the addition of -g to some CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24244 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 12:00:55 +00:00
diego b7ffad3d0a Move common link libs/objects into a variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24243 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 11:58:37 +00:00
diego 11caf018fd consistent linking order
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24242 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 11:52:21 +00:00
diego 449e6746e3 Simplify linkage parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24240 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 11:12:12 +00:00
diego 068d66d0a0 warning fixes:
realcodecs/drv4.c: In function 'RV20toYUV420CustomMessage':
realcodecs/drv4.c:151: warning: unused variable 'temp'
realcodecs/drv4.c:150: warning: unused variable 'pp1'
realcodecs/drv4.c: In function 'build_crc':
realcodecs/drv4.c:263: warning: unused variable 'b'
realcodecs/drv4.c: In function 'RV20toYUV420Transform':
realcodecs/drv4.c:295: warning: unused variable 'crc2'
realcodecs/drv4.c:295: warning: unused variable 'crc1'
realcodecs/drv4.c:295: warning: unused variable 'len'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24239 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 11:08:19 +00:00
diego 952b64b0d3 warning fixes:
realcodecs/drv3.c: In function 'build_crc':
realcodecs/drv3.c:291: warning: unused variable 'b'
realcodecs/drv3.c: In function 'RV20toYUV420Transform':
realcodecs/drv3.c:323: warning: unused variable 'crc2'
realcodecs/drv3.c:323: warning: unused variable 'crc1'
realcodecs/drv3.c:323: warning: unused variable 'len'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24238 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 11:05:40 +00:00
diego 686cfb9f05 warning fixes:
realcodecs/drv2.c: In function 'build_crc':
realcodecs/drv2.c:316: warning: unused variable 'b'
realcodecs/drv2.c: In function 'RV20toYUV420Transform':
realcodecs/drv2.c:348: warning: unused variable 'crc2'
realcodecs/drv2.c:348: warning: unused variable 'crc1'
realcodecs/drv2.c:348: warning: unused variable 'len'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24237 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 11:04:10 +00:00
diego df14a8fe9e warning fixes:
realcodecs/sipr.c: In function 'RAInitDecoder':
realcodecs/sipr.c:348: warning: unused variable 'temp2'
realcodecs/sipr.c:347: warning: unused variable 'temp'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24236 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:59:12 +00:00
diego cd9abbea80 warning fixes:
realcodecs/ra.c: In function 'RASetFlavor':
realcodecs/ra.c:344: warning: unused variable 'property'
realcodecs/ra.c:343: warning: unused variable 'flavor'
realcodecs/ra.c:343: warning: unused variable 'numflavors'
realcodecs/ra.c:342: warning: unused variable 'result1'
realcodecs/ra.c:342: warning: unused variable 'numprop'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24235 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:58:30 +00:00
diego 4bdae7c94a warning fixes:
realcodecs/28_8.c: In function 'RAInitDecoder':
realcodecs/28_8.c:238: warning: unused variable 'temp2'
realcodecs/28_8.c:237: warning: unused variable 'temp'
realcodecs/28_8.c: In function 'RASetFlavor':
realcodecs/28_8.c:273: warning: unused variable 'property'
realcodecs/28_8.c:272: warning: unused variable 'flavor'
realcodecs/28_8.c:272: warning: unused variable 'numflavors'
realcodecs/28_8.c:271: warning: unused variable 'result1'
realcodecs/28_8.c:271: warning: unused variable 'numprop'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24234 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:56:48 +00:00
diego 2c013c1875 warning fixes:
realcodecs/14_4.c: In function 'RAInitDecoder':
realcodecs/14_4.c:238: warning: unused variable 'temp2'
realcodecs/14_4.c:237: warning: unused variable 'temp'
realcodecs/14_4.c: In function 'RASetFlavor':
realcodecs/14_4.c:273: warning: unused variable 'property'
realcodecs/14_4.c:272: warning: unused variable 'flavor'
realcodecs/14_4.c:272: warning: unused variable 'numflavors'
realcodecs/14_4.c:271: warning: unused variable 'result1'
realcodecs/14_4.c:271: warning: unused variable 'numprop'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24233 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:55:27 +00:00
diego bccfdf2cd0 Remove unnecessary fastmemcpybench prerequisite.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24232 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:51:48 +00:00
diego 2c12e91a23 Remove unused #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24231 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:50:58 +00:00
diego fa364a03dc Fix a ton of warnings:
warning: incompatible implicit declaration of built-in function 'memset'
warning: incompatible implicit declaration of built-in function 'memcpy'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24230 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:32:46 +00:00
diego 42d1af3f6a Simplify bmovl-test compilation call.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24229 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:29:25 +00:00
diego 70261e715f Fix "incompatible implicit declaration of built-in function 'exit'" warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24228 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:16:10 +00:00
diego 53cdcdb4d3 Mark phony targets as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24227 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:13:11 +00:00
diego b0d0866059 Move fastmemcpybench objects to link against into prerequisites.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24226 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 10:10:12 +00:00
diego 14b2c39cd6 warning fix:
fastmemcpybench.c: At top level:
fastmemcpybench.c:29: warning: 'mga_next_frame' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24225 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 09:59:23 +00:00
diego a1d3c0aeaf warning fix:
fastmemcpybench.c: In function 'mga_init':
fastmemcpybench.c:36: warning: unused variable 'frame_mem'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24224 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 09:58:35 +00:00
diego 80226b8d77 warning fix:
vivodump.c: In function 'main':
vivodump.c:293: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24223 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 09:52:55 +00:00
diego 8826704061 warning fixes:
movinfo.c: In function 'video_stream_info':
movinfo.c:80: warning: control reaches end of non-void function
movinfo.c: In function 'audio_stream_info':
movinfo.c:99: warning: control reaches end of non-void function
movinfo.c: In function 'userdata_info':
movinfo.c:152: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24222 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 09:47:17 +00:00
diego 7728f7bd12 Get netstream closer to linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24201 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:52:29 +00:00
diego f04257530a warning fix:
modify_reg.c: In function 'remove_key':
modify_reg.c:39: warning: unused variable 'tmp_name'
modify_reg.c:39: warning: unused variable 'tmp_val'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24200 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:39:15 +00:00
diego 7117b5b121 Fix subrip and vivodump linking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24199 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:36:57 +00:00
diego 4ed5da4ad7 Mark vfw2menc as Windows-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24197 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:33:35 +00:00