1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-20 14:56:55 +00:00
Commit Graph

930 Commits

Author SHA1 Message Date
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
69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
reimar
92b91439e0 Make ad_hwac3 independent of liba52. Needs a minor amount of code duplication,
though that is already done that way for dts support in hwac3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30280 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 19:43:19 +00:00
greg
9aea06cf7d Update internal libass copy to commit 8db4a5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-08 18:35:44 +00:00
Uoti Urpala
852570d342 Merge svn changes up to r30216 2010-01-08 02:39:39 +02:00
Uoti Urpala
ba21aba40d Merge svn changes up to r30187 2010-01-08 01:55:15 +02:00
Uoti Urpala
b390b9b28f Merge svn changes up to r30185 2010-01-08 01:36:05 +02:00
Uoti Urpala
231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
diego
a7a1f395c6 Invoke pci_db2c.awk as an argument to awk instead of letting the shell run it.
The shell looks for awk in /usr/bin, the path from the shebang line. However,
there exist systems with awk in /bin, namely archlinux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30216 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 21:22:33 +00:00
diego
bf258cb675 Remove previous failed attempt at disabling that auto-generation of some C code.
This reverts the previous buggy commit, r30094.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30214 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 20:53:57 +00:00
diego
a4ce4a23b7 Drop -Iloader from CPPFLAGS for the loader subdirectory.
Instead use full relative paths in #includes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30212 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 20:32:23 +00:00
diego
cdcbe65d47 Add loader/wine/ to DIRS; its headers should be part of checkheaders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30211 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 19:56:28 +00:00
reimar
6da17782ea 100l, vo_png must go in SRCS_MPLAYER, not SRCS_COMMON.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30187 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:39:16 +00:00
reimar
eff2254d58 Change vo_png to use FFmpeg's png encoder instead of libpng.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 16:26:30 +00:00
reimar
a7be2e180b Finally add matrixview vo.
Heavily cleaned up/fixed etc. by me, improvements are still possible though.
Patch originally by Pigeon <pigeon at pigeond.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 14:54:51 +00:00
reimar
0ecf324ac5 Extract functions to generate yuv->rgb matrices and lookup tables into a
separate file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:25:35 +00:00
Uoti Urpala
dc7f183022 Merge svn changes up to r30104
Ignore the broken correct-pts change in r30100.
2009-12-30 00:14:20 +02:00
Uoti Urpala
67b40bd219 Merge svn changes up to r30065 2009-12-29 23:57:14 +02:00
diego
61f34a8101 Do not auto-generate the C code to handle PCI vendor and device names.
This part of the code does not change so there is no point in generating it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30094 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 21:11:39 +00:00
diego
48ed8799ac Do not autogenerate vidix/pci_names.h.
Its contents is always the same, so there is no point in generating it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30088 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 17:49:07 +00:00
diego
c3da36a9ac Run vidix/pci_db2c.awk directly instead of passing it to awk.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30077 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-20 14:14:56 +00:00
reimar
1f4109d85e Experimental support for external libass.
So far probably only works with the libass from Ubuntu 9.10


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 15:18:22 +00:00
reimar
0aac4fa9dc Add x11_common as dependency for OpenGL with X11 backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30064 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-19 13:46:34 +00:00
Uoti Urpala
efcc9ad712 Merge svn changes up to r30055 2009-12-18 18:54:42 +02:00
reimar
5c5087081f DShow TV input needs part of the our DirectShow code, so add the proper
dependencies to the Makefile.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29985 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-09 17:52:18 +00:00
Uoti Urpala
1dba61a670 build: Generate version numbers for git
Update the version.sh script for git so it'll generate version numbers
more useful than "UNKNOWN". At the moment it only generates the short
SHA1 name, but adding a tag as a starting point should allow more
useful output. Rather than update the Makefile logic that tried to
guess whether the svn revision had changed since the last version.h
update, just run the version.sh script from configure so the version
is updated at least at that time.
2009-11-23 06:22:15 +02:00
Uoti Urpala
5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar
5830140582 Add preliminary support for streaming via FFmpeg's URProtocol functions.
Basic playback tested for file and http protocols.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 16:09:17 +00:00
Uoti Urpala
287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
cehoyos
2a5611473c Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
Uoti Urpala
8bbb79c03a av_log callback handling overhaul
Move av_log callback handling from vd_ffmpeg.c to a new file
av_log.c and install the callback immediately when starting the
program. Main functionality improvements of the new code:

 - The old version only installed the callback when opening an FFmpeg
   video decoder. If nothing had triggered that then av_log() messages
   from other sources (libavformat, audio decoding, swscale usage)
   bypassed MPlayer's output system completely. Now the callback is
   always installed.

 - Current av_log message severity levels are handled correctly. The
   old code used MSGL_ERR for some messages that should be MSGL_V.

 - Message type is now set for libavformat contexts
   (MSGT_DEMUXER / MSGT_MUXER).

 - The old code did "mp_msg_test(type, mp_level)" before actually
   determining the type, so that it always used MSGT_FIXME. This led
   to some messages being incorrectly dropped in case the user
   had specified module-specific verbosity levels. The old check in
   question was originally motivated by performance problems when
   there were a lot of callbacks; however it's not clear whether the
   part about it skipping the type determination was intentional (most
   of the performance problems must have come from the way the
   original code used snprintf) and in my tests current FFmpeg
   libraries have not generated unreasonable amounts of callbacks
   anyway.
2009-10-31 23:59:16 +02:00
cehoyos
a9474b0b39 Move teletext specific code from stream into libmpcodecs.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:13:04 +00:00
diego
fc1b468117 Get rid of COMMON_LDFLAGS variable. It was a pointless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-19 09:56:18 +00:00
diego
da278b3184 Merge rules for building mencoder and mplayer.
Just the dependencies are different, so specify them separately.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29779 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-18 18:44:51 +00:00
diego
47f0629f1a Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables.
They are only used in one place so the indirection is pointless.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29778 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-18 18:41:35 +00:00
Uoti Urpala
0e1b7765be Merge svn changes up to r29644 2009-09-04 19:49:35 +03:00
reimar
fde99e3c5d Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
keycodes instead of its own switch-case in vo_corevideo.m


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29575 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:29:07 +00:00
reimar
0dadcc7bf0 Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.
Also get rid of our own defines for the keycodes and instead use the
predefined ones from Carbon.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29573 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 12:54:33 +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
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
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
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
fdb2f3c8ab Merge svn changes up to r29417 2009-07-12 15:52:00 +03:00
Anton Khirnov
87366694d8 Remove the internal GUI
The GUI is badly designed and too closely coupled to the internal
details of other code. The GUI code is in bad shape and unmaintained
for years. There is no indication that anyone would maintain it in the
future either. Even if someone did volunteer to implement a better
integrated GUI having the current code in the tree probably wouldn't
help much. So get rid of it.
2009-07-07 21:49:42 +03:00
lorenm
88fc4806b9 new debanding filter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29413 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-07 02:01:36 +00:00
Uoti Urpala
a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Uoti Urpala
6d908205fb Merge svn changes up to r29304 2009-07-07 02:07:11 +03:00
diego
53d273ec22 Rename LIBVORBIS Makefile variable to VORBIS.
The latter is more clear as it can represent either Tremor or libvorbis.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29365 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-14 21:09:35 +00:00