0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Commit Graph

205 Commits

Author SHA1 Message Date
Uoti Urpala
5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar
af2988cbce Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 15:18:21 +00:00
reimar
897f210bf4 av_alloc_format_context -> avformat_alloc_context
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29959 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 14:15:41 +00:00
reimar
054d1889ef Reuse buffer in priv context instead of allocating the 32kB probe buffer
on the stack.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29953 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 13:06:44 +00:00
Uoti Urpala
287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
reimar
085f35f4b4 Allow lavf demuxer to also probe and play files < 32 kB (full probe buffer size).
Based on patch by On2.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29882 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 16:49:00 +00:00
cehoyos
419e4f684a Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29849 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:55:07 +00:00
reimar
1698db0726 Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling
from lavf demuxer, mplayer.c makes sure IDENTIFY_PROGRAM is called with the
right arguments, and that code actually works in contrast to the one in demux_open_lavf.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29847 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 11:15:26 +00:00
reimar
25f0498660 Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist
instead of incorrectly claiming that the demuxer does not support programs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29845 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 11:09:23 +00:00
Uoti Urpala
7fd3eb0f74 Merge svn changes up to r29752
As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.
2009-10-06 04:48:00 +03:00
reimar
1ad332f8a5 lavf: if seeking in the desired direction failed, also try in the opposite one,
otherwise we might end up at some random position (where lavf last ended
up while trying to build the index).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29741 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-30 08:19:49 +00:00
Uoti Urpala
e1ecc43152 Merge svn changes up to r29684 2009-09-16 22:28:12 +03:00
reimar
86ff541253 Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectly
claims the Wave64 files but can not handle them).
Patch by Daniel Verkamp [daniel drv nu].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29668 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:30:02 +00:00
reimar
cd5fa27550 Sort preferred_list alphabetically since the order does not matter otherwise.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29667 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-10 17:28:35 +00:00
reimar
873d120347 Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead of
reimplementing that functionality.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29664 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 21:45:36 +00:00
reimar
64c5127103 Fix an endless loop if all programs are empty.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29660 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 09:08:05 +00:00
reimar
b05f2d0bdf Always register all streams from libavformat, not just those belonging to a program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29657 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-08 08:55:05 +00:00
vitor
9d99f5bd8d Add support for lavf vqf demuxer and lavc TwinVQ decoder.
Also make lavf the default demuxer for vqf.

Ok'ed by Compn on IRC.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29655 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-07 17:20:44 +00:00
Uoti Urpala
0e1b7765be Merge svn changes up to r29644 2009-09-04 19:49:35 +03:00
cehoyos
74f6a6ba52 Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that
it now can be used for both audio and video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29593 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 23:01:36 +00:00
cehoyos
361bdec7ed Use mp_wav_override_taglists for both audio and video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29590 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-30 22:51:52 +00:00
Uoti Urpala
95da34aa07 Merge svn changes up to r29532 2009-08-18 02:29:37 +03:00
greg
14df605236 Use new libavformat metadata API.
Patch by Anton Khirnov <wyskas@gmail.com>.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29497 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 23:26:42 +00: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
a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Amar Takhar
e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar
b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
reimar
7924781b04 AVStream.language is deprecated, switch to av_get_metadata instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29386 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 08:13:52 +00:00
reimar
bc8b79a37d Move allocation to avoid a possible memleak if new_sh_audio fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29385 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 08:06:46 +00:00
reimar
6a434d676b Remove pointless stream count checks, new_sh_* already checks for that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29384 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 08:04:38 +00:00
reimar
00be4423da Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends
can correctly display the languages of audio and subtitle tracks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29383 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-24 07:49:04 +00:00
reimar
29369f0c33 Add const where appropriate, also gets rid of a compiler warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29338 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 09:43:32 +00:00
reimar
b3f4cd6c52 100l, do not read probe buffer if it will not be used because a format was forced.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29337 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 09:39:02 +00:00
reimar
ea47ab2a9f In all demux_info_add calls change "name" to "title".
Currently "name" and "title" are both used at random, this makes it consistent.
"title" was chosen because it is less ambiguous and also the get_meta_title
slave mode command uses that (there is no get_meta_name command).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-30 13:18:57 +00:00
Uoti Urpala
1b272e3b2d demux_lavf: Make absolute seek time 0-based instead of file start
demux_lavf interpreted absolute seeks as relative to the start of the
file, so if the file didn't start at timestamp 0 then seeking to
timestamp X went to a position MPlayer would display as start+X. Make
the seeks use the same timestamps as used in the original file. This
works better for most use cases as no part of MPlayer normally uses or
displays such "since start of file" timestamp values. There could be
some cases where the old semantics are useful, but I think they do not
justify making it the default behavior; a separate feature for that
could be added if it turns out to be needed.
2009-04-24 02:18:19 +03:00
Uoti Urpala
53eeb0e412 Merge branch 'ordered_chapters' 2009-04-08 02:43:44 +03:00
Uoti Urpala
d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
reimar
b5fcf45f11 Increase probe buffer size to 32kB, this makes ac3 auto-detection far more reliable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29121 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-01 09:24:46 +00:00
Uoti Urpala
73fb23c1cf Add improved relative seek mode
When the new mode is active relative seeks are converted to absolute
ones (current video pts + relative seek amount) and forward/backward
flag before being sent to the demuxer. This mode is used if the
demuxer has set the accurate_seek field in the demuxer struct and
there is a video stream. At the moment the mkv and lavf demuxers
enable the flag.

