Commit Graph

162 Commits

Author SHA1 Message Date
Frank Schmirler
bdaea38b86 dropped cServerConnection::m_Pending 2011-10-20 23:45:44 +02:00
Frank Schmirler
6b633dbfa2 the icy-name HTTP header sent with radio streams makes VLC pick the wrong
demuxer. Send icy-name only for ES audio streams (fixes #746)
2011-10-20 23:37:27 +02:00
Frank Schmirler
615f101b9d fixed regression of "live TV must be switched in VDR main thread" change:
deadlock in IGMP streaming server when switching live TV.

Previously cComponentIGMP::Accept did all the work including the channel
switch with the new cConnectionIGMP waiting for MainThreadHook. But as the
new connection is stored *after* Accept, MainThreadHook didn't see it and
so wasn't able to switch. The streamdev main thread waited forever.

Moved the main work into cComponentIGMP::Welcome.
2011-10-18 08:50:54 +02:00
Frank Schmirler
475e7bbd6a updated device selection to code of VDR 1.7.19 2011-09-10 00:04:08 +02:00
Frank Schmirler
4c0888d483 adaption to VDR 1.7.12 cReceiver API change 2011-09-09 23:26:45 +02:00
Frank Schmirler
24a1638ddd increased WRITERBUFSIZE. Has been reported to fix some ringbuffer overflows
(thanks to Lubo¨ Dole¸el)
2011-09-02 13:18:01 +02:00
Frank Schmirler
cc74cba396 check availability of channel if VTP command TUNE is called without prior
PROV call (e.g. client side EPG scan)
2011-09-02 13:11:13 +02:00
Frank Schmirler
2c8377d42a added support for VDR 1.7.19 SignalStrength/SignalQuality 2011-07-06 09:13:50 +02:00
Frank Schmirler
f73665a0bd Server must close the VTP connection also if filter stream is broken
Otherwise, if a client which is not livestreaming (e.g. watching a recording)
doesn't properly shutdown the port 2004 connection, the filter stream remains
open until TCP keepalive takes care of it. In the meantime, the log will show
ringbuffer overflows.
2011-06-03 13:24:12 +02:00
Frank Schmirler
19e8cf2a28 writer must not spend too much time waiting in select() without checking
if the thread has been cancelled.

Delayed the streamdev main thread for up to 3 seconds. As the command timeou
of VTP connections is 1.5 seconds, one hanging connection could have caused
VTP connections to die.
2011-04-11 13:56:49 +02:00
Frank Schmirler
17bb6390f9 Merge branch 'master' of projects.vdr-developer.org:vdr-plugin-streamdev
Conflicts:
	HISTORY
2011-03-18 15:56:34 +01:00
Frank Schmirler
58a4f3dbe5 Added Spanish translation 2011-03-18 15:52:42 +01:00
Frank Schmirler
1a933d6cc9 Merge branch 'switch_livetv'
Conflicts:
	HISTORY
	server/connection.c
2011-03-07 23:06:27 +01:00
Frank Schmirler
c06970123c Live TV must be switched in VDR main thread (fixes #568). 2011-03-07 23:04:18 +01:00
Frank Schmirler
2cb0ba6cf1 Dropped compatibility with VDR < 1.5.16 2011-03-07 22:05:36 +01:00
Frank Schmirler
3a2936a140 updated copy of GetClippedNumProvidedSystems to the version used since VDR 1.7.15 2011-02-01 14:24:47 +01:00
Frank Schmirler
06d5418e42 Fixed the code deciding if a device is in use for live TV or not. It did
not work as expected for FF cards (fixes #536)
2011-01-28 12:42:33 +01:00
Frank Schmirler
316a1f884f connection runs as thread, so it must not use Skins.Message 2011-01-14 17:03:17 +01:00
Frank Schmirler
9fbc166848 Improved channel switch code
- Avoid device allows more efficient code when trying to move live TV to different card
- Added some more dsyslog messages to help debugging channel switch issues
2010-12-14 13:22:55 +01:00
Frank Schmirler
abf8a62fe9 make sure that a client doesn't interrupt replaying on server's FF card
http://www.vdr-portal.de/board/thread.php?postid=948311 (reported by wtor)
2010-12-10 18:06:39 +01:00
Frank Schmirler
a35675490d switching away live TV failed even when "always suspended"
The vdr main loop usually switches back to the previous channel at
"Make sure we have a visible programme in case device usage has changed"
(#472)
2010-12-10 17:03:04 +01:00
Frank Schmirler
0c07109974 fixed regression: no receiver created for ES/PS/PES
(reported by Gavin Hamill)
2010-12-10 16:38:54 +01:00
Frank Schmirler
6ea5efe939 Snapshot 2010-09-15 2011-03-22 21:16:18 +02:00
schmirl
0a860a1e3e don't use std::map.at(). It's not available in older libstdc++ version
Modified Files:
	CONTRIBUTORS HISTORY remux/extern.c server/connectionHTTP.c
2010-07-22 14:18:17 +00:00
schmirl
c0a7f1610a fixed wrong URL path in m3u playlists 2010-07-20 12:26:29 +00:00
schmirl
1a1141e4a1 Switched to proper tsplay-0.2 patch detection
Modified Files:
	server/recplayer.c Makefile CONTRIBUTORS HISTORY
2010-06-04 18:32:34 +00:00
schmirl
7517b874d8 added compatibility with VDR 1.6 tsplay-0.1 patch 2010-05-14 06:23:59 +00:00
schmirl
6f984b87e3 Added support for EnhancedAC3 2010-04-19 10:17:33 +00:00
schmirl
8a128f7c57 fixed a memory leak in cStreamdevPatFilter::GetPid (thanks to lhanisch) 2010-02-20 23:02:10 +00:00
schmirl
2f027a6ffc - length -1 is the correct value for streams in M3U playlists 2010-02-20 22:18:14 +00:00
schmirl
93c9aa9af0 added DELT FORCE option to delete running timers (#554) 2010-01-29 12:03:01 +00:00
schmirl
c882a991cc added VDR 1.7.11 parental rating support for VTP LSTE command (#555) 2010-01-29 11:44:52 +00:00
schmirl
73e30fd5ca silenced warnings concerning asprintf (requested by Rolf Ahrenberg)
Modified Files:
	CONTRIBUTORS HISTORY server/connectionVTP.c server/setup.c
2009-10-13 06:38:47 +00:00
schmirl
ac40edfd24 don't update recordings list on CmdPLAY (reported by BBlack) 2009-09-30 10:10:40 +00:00
schmirl
6da7cf90d9 Added missing trNOOPs 2009-09-18 10:50:44 +00:00
schmirl
1cf41fb16f - cleaned up common.h / common.c
- dropped cStreamdevMenuSetupPage
2009-09-18 10:41:41 +00:00
schmirl
6fb88f8d99 report charset in HTTP replies (suggested by Rolf Ahrenberg) 2009-09-15 10:39:17 +00:00
schmirl
4ab256caea enable PatFilter for externremux, so VLC can be used as remuxer or client 2009-08-05 09:33:13 +00:00
schmirl
d5fa0a49f8 fixed insecure format strings in LSTX handlers 2009-07-17 06:21:23 +00:00
schmirl
41763e7710 removed redefinitions in includes - caused problems in older compilers 2009-07-06 06:23:28 +00:00
schmirl
fe77c5dccb silenced format mismatch warning on 64bit OS 2009-07-03 21:44:18 +00:00
schmirl
dd09bfbb45 improved PARENTALRATING patch detection (thanks to Rolf Ahrenberg) 2009-07-02 06:03:50 +00:00
schmirl
460d5f0689 Missing files from previous commit
Added Files:
	server/recplayer.c server/recplayer.h
2009-07-01 11:00:49 +00:00
schmirl
052a94db5a added XBMC support by extending VTP capabilities (thanks to Alwin Esch)
Modified Files:
	CONTRIBUTORS HISTORY Makefile common.h server/connectionVTP.c
	server/connectionVTP.h
2009-07-01 10:46:15 +00:00
schmirl
7b8e396f77 now there's a common baseclass for all remuxers, make use of it
Modified Files:
	HISTORY remux/ts2pes.c remux/ts2pes.h remux/tsremux.h
	server/livestreamer.c server/livestreamer.h
2009-06-30 06:04:33 +00:00
schmirl
008e7c8510 - added namespace to remuxers
- increased WRITERBUFSIZE - buffer was too small for high bandwidth content
- removed cStreamdevStreamer::m_Running
- eliminated potential busy waits in remuxers
- updated cTSRemux static helpers to code of their VDR 1.6.0 counterparts
- re-enabled PES vor VDR 1.7.3+. Streamdev now uses a copy of VDR 1.6.0's
  cRemux for TS to PES remuxing.
- make sure that only complete TS packets are written to ringbuffers
- use signaling instead of sleeps when writing to ringbuffers
- optimized cStreamdevPatFilter PAT packet initialization
- fixed cStreamdevPatFilter not processing PATs with length > TS_SIZE - 5
- use a small ringbuffer for cStreamdevPatFilter instead of writing to
  cStreamdevStreamers SendBuffer as two threads mustn't write to the same
  ringbuffer

Modified Files:
	CONTRIBUTORS HISTORY Makefile common.c common.h
	streamdev-server.c libdvbmpeg/transform.h remux/extern.c
	remux/extern.h remux/ts2es.c remux/ts2es.h remux/ts2ps.c
	remux/ts2ps.h remux/tsremux.c remux/tsremux.h
	server/connectionHTTP.c server/connectionVTP.c
	server/livestreamer.c server/livestreamer.h server/menuHTTP.c
	server/streamer.c server/streamer.h
Added Files:
	remux/ts2pes.c remux/ts2pes.h
2009-06-19 06:32:38 +00:00
schmirl
3d16ba0840 added comments to indicate that the VTP filter stream is proprietary format
Modified Files:
	client/filter.c server/livefilter.c
2009-02-13 13:02:39 +00:00
schmirl
78410ea576 Added IGMP multicast server
Modified Files:
	CONTRIBUTORS HISTORY Makefile README po/de_DE.po po/fi_FI.po
	po/fr_FR.po po/it_IT.po po/ru_RU.po server/component.c
	server/component.h server/connection.c server/connection.h
	server/livefilter.c server/server.c server/setup.c
	server/setup.h server/streamer.c server/streamer.h
	streamdev/streamdevhosts.conf tools/socket.c tools/socket.h
Added Files:
	patches/vdr-cap_net_raw.diff server/componentIGMP.c
	server/componentIGMP.h server/connectionIGMP.c
	server/connectionIGMP.h
2009-02-13 10:39:20 +00:00
schmirl
c26b89f9c2 ignore trailing blank lines in HTTP requests 2009-02-13 07:02:18 +00:00
schmirl
9af6ceb007 Commented PES for vdr 1.7.3+
Modified Files:
	HISTORY common.c common.h remux/ts2ps.h remux/tsremux.h
	server/connectionHTTP.c server/connectionVTP.c
	server/livestreamer.c server/livestreamer.h server/menuHTTP.c
	server/setup.c
2009-01-16 11:35:43 +00:00
schmirl
ca043780a7 added Network Media Tank browser support to HTML pages (#494) 2008-12-08 11:37:21 +00:00
schmirl
cd8d7fbd6c Compatiblity to Network Media Tank (#496)
- minor fixes of PAT repacker
- repack and send every PAT packet we receive
2008-11-24 12:10:27 +00:00
schmirl
459e41e810 - fixed null pointer in server.c when cConnection::Accept() failes 2008-10-31 12:19:57 +00:00
schmirl
7184adef83 consider Pids from channels.conf when HTTP TS streaming. Section filtering
is an optional feature for VDR devices, so we must not rely on the PMT
alone (#473)
2008-10-31 11:59:48 +00:00
schmirl
c364a3396d - use cThread::Running()/Active() instead of private members
- replaced the last usleep by cCondWait
thanks to Rolf Ahrenberg (#383)
Modified Files:
	CONTRIBUTORS HISTORY server/server.c server/server.h
	server/streamer.c server/streamer.h server/suspend.c
	server/suspend.h
2008-10-22 11:59:31 +00:00
schmirl
4a5af4f489 - fixed output format of some debug messages (thanks to Rolf Ahrenberg) 2008-10-22 11:17:43 +00:00
schmirl
86c82c1381 - added HTTP authentication (#475)
Modified Files:
	HISTORY README streamdev-server.c server/connection.h
	server/connectionHTTP.c server/connectionHTTP.h
	server/server.c server/server.h
2008-10-14 11:05:46 +00:00
schmirl
992444cb67 Compatibility to VDR 1.7.1 (#483) 2008-10-13 11:30:05 +00:00
schmirl
90bae5b011 - added preprocessor directive for ancient gcc 2008-07-16 06:00:48 +00:00
schmirl
685f43c6ec - Fixed assignment of externremux.sh's default location
cPlugin::ConfigDirectory() cannot be used directly after the plugin has
been loaded. The return value of AddDirectory() must be allocated.
2008-04-29 07:00:53 +00:00
schmirl
34a62eb2ef - added gettext support (thanks to Rolf Ahrenberg)
- added vdr-1.6.0-ignore_missing_cam patch
- dropped obsolete respect_ca patch
- removed legacy code for < VDR 1.5.9 (thanks to Rolf Ahrenberg)
2008-04-08 14:18:15 +00:00
schmirl
9c60fb4e42 - changed location of streamdevhosts.conf to VDRCONFDIR/plugins/streamdev
- changed externremux.sh's default location to VDRCONFDIR/plugins/streamdev
- added sample externremux.sh from http://www.vdr-wiki.de/
- stop providing channels after client has been disabled at runtime
- added logging of the client device's card index
- changed default suspend mode to "Always suspended"
- added "Hide Mainmenu Entry" setup option on client
2008-04-07 14:50:32 +00:00
schmirl
f51d6eb2df - removed legacy code for pre VDR 1.4
- dropped patches for pre VDR 1.4
2008-04-07 14:27:27 +00:00
schmirl
57923c656e Missing files 2008-03-28 15:13:11 +00:00
schmirl
b66bf7a698 Rewrite of http menu (#439)
Including
- m3u playlists by Petri Hintukainen (#254)
- way to pass parameters to externremux by Rolf Ahrenberg
- using host header for absolute URLs for better DNAT / Reverse Proxy support
2008-03-28 15:11:40 +00:00
schmirl
21da96308d Make sure that a FilterStreamer is only started if client supports it
(#261)
Modified Files:
	client/socket.c server/connectionVTP.c server/connectionVTP.h
2008-03-13 16:01:17 +00:00
schmirl
e54f9e4fbe Add EIT into TS stream (#442) 2008-03-13 14:10:17 +00:00
schmirl
efeac825cc FreeBSD compatibility (#435)
Modified Files:
	Makefile common.h libdvbmpeg/ctools.c server/connectionVTP.c
	tools/socket.c
2008-03-12 09:36:27 +00:00
schmirl
eb6fbd3bbe TS PAT repacker for streamtype TS. The PAT shoudln't refer to PMTs we don't
transmit. Particularely causes problems with some settop boxes.

Thanks to Rolf Ahrenberg (#309)
2008-02-22 12:02:48 +00:00
schmirl
713c0564b7 VTP now also supports PS, PES and EXTERN.
Request for PS by mpanczyk for MTPCenter (#341)
Modified Files:
	server/connectionVTP.c server/connectionVTP.h
2007-09-21 12:45:31 +00:00
schmirl
17ff4d32e8 High load when client isn't accepting data fast enough. Bug report and
fix by Olli Lammi (#382).
2007-09-21 11:45:53 +00:00
schmirl
bb1ac54c87 Set DSCP 41 on stream data packets. WMM capable WLAN accesspoints
should understand this and give precedence. For Internet streaming
it could be used by traffic shapers. Suggested by ollo@vdrportal (#237).
Modified Files:
	server/connectionHTTP.c server/connectionVTP.c tools/socket.c
	tools/socket.h
2007-05-09 09:12:42 +00:00
schmirl
2b103196d6 Check vasprintf return code (thanks to rofafor) 2007-05-07 12:25:11 +00:00
schmirl
7fdf0c6832 Fixed memory leak in buffer overflow situation (thanks to rofafor) 2007-05-07 11:43:23 +00:00
schmirl
8378d5a17c Removed duplicated code fragments probably caused by patches with too
few context lines
2007-04-26 06:25:13 +00:00
schmirl
fdda49c9f3 server_live-filter_remove_setfilter.patch by Petri Hintukainen
- remove (now unused) cStreamdevLiveStreamer::SetFilter()
Modified Files:
	server/livestreamer.c server/livestreamer.h
2007-04-24 11:42:41 +00:00
schmirl
d012504c3a server_connectionVTP-add-filter-stream.patch by Petri Hintukainen
- Add new stream for section filters data
2007-04-24 11:40:35 +00:00
schmirl
9994ecfd08 server_live-filter-streamer.patch by Petri Hintukainen
- Add cStreamdevFilterStreamer that is binded to current device, not channel
- new streamer can exist even when there is no active data connection (live view)
Modified Files:
	server/livestreamer.c server/livestreamer.h
2007-04-24 11:36:16 +00:00
schmirl
99d19c67d8 server_livefilter-add_public_Add_and_Del.patch by Petri Hintukainen
- Add public Add/Del members instead of friend class
2007-04-24 11:29:29 +00:00
schmirl
52bf110aa9 server_ts-pat-pmt-filter.patch by Petri Hintukainen
- Add PAT, PMT and PCR to HTTP TS streams
- Dynamically add and remove all related pids (of channel) to TS stream
 -> DVB/teletect subtitles work in clients
 -> VLC can be used as client
 -> HDTV (MPEG4 / H.264) streaming is possible
 -> Client can select audio and subtitle tracks on the fly without re-connection -> Client can display "real" track names / languages

 - Add new member function to set all pids in one shot
  -> Receiver is not deleted, created and re-attached separately for every pid
   (this causes discontinous start and is anyway unnecessarily)

Modified Files:
	server/livestreamer.c server/livestreamer.h
2007-04-24 11:13:05 +00:00
schmirl
2e7fe3c337 server_livefilter-add_ts_pusi_flag.patch by Petri Hintukainen
- Add MPEG TS PUSI (payload start indicator) to first
  packet of each section
2007-04-24 11:06:12 +00:00
schmirl
a0dfe7b20a server_connectionVTP-new-data.patch by Petri Hintukainen
- Add new data (LiveFilterStreamer and LiveFilterSocket)
- Misc cleanup
Modified Files:
	server/connectionVTP.c server/connectionVTP.h
2007-04-24 11:03:41 +00:00
schmirl
d5a38b3213 client_device-vdr-1.5.1-fixes.patch by Petri Hintukainen (#219)
- VDR 1.5.0 calls some device members in different order and
  streamdev can't currently handle this.
- do not trust in OpenDvr/CloseDvr, instead keep count of active PIDs,
  open data connection when it is needed and close it only when there
  are no active PIDs
  (closing data connection unsubscribes all pids at server end)
- some sanity checks on server side
Modified Files:
	client/device.c client/device.h server/connectionVTP.c
2007-04-24 10:43:40 +00:00
schmirl
0553fce43c based on server_livefilter-streamer-type.patch by Petri Hintukainen
- Use cStreamer (base class) instead of cLiveStreamer
  (no need to know streamer type)
  * works with cLiveStreamer and cLiveFilterStreamer
  * avoid circular dependency
- visibility of cStreamdevLiveReceiver: Moved from livestreamer.h -> .c
Modified Files:
	server/livefilter.c server/livefilter.h server/livestreamer.c
	server/livestreamer.h
2007-04-23 15:44:55 +00:00
schmirl
3ceb716ea9 Use compiler flag -Wall. Cleanup code as necessary.
(#171 Thanks to Rolf Ahrenberg)
Modified Files:
	Makefile streamdev-server.c server/connection.h
	server/connectionHTTP.c server/connectionVTP.c tools/source.c
2007-04-16 11:01:02 +00:00
schmirl
525574f9b0 Close connection when client is gone. Fixes high CPU load problem (#201)
Modified Files:
	server/connection.h server/connectionHTTP.h
	server/connectionVTP.h server/server.c server/streamer.c
	server/streamer.h tools/select.c tools/select.h tools/source.c
2007-04-02 10:32:34 +00:00
schmirl
cd7d4e3588 Silence warning about overloaded namespace (#244, thanks to rofafor) 2007-03-19 12:06:13 +00:00
schmirl
1e9e200e8a Fixed null pointers 2007-03-02 15:27:07 +00:00
schmirl
335660b62c API changes of VDR 1.5.0 (#219)
Modified Files:
	server/connection.c server/livestreamer.c
	server/livestreamer.h
2007-01-15 12:00:19 +00:00
schmirl
11f4a0c6e1 Use select with timeout and check if streamdev-server has to shutdown
(#135). Thanks to Urig@vdrportal
2006-11-10 11:52:41 +00:00
schmirl
610719625a Re-enabled logging for the Detach()/Attach() issue which is still under observation 2006-09-14 10:38:22 +00:00
thomas
01752a66d6 Auskommentiertes Attach/Detach wieder aktiviert.
Kartenblockade wird dadurch behoben und alle Channels lassen sich anzappen, Unbedenklichkeit ist aber nicht einwandfrei geklärt!
2006-07-05 20:39:19 +00:00
lordjaxom
bf29388e02 - fixed http error response 2006-01-26 19:40:18 +00:00
lordjaxom
8634d82123 - added class forward declaration for gcc >= 4.0 2005-11-07 19:28:41 +00:00
lordjaxom
66b69f4281 - fixed missing include 2005-05-09 20:30:38 +00:00
lordjaxom
450c8fd4a7 - added TS compatibility mode 2005-05-09 20:22:29 +00:00
lordjaxom
3eec47314d - deleting whole block instead of fractions now 2005-04-30 19:41:08 +00:00
lordjaxom
32c1bf7c8b - fixed wrong remux usage 2005-04-30 14:59:56 +00:00
lordjaxom
4f85a010cd - next try :-) (locking problem) 2005-04-27 19:43:09 +00:00
lordjaxom
11dd989dfb - protected cStreamer::Stop() from being called concurrently 2005-04-27 17:55:43 +00:00