1
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 04:44:32 +01:00

116 Commits

Author SHA1 Message Date
Uoti Urpala
d46b86bc7c Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
2009-12-30 00:56:10 +02:00
reimar
ca2af2d0e7 Add support for parsing audio streams (though should be easy to extend to video)
via libavcodec.
Parsing can be done at the demuxer stage (currently disabled) or at the decoder
(ad_ffmpeg, enabled).
Should allow using the libavcodec AAC, DTS, ... decoders independent of container
format.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 15:28:01 +00:00
Uoti Urpala
1598302be6 Fix printf format strings with invalid '%lf' conversion
Some code used an invalid '%lf' conversion specification for double
arguments. Maybe they were written that way due to confusion with
scanf where doubles are indicated by '%lf'; however it is not a valid
printf format specifier. Change those cases to use '%f'.
2009-12-15 15:27:30 +02:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Uoti Urpala
6d908205fb Merge svn changes up to r29304 2009-07-07 02:07:11 +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
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
diego
f077569dff Add standard license header to all files in libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:51:13 +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
f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
nicodvb
02c779f1cf use demux_flush() where appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26959 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-02 10:18:44 +00:00
reimar
5960ddb8e5 Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
nicodvb
4205c1a8b7 in the crazy ES probing code return DEMUXER_TYPE_MPEG_ES (mpeg12v) only if we have at least a couple of SEQ/GOP startcodes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25866 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 19:01:13 +00:00
reimar
35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
nicodvb
aa93810437 reindented
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24974 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-05 20:16:06 +00:00
nicodvb
a06eb8ac21 10l, setting a non-existent timestamp (default 0.0) when the pts flag isn't set in
the PES header is just wrong; leave the default MP_NOPTS_VALUE instead


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24973 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-05 20:15:09 +00:00
nicodvb
9fba49e0bb in update_stats() removed a wrong 'else' that would prevent h264 headers to be recognized:
all 0x12x headers were accounted for only in num_elementary_packets12x.
Fixes detection of certain H264 in ES/PS streams


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24701 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-04 17:15:06 +00:00
diego
01d92a32ad cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 22:38:45 +00:00
nicodvb
357b96679e 100% cosmetics: reindentation and removal of trailing spaces
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23743 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-08 10:11:36 +00:00
nicodvb
30f3c76528 unified the skip of header and stuffing bytes after the parsing of pes_extension[12] fields
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23742 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-08 10:06:47 +00:00
nicodvb
2f4f674331 10l, forgot to skip the stuffing bytes eventually prepended to vc1 packets (identified by pes_extension2 subid)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23731 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-07 08:56:14 +00:00
nicodvb
836ffdb9f4 cosmetics: split separate instructions in separate lines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23730 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-07 08:31:57 +00:00
nicodvb
1c4710b110 proper parsing of pes_extension[12] fields (replaces the previous code that relied on specific flags set
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23729 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-07 08:22:47 +00:00
reimar
2c1ee29835 Set subtitle type in mpg demuxer. Fixes subtitle switching with 'j'
(previously subtitles would just disappear).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23570 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 10:24:10 +00:00
nicodvb
e2ed3cb72d clearly specify the valid substream id range, rather than using unreadable bitmasks (it also prevents misdetection 0xFF as valid)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23550 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-12 22:08:30 +00:00
uau
208d4343ef "()" to "(void)" function param list fixes
patch from Stefan Huehner, stefan huehner org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22904 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 21:59:54 +00:00
diego
e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
diego
4a75f5849f Source files should not contain non-ASCII characters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22525 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 15:52:34 +00:00
nicodvb
6c36825079 test the continuity of timestamps for STREAMTYPE_VCD, too; patch by Zuxy Meng
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22381 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-28 23:47:05 +00:00
nicodvb
5ad12e4fbb removed duplicated code in demux_seek(); stream_seek() already aligns to STREAM_BUFFER_SIZE boundary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22370 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 20:22:05 +00:00
nicodvb
09262ff552 100000l: average != semidistance, fixed seeking to the middle position; patch by Zuxy meng (zuxy.megn gmail com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22369 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 20:15:31 +00:00
nicodvb
7ac4b89663 substream id 0x98..0x9f identifies dts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22188 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-09 20:21:20 +00:00
nicodvb
0d94dac274 when seeking and the codec is VC1 sync to sequence or entry point headers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22173 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-07 23:56:08 +00:00
nicodvb
3a250aa0f1 demux_mpg_probe() seek to the initial position before returning - patch by reimar
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22112 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-03 14:09:47 +00:00
nicodvb
7d1ffbf2c1 removed unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22106 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-03 11:32:43 +00:00
nicodvb
d36c1d4295 sanity checks during codec detection; also reset demuxer->stream->eof
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22059 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 22:41:18 +00:00
nicodvb
90654b8eff added code to scan the video stream to search the actual video codec used;
triggered only if requested by the user with option -psprobe.
Evo files require this option because H264 is stored like MPEG2
without using the PSM



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22055 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:42:22 +00:00
nicodvb
106158f4f1 include math.h for fabsf()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22054 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:27:15 +00:00
nicodvb
380d0dcebc cosmetics: reindentation and braces removal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22053 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:25:50 +00:00
nicodvb
ed9e5b1565 moved scoreboarding code to 2 separate functions (update_stats() and clear_stats()) to be reused next
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22052 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 21:22:39 +00:00
nicodvb
25918a8b31 set has_valid_timestamps and corresponding first and final pts only after
having checked that at the beginning, at the middle and at the end of the
stream timestamps don't reset and that they seem to progress (almost-) linearly;
additionally probe those timestamps only when the stream type is file and it's seekable,
so all other stream types (especially network ones) won't waste time trying to seek
and possibly slowing down detection.
Seeking is not negatively affected by these changes.
Patch by Christian Aistleitner (zaek7q gmx net) reworked by me.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22039 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 10:45:34 +00:00
nicodvb
68f75d788f substream 0x75 doesn't seem to be a valid vc1 stream, after all; removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21997 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:29:54 +00:00
nicodvb
3253bba2b3 set priv->last_pts to the pts read only if the pts was really read; patch by zaek7q gmx net (Christian Aistleitner)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21996 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-22 22:24:50 +00:00
nicodvb
fa90811f58 demux vc1 (stream id 0x1Fd with 0x55 <= substream id <= 0x5F in the pes_extension_2 payload)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21966 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-20 12:13:50 +00:00
nicodvb
34ef7517eb 1000l; fixed wrong operator precedence
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21952 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 21:42:04 +00:00
nicodvb
375fe84da6 in evo files [e]ac3 substreams range from 0xc0 to 0xcf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21945 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-16 22:50:47 +00:00
nicodvb
9c56f01564 one more #if 1 removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21937 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 23:03:45 +00:00
nicodvb
12233b5063 removed useless #if1s added too long time ago
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21936 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-15 21:39:30 +00:00