Commit Graph

57 Commits

Author SHA1 Message Date
Marcin Kurczewski f43017bfe9 Update license headers
Signed-off-by: wm4 <wm4@nowhere>
2015-04-13 12:10:01 +02:00
wm4 54a4a25fe9 tv: move demuxer parts to separate file
Now all demuxer implementations (at least demuxer API-wise) are in the
demux directory.
2014-07-05 17:07:15 +02:00
wm4 fcf9bb95b5 tv: remove printing of useless comment information 2014-06-11 00:34:42 +02:00
wm4 383cf20785 tv: remove global option variables
Pretty much nothing changes, but using -tv-scan with suboptions doesn't
work anymore (instead of "-tv-scan x" it's "-tv scan-x" now). Flat
options ("-tv-scan-x") stay compatible.
2014-06-11 00:34:42 +02:00
wm4 e033f3c8bc command: redo ancient TV/DVB/PVR commands
Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.

Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.

In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.

Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.

Mostly untested, due to lack of hardware.
2014-06-11 00:34:41 +02:00
wm4 78128bddda Kill all tabs
I hate tabs.

This replaces all tabs in all source files with spaces. The only
exception is old-makefile. The replacement was made by running the
GNU coreutils "expand" command on every file. Since the replacement was
automatic, it's possible that some formatting was destroyed (but perhaps
only if it was assuming that the end of a tab does not correspond to
aligning the end to multiples of 8 spaces).
2014-04-13 18:03:01 +02:00
wm4 3dbc9007b0 demux: mp_msg conversions
The TV code pretends to be part of stream/, but it's actually demuxer
code too. The audio_in code is shared between the TV code and
stream_radio.c, so stream_radio.c needs a small hack until stream.c is
converted.
2013-12-21 21:43:16 +01:00
wm4 53d3827843 Remove sh_audio->samplesize
This member was redundant. sh_audio->sample_format indicates the sample
size already.

The TV code is a bit strange: the redundant sample size was part of the
internal TV interface. Assume it's really redundant and not something
else. The PCM decoder ignores the sample size anyway.
2013-11-09 23:32:58 +01:00
wm4 cb45b1c65b Cleanup some include statements 2013-07-12 22:16:26 +02:00
Martin Herkt 1a8ab1d6ad stream/tv: remove unused dshow-specific options 2013-07-08 18:02:46 +02:00
wm4 4873b32c59 Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include
statements to make the previous commit compile.

The two commits are separate, because git is bad at tracking renames
and content changes at the same time.

Also take this as an opportunity to remove the separation between
"common" and "mplayer" sources in the Makefile. ("common" used to be
shared between mplayer and mencoder.)
2012-11-12 20:08:18 +01:00
wm4 ebaaa41f2a Remove teletext support
Teletext requires special OSD support. Because I can't even test
teletext, I can't restore support for it. Since teletext can be
considered ancient and obscure, and since it doesn't make sense to keep
the remaining teletext code without being able to use it, I'm removing
it.
2012-08-03 00:12:46 +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
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
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 631d5f1f84 Replace two more occurences of tvi_vbi with dec_teletext.
Patch by Francesco Lavra, francescolavra interfree it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29808 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-31 15:30:56 +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
cehoyos 6a101a97f9 Fix file information. Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29521 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 23:41:35 +00:00
cehoyos 4112165879 Add missing major contributors to copyright statement.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29520 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 23:33:56 +00:00
cehoyos c8bbeea3b2 Add standard GPL license header. Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29468 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:50:24 +00:00
cehoyos 35b86231c2 Fix more typos. Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29467 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:44:12 +00:00
cehoyos 463ac707c1 Remove unused include's. Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29466 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:41:15 +00:00
cehoyos 7fd95348fe Fix typos. Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29465 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:38:18 +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
reimar b397b28b31 Add TVI_CONTROL_VID_SET_WIDTH_HEIGHT to set width and height together for v4l2,
otherwise some drivers will always stay stuck in the lowest resolution.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28975 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-16 17:12:29 +00:00
voroshil 5fc5e26c3b Ability for specifying TV standard individually for each TV channel.
Slightly modified patch by Ildar devel at pop3 dot ru



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27057 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-14 09:14:16 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
reimar e351bee5a9 tvi_functions_t should be const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25712 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 11:48:56 +00:00
voroshil 2585d1e148 #ifdef's in tv.c and tv.h becomes more and more hard to maintain.
I've decided to remove all of them and control options only through cfg-common.h



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24786 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-14 16:44:32 +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
voroshil fdb78c2bea Implement setting gain control for video devices (usually webcams)
in v4l2 tv:// driver.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24573 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-18 16:28:39 +00:00
voroshil 641a7ddabd Implement boxes for subtitle teletext pages.
Text is shown in opaque boxes inside transparent
teletext page.




