Commit Graph

50 Commits

Author SHA1 Message Date
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 1b915e419e Replace double semicolon by single semicolon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
diego bc7cf2efd8 Remove unused function, fixes the warning:
stream/tvi_dshow.c:1311: warning: 'reconnect_pins' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27758 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 15:25:34 +00:00
voroshil 8095d9dacf Add debug message about loaded frequency tables.
Replace printed code of input type with user-frendly "broadcast"/"cable" strings.

patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27662 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:49:27 +00:00
voroshil 7132e7d852 Make output messages of frequency selection code more useful by
providing additional information like requested frequency
and found nearest fequency/channel.

patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27661 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:42:15 +00:00
voroshil 89600cd4ca Fix overflow in frequency conversion code inside tvi_dshow.
patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27660 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:30:06 +00:00
diego 02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
diego c657594049 cosmetics: Remove useless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 08:43:15 +00:00
diego 0ecfcdce00 Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26769 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 17:20:42 +00:00
reimar 83773af50f Make all tvi_info_t const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25717 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 12:01:57 +00:00
voroshil e4e63d7a04 Revert r25089 (Ignore video formats which are supported by device
but not supported by dshow driver).

It prevents code from r25091 (probing undeclared formats) functioning
properly: those code is never called if all declared by device formats
are unsupported by MPlayer (even if undeclared one is supported).

After this revert PVR-150 card should work as expected.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25155 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 07:51:31 +00:00
voroshil d0fa6cd8c8 Move requested format at top and shift all oters down
This method is better with recent negotiation code:
requested formats will be checked first.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25154 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 07:28:05 +00:00
voroshil fd10d43723 Сreate empty format arrays in case of error in init_chain_common.
Fixes segfault for cards without audio capture pin
in main capture filter.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25153 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-24 06:01:18 +00:00
voroshil 3ce51a62d3 Compilation fix (typo)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25133 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-21 13:55:39 +00:00
voroshil 02159c2be1 Sizes of arpmt and arStreamCaps must be equal.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25124 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-21 03:49:23 +00:00
voroshil 01658583a4 Move code related to chain initialization and similar
for different chains to separate routine.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25122 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-20 19:33:27 +00:00
voroshil 49b320c00c Fix mplayer crash caused by r25116
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25121 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-20 17:19:16 +00:00
voroshil 7c9a04f6c0 Remove no more needed check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25118 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-20 10:02:19 +00:00
voroshil 298dd31e32 Fix totally wrong (due to mess of brackets) structures size check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25117 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-20 10:01:14 +00:00
voroshil a9aa43a249 Replace several parameters for get_available_formats_stream
and get_available_formats_pin with one chain structure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25116 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-20 09:02:43 +00:00
voroshil 23cc31e505 New routine for reconnecting two pins with new media type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25115 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 20:19:33 +00:00
voroshil 12fd879776 Move pointer to SampleGrabber filter into chain structure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25114 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 19:49:17 +00:00
voroshil 423882fe73 Move common chain uninit code into separate routine.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25113 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 19:45:01 +00:00
voroshil 54203fe1d1 pass chain structure instead of several variables to build_sub_graph
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25112 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 19:33:53 +00:00
voroshil 002759bb8a fix missed change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25111 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 19:25:25 +00:00
voroshil 2390359b25 Add capture filter's pointer to vbi chain structure too.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25110 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 19:24:21 +00:00
voroshil 8e2f39307a Code unification: get rid of local variable arpmtVBI
and use chain structure's arpmt member.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25109 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 19:15:36 +00:00
voroshil 2f8d411130 Add major media type to chain structure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25108 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 19:02:09 +00:00
voroshil 110184516b One step of code cleanup: move all variables, related
to audio/video/vbi chains of filters into separate structure
(will simplify some parts of code in future)



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25107 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 18:53:13 +00:00
voroshil c30eaa2029 100l: Fix long standing copy-paste error:
TUN_SET_NORM should set norm value not get it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25105 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-19 09:05:23 +00:00
voroshil 5f8294fb14 Add all passed to VID_SET_FORMAT formats to the end of
available format list (but report call as failed, to
continue checking formats).

This gives small chance to build graph even if device
does not report about particular format as supported.

This makes mplayer be able to work with PVR-150 card
(card's driver does not report about yuy2 format, but
accepts connection and works with it).



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25096 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 13:17:00 +00:00
voroshil a516b405d8 Ensure that when VID_GET_FORMAT ioctl is called,
video chain in graph is ready built.
Otherwise driver can return one format
while graph builder will negotiate another.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 11:36:57 +00:00
voroshil 8b33e65473 (cosmetics) Indentation fix of previous commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25094 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 11:15:14 +00:00
voroshil fa18524d05 New media format negotiation code:
loop through all available formats trying to
establish connection between pins.

Negotiation stops either when all formats are rejected
(error reported in this case) or when connection is
established (which can happen only when current media
format is accepted by both of the pins).



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25093 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 11:13:28 +00:00
voroshil 1e663de892 Move setting media format code
closer to connection establishment routine.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25092 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 10:55:51 +00:00
voroshil 790cd7ec47 Pass all available formats to chain building routine and
establish connection with first of available formats.

This will make further format negotiation patch slightly
simpler. 

To avoid pins connection error due to unsuported format
at top of the list, put requested video format to the
top of list. This will also useful with upcoming patch -
negotiation will be started from requested format.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25091 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 10:51:22 +00:00
voroshil b7ad0227fb Ignore video formats which are supported by device
but not supported by dshow driver.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25089 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 08:24:30 +00:00
voroshil 78a0719de9 Fix crash when pin connection fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25088 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 06:16:37 +00:00
voroshil 0da22f962f Prevent chains from building more than once.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25087 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 05:20:17 +00:00
voroshil c8b82b4b80 Handle "out of memory" error.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25086 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 05:07:51 +00:00
voroshil 5c684e7e4c Move chains building code into separate routines.
This makes code more readable and will allow
building particular chain before start().



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25085 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-18 05:02:49 +00:00
voroshil bf33c147fa (cosmetics) Lookup table alignment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25082 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 19:55:16 +00:00
voroshil 88cd527ad0 Service routine for constructing AM_MEDIA_TYPE structure from
given fourcc with help of lookup table.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25081 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 19:51:46 +00:00
voroshil e0f028b2a4 Disable terminating directshow chains with NullRenderer filter,
bacause this causes jerky video.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25080 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 19:32:18 +00:00
voroshil 66d7d00ea2 Fix bogus bits per pixel values in lookup table.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25079 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 19:08:03 +00:00
voroshil b40c2c3057 (cosmetics) Indentation fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25076 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:52:43 +00:00
voroshil 13df91222f Make sure that mplayer will receive actual media type
instead of requested value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25057 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-16 18:59:35 +00:00
voroshil b4355b2f1d Fix FPS from bitrate calculation (was 8 times larger than real value).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25056 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-16 17:57:12 +00:00
voroshil 9ac045e0d1 Not all cards supports changing country code.
This patch makes failed call to put_CountryCode non-fatal.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25047 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-14 12:57:17 +00:00
voroshil 45287b2c2b DirectShow based tv:// driver for win32
Teletext is also supported (but 625 system parameters are hardcoded).
pthreads is required for teletext.

Code is still experimental.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24772 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-13 17:14:39 +00:00