Commit Graph

42 Commits

Author SHA1 Message Date
iive 860e66818b stream/tvi_v4l[2]: fix calculation of free RAM for buffers
Do a proper calculation of free RAM to be used as V4L buffers.
The code uses sysinfo to query the available RAM, however it used
ancient form available in some early development 2.3.x kernels.
Newer form reports the size in memory units (usually same as page size),
as result the code would fall back on 2 buffers even on multi GB system.

The commit does: Improve the check in configure to ensure that we
do use sysinfo struct with present mem_unit. Use free RAM instead of
total RAM (to avoid swapping). Tweak memory constants and simplify code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33732 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 13:01:08 +03:00
diego 12d3e0df99 cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
reimar db90a65d11 Remove remaining %lf printf conversions
Most cases are just code in comments.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32438 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego 8939645dcf stream/tv: move new_handle() function from header to tv.c
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
2010-11-02 04:16:55 +02:00
diego a64cd8d3c8 stream/tv: move free_handle() from header to tv.c
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
2010-11-02 04:16:46 +02:00
siretart 2e6ff523dd spelling fixes
Found by the Debian QA tool 'lintian'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2

reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:03 +02:00
reimar 7bc5b0253f tv.h: Change function pointer types to proper declarations
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.
2010-11-02 04:07:42 +02:00
Uoti Urpala 12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
diego 59e26907b6 Add license header to all files missing it in the stream subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30468 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 22:26:47 +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
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
cehoyos 423c415534 Separate teletext from tv support.
Path by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:31:05 +00:00
cehoyos 9df11ee8bf Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some paths
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
2009-10-29 22:39:00 +00: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 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 024b6efdf1 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
Use it in all the places that checked for either ALSA 0.9 or 1.x.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 23:19:29 +00:00
diego f83e779ee4 Rename some audio-output-related preprocessor directives.
Switch them from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 16:32:47 +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
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
uau b5aa5692cd Remove unnecessary <signal.h> includes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25654 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-09 01:17:49 +00:00
voroshil 803d454576 Simplify handling SET_NORM for V4l1: replace several if-else-if and switch
statements with one lookup table;



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24817 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-20 11:46:15 +00:00
voroshil 39e5906704 After receiving EINTR 'read' syscall should be restarted.
Fixes receiving teletext on some systems.

Modified patch from Oldrich Jedlicka oldium dot pro at aenam dot cz



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24791 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-16 01:53:34 +00:00
voroshil dde6ba8352 Fix mplayer segfault when v4l driver initialization (at setting norm
stage) failed.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24787 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-14 17:56:29 +00:00
voroshil f1fbca4bdd Automatic TV channels scanning ability for MPlayer.
Code is based on patch from Otvos Attila oattila at chello dot hu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24125 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-23 16:09:30 +00:00
voroshil 8ff547240b Teletext support for V4Lv1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23946 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 18:00:11 +00:00
voroshil aae0e9dcde 10l: wrong pointer was initialized (causes crash during startup).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23945 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-30 17:31:54 +00:00
voroshil 7b4a1214ed Removing global variables from tv://
Step 4: removing references to old globals from tvi_v4l.c



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23905 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 10:21:00 +00:00
voroshil 7cdc5ad4fe Removing global variables from tv://
Step 2: fixing tv subdrivers initialization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23903 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 10:18:38 +00:00
voroshil 128ff990e9 Remove unnecessary flip for RGB in v4l1.
Patch was provided and tested by Trent Piepho xyzzy at speakeasy dot org.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23744 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-08 13:30:33 +00:00
reimar 6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
voroshil eb5bf3b88e New "automute" tv:// option.
Will switch off sound and show blue screen instead of video with noise
when signal level (in 0-255 scale) is less than specified value.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23440 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-31 17:49:51 +00:00
voroshil 709aa5eb74 make v4l1 driver work properly.
v4l1 API docs says that VIDIOCSWIN (picture size) and VIDIOCSPICT (pixel format) 
should be called before VIDIOCGMBUF ioctl call.

patch by Trent Piepho xyzzy at speakeasy dot org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23372 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-21 17:00:08 +00:00
voroshil 4f6225aaa7 typo fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23168 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-29 00:03:19 +00:00
voroshil 7ed8a368d8 (cosmetics) more indentation fixes.
patch from Trent Piepho xyzzy at speakeasy dot org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23167 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-28 23:41:11 +00:00
diego 3af0ad0432 cosmetics: Fix one more stray wrongly indented line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-28 14:27:15 +00:00
diego e42b714cb1 cosmetics: Remove all trailing whitespace and tabs, indentation fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23159 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-28 14:20:44 +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
voroshil e1704a4877 tv driver loading rework. As a side effect "-tv driver=help" option is
implemented.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-01 18:38:00 +00:00
henry 3a0f1fa219 changed email address
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20662 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 10:21:52 +00:00
diego 77b4259600 Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19437 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 13:58:03 +00:00
ben 49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00