summaryrefslogtreecommitdiffstats
path: root/stream/tvi_dshow.c
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: tvi_dshow: add "static", fix printf formatdiego2011-07-061-9/+16
| | | | | | | | | | | | | tvi_dshow: Mark functions not used outside of the file as static. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33706 b3059339-0415-0410-9bf9-f77b7e298cf2 tvi_dshow: Adjust mp_msg printf conversion specifier to avoid warnings stream/tvi_dshow.c:2807: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int' stream/tvi_dshow.c:2821: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33710 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: don't check for NULL before free()diego2010-11-081-13/+7
| | | | | | patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/tv: move new_handle() function from header to tv.cdiego2010-11-021-1/+1
| | | | | | | Move TV input new_handle static function to tv.c and make it non-static. There is no need to duplicate the function in the binary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32225 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/tv: move free_handle() from header to tv.cdiego2010-11-021-4/+4
| | | | | | | Move TV input free_handle static function to tv.c and make it non-static. There is no need to duplicate the function in the binary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32174 b3059339-0415-0410-9bf9-f77b7e298cf2
* tv.h: Change function pointer types to proper declarationsreimar2010-11-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31388 b3059339-0415-0410-9bf9-f77b7e298cf2 Note that the code is still questionable after this commit - the shared data structure has pointers to "struct priv", but different files use different incompatible definitions for that struct.
* Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* Merge svn changes up to r30748Uoti Urpala2010-03-101-11/+10
|\
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-261-11/+10
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r30375Uoti Urpala2010-01-251-38/+79
|\|
| * Add hack to fix tvi_dshow compilation with 64-bit MinGWreimar2010-01-171-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30347 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change GUID declarations in tvi_dshow so they are not exported and thusreimar2010-01-171-38/+76
| | | | | | | | | | | | | | will not cause clashes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30342 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30173Uoti Urpala2010-01-081-0/+5
|\|
| * Several hacks to fix compilation of tvi_dshow on MinGW64.reimar2010-01-021-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-16/+6
|\|
| * Remove CONFIG_TV_TELETEXT.cehoyos2009-11-071-12/+0
| | | | | | | | | | | | | | | | 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
| * Separate teletext from tv support.cehoyos2009-11-071-3/+4
| | | | | | | | | | | | | | Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some pathscehoyos2009-10-291-1/+1
| | | | | | | | | | | | | | | | | | in comments. Based on a patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29802 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move teletext specific code from stream into libmpcodecs.cehoyos2009-10-291-0/+1
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-44/+44
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-44/+44
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-42/+42
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-42/+42
|/ | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* Replace double semicolon by single semicolon.diego2009-02-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function, fixes the warning:diego2008-10-131-46/+0
| | | | | | | 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
* Add debug message about loaded frequency tables.voroshil2008-09-241-1/+2
| | | | | | | | | 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
* Make output messages of frequency selection code more useful byvoroshil2008-09-241-2/+4
| | | | | | | | | | 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
* Fix overflow in frequency conversion code inside tvi_dshow.voroshil2008-09-241-2/+2
| | | | | | | 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
* Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-7/+7
| | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove useless parentheses from return statements.diego2008-05-161-18/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26788 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use standard license headers with standard formatting.diego2008-05-141-20/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26769 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make all tvi_info_t constreimar2008-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25717 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r25089 (Ignore video formats which are supported by devicevoroshil2007-11-241-14/+3
| | | | | | | | | | | | | | 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
* Move requested format at top and shift all oters downvoroshil2007-11-241-8/+11
| | | | | | | | | 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
* Сreate empty format arrays in case of error in init_chain_common.voroshil2007-11-241-6/+27
| | | | | | | | | 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
* Compilation fix (typo)voroshil2007-11-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25133 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sizes of arpmt and arStreamCaps must be equal.voroshil2007-11-211-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25124 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move code related to chain initialization and similarvoroshil2007-11-201-80/+78
| | | | | | | | for different chains to separate routine. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25122 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix mplayer crash caused by r25116voroshil2007-11-201-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25121 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove no more needed checkvoroshil2007-11-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25118 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix totally wrong (due to mess of brackets) structures size check.voroshil2007-11-201-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25117 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace several parameters for get_available_formats_streamvoroshil2007-11-201-60/+24
| | | | | | | and get_available_formats_pin with one chain structure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25116 b3059339-0415-0410-9bf9-f77b7e298cf2
* New routine for reconnecting two pins with new media typevoroshil2007-11-191-23/+68
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25115 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move pointer to SampleGrabber filter into chain structure.voroshil2007-11-191-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25114 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common chain uninit code into separate routine.voroshil2007-11-191-52/+38
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25113 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass chain structure instead of several variables to build_sub_graphvoroshil2007-11-191-18/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25112 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix missed changevoroshil2007-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25111 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add capture filter's pointer to vbi chain structure too.voroshil2007-11-191-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25110 b3059339-0415-0410-9bf9-f77b7e298cf2
* Code unification: get rid of local variable arpmtVBIvoroshil2007-11-191-4/+11
| | | | | | | | and use chain structure's arpmt member. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25109 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add major media type to chain structurevoroshil2007-11-191-6/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25108 b3059339-0415-0410-9bf9-f77b7e298cf2
* One step of code cleanup: move all variables, relatedvoroshil2007-11-191-204/+221
| | | | | | | | | 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
* 100l: Fix long standing copy-paste error:voroshil2007-11-191-1/+1
| | | | | | | 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
* Add all passed to VID_SET_FORMAT formats to the end ofvoroshil2007-11-181-2/+27
| | | | | | | | | | | | | | | | 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
* Ensure that when VID_GET_FORMAT ioctl is called,voroshil2007-11-181-0/+5
| | | | | | | | | | 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
* (cosmetics) Indentation fix of previous commit.voroshil2007-11-181-11/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25094 b3059339-0415-0410-9bf9-f77b7e298cf2
* New media format negotiation code:voroshil2007-11-181-2/+14
| | | | | | | | | | | | | | 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
* Move setting media format code voroshil2007-11-181-7/+6
| | | | | | | closer to connection establishment routine. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25092 b3059339-0415-0410-9bf9-f77b7e298cf2
* Pass all available formats to chain building routine andvoroshil2007-11-181-18/+30
| | | | | | | | | | | | | | | | 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
* Ignore video formats which are supported by devicevoroshil2007-11-181-3/+14
| | | | | | | | but not supported by dshow driver. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25089 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash when pin connection fails.voroshil2007-11-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25088 b3059339-0415-0410-9bf9-f77b7e298cf2
* Prevent chains from building more than once.voroshil2007-11-181-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25087 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle "out of memory" error.voroshil2007-11-181-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25086 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move chains building code into separate routines.voroshil2007-11-181-18/+71
| | | | | | | | | 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
* (cosmetics) Lookup table alignment.voroshil2007-11-171-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25082 b3059339-0415-0410-9bf9-f77b7e298cf2
* Service routine for constructing AM_MEDIA_TYPE structure from voroshil2007-11-171-0/+47
| | | | | | | | given fourcc with help of lookup table. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25081 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable terminating directshow chains with NullRenderer filter,voroshil2007-11-171-0/+7
| | | | | | | | bacause this causes jerky video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25080 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix bogus bits per pixel values in lookup table.voroshil2007-11-171-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25079 b3059339-0415-0410-9bf9-f77b7e298cf2
* (cosmetics) Indentation fixvoroshil2007-11-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25076 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure that mplayer will receive actual media typevoroshil2007-11-161-0/+13
| | | | | | | instead of requested value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25057 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix FPS from bitrate calculation (was 8 times larger than real value)