git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24364 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-08 09:48:43 +00:00
voroshil 67276cc8cd Decrease teletext page rendering frequency from 1/frame to about 4/sec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24362 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-08 03:06:23 +00:00
voroshil b61657c12c Proper support for flashing chars in teletext pages.
Patch from Otvos Attila oattila at chello dot hu



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24312 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 01:22:30 +00:00
voroshil 374e9dd5ba Support for selecting language via packet 28.
Also  allows to select default teletext language.
It will be used if language is not specified by network provider
via packet 28.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24310 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-31 16:53:27 +00:00
voroshil c4debc9042 Implement X/27/0 packet decoding.
It contains information about navigation links.

Modified patch from Otvos Attila oattila at chello dot hu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24264 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 14:10:47 +00:00
voroshil fb7d88d344 Implement 8/30 format 1 teletext packet decoding
It contains network id, network name, current date and time.

patch from Otvos Attila oattila at chello dot hu



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24252 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 02:37:48 +00:00
voroshil 0f559826b0 Enable decoding of packet X/24, it is usual teletext line
and contains labels for navigation links.
10l: fix comments for constants.

patch from Otvos Attila oattila at chello dot hu



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24203 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-26 04:56:37 +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
diego 5fe4c90509 Fix compilation on BSD.
patch by Bernd Ernesti, mplayer-dev-eng lists.veego de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24054 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-13 17:41:56 +00:00
voroshil 4f0d56b9ae Teletext support.
Part 2/5: options/slaves/configure/definitions/etc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23920 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 17:55:28 +00:00
voroshil db734dcc15 Removing global variables from tv://
Step 8 (last): removing old globals from tv.c, tv.h,
fixing remaining references in cfg-common.h and mplayer.c



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23909 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 10:30:41 +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 b7adae655f Removing global variables from tv://
Step 1: introducing new structure, fixing tv:// stream



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23902 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 10:11:24 +00:00
voroshil 487d4927e2 Removing forward declarations of routines used only in tv.c
Marking above routines as static
Removing unfaithful comment



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23901 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 03:55:12 +00:00
diego 93847cc5fc Remove unnecessary #ifdef around the whole file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23756 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 20:40:47 +00:00
voroshil 2f76cfc28a Revert r23530.
r23530 breaks policy: notification was not sent to mailing list,
agreements of other devs were not received.
Code also should be reviewed/cleaned up/fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-21 08:18:51 +00:00
voroshil 83a2c50ef9 Teletext support for tv:// (v4l and v4l2 only)
modified patch from Otvos Attila oattila at chello dot hu

Module uses zvbi library for all low-level  VBI operations (like I/O with vbi
device, converting vbi pages into usefull vbi_page stuctures, rendering them
into RGB32 images).

All teletext related stuff (except properties, slave commands and rendering
osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented
in tvi_vbi.c

New properties:
teletext_page - switching between pages
teletext_mode - switch between on/off/opaque/transparent modes
teletext_format - (currently read-only) allows to get format info
(black/white,gray,text)
teletext_half_page - trivial zooming (displaying top/bottom half of teletext
page)

New slave commands:
teletext_add_dec - user interface for jumping to any page by editing page number
interactively
teletext_go_link - goes though links, specified on current page



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 00:06:12 +00:00
voroshil f619fb233b Fix compiler warnings.
Remove unused tv_param_on variable.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23505 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-08 06:08:51 +00:00