This change is useful for later Matroska ordered chapter support (and
for more general timelime editing), but also fixes problems in
existing functionality. The main problem with the old mode, where
relative seeks are passed directly to the demuxer, is that the user
wants to seek relative to the currently displayed position but the
demuxer does not know what that position is. There can be an arbitrary
amount of buffering between the demuxer read position and what is
displayed on the screen. In some situations this makes small seeks
fail to move backward at all (especially visible at high playback
speed, when audio needs to be demuxed and decoded further ahead to
fill the output buffers after resampling).

Some container formats that can be used with the lavf demuxer do not
always have reliable timestamps that could be used for unambiguous
absolute seeking. However I made the demuxer always enable the new
mode because it already converted all seeks to absolute ones before
sending them to libavformat, so cases without reliable absolute seeks
were failing already and this should only improve the working cases.
2009-03-24 04:05:04 +02:00
Uoti Urpala
79e1aa7cc7 Merge svn changes up to r28341
Conflicts:
	configure
	libmpcodecs/native/rtjpegn.c
2009-01-19 00:04:43 +02:00
cehoyos
83c523f9ea Fix compilation: s/ff_gcd/av_gcd.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28338 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-17 11:29:36 +00:00
Uoti Urpala
8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02:00
diego
0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala
e7a611de00 Merge svn changes up to r27688 2008-10-03 18:05:21 +03:00
gpoirier
bf0e018a68 fix compilation w/ FFmpeg r15533
patch by Andrew Wason %rectalogic A rectalogic P com%


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27688 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-03 14:54:22 +00:00
Uoti Urpala
849dc0ba31 Merge svn changes up to r27649
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
2008-09-20 16:13:33 +03:00
diego
ec0ba2f460 riff.h and avi.h are not needed, but avio.h is.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27616 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 15:30:06 +00:00
Uoti Urpala
259ea9d703 Merge svn changes up to r27573
Conflicts:
	libmpcodecs/vd_ffmpeg.c
2008-09-10 23:59:08 +03:00
uau
4768e340ab Make internal Matroska demuxer default again
Undo Aurelien's previous commit which made the lavf demuxer the
default. SSA/ASS subtitles do not work properly with the lavf demuxer
at the moment. That's much more important than any issues with the
internal demuxer. The internal demuxer must remain the default at least
until the subtitle issues are resolved.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27556 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 14:45:50 +00:00
aurel
9500a8cc9c revert r27551 which break much more things than it fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27555 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 14:28:44 +00:00