From e0a00f90aece9cfc54f3d5a1d9098fa29d9dc468 Mon Sep 17 00:00:00 2001 From: Frank Schmirler Date: Thu, 2 Dec 2010 09:51:02 +0100 Subject: [PATCH] Streamdev 0.5.0 --- CONTRIBUTORS | 7 +++++++ HISTORY | 14 ++++++++++++++ Makefile | 2 +- client/Makefile | 2 +- client/streamdev-client.c | 2 +- client/streamdev-client.h | 2 +- common.c | 4 ++-- common.h | 2 +- libdvbmpeg/Makefile | 2 +- remux/Makefile | 2 +- server/Makefile | 2 +- server/connection.c | 2 +- server/connection.h | 2 +- server/connectionHTTP.c | 4 ++-- server/connectionHTTP.h | 2 +- server/connectionIGMP.c | 2 +- server/connectionVTP.c | 2 +- server/setup.c | 2 +- server/setup.h | 2 +- server/streamdev-server.c | 2 +- server/streamdev-server.h | 2 +- server/streamer.c | 2 +- server/streamer.h | 2 +- streamdev-server/externremux.sh | 23 +++++++++++------------ tools/Makefile | 2 +- 25 files changed, 56 insertions(+), 36 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 6d709d2..2e8d5e3 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -150,3 +150,10 @@ Eric Valette carel for reporting "plugin doesn't honor APIVERSION" error in new Makefile + for helping to find a way to cleanly shutdown externremux with mencoder + +wolfi.m + for reporting a typo in externermux quality parameter value + +Norman Thiel + for reporting a wrong URL path in m3u playlists diff --git a/HISTORY b/HISTORY index d6fe6db..3ca77bc 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,20 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +2010-07-20: Version 0.5.0b + +- fixed wrong URL path in m3u playlists (reported by Norman Thiel) + +2010-07-20: Version 0.5.0a + +- set externremux.sh executable in distribution archive +- externremux quality value should be wlan54, not wlan45 (reported by + wolfi.m@vdrportal) + +2010-07-19: Version 0.5.0 + +- using SIGINT in externremux to kill mencoder works better than SIGTERM; + especially x264 still needs a SIGKILL sometimes - added --remove-destination to cp commands installing plugins - fixed "plugin doesn't honor APIVERSION" (reported by carel@vdrportal) - updated Italian translation (thanks to Diego Pierotto) diff --git a/Makefile b/Makefile index aee80df..2ead512 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.21.2.2 2010/06/20 19:11:15 schmirl Exp $ +# $Id: Makefile,v 1.22 2010/07/19 13:49:24 schmirl Exp $ # The main source file name. # diff --git a/client/Makefile b/client/Makefile index 204053f..ecc4787 100644 --- a/client/Makefile +++ b/client/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.1.2.2 2010/06/20 19:12:56 schmirl Exp $ +# $Id: Makefile,v 1.2 2010/07/19 13:49:25 schmirl Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. diff --git a/client/streamdev-client.c b/client/streamdev-client.c index 79c3d74..b03fbbe 100644 --- a/client/streamdev-client.c +++ b/client/streamdev-client.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: streamdev-client.c,v 1.1.2.1 2010/06/14 10:40:11 schmirl Exp $ + * $Id: streamdev-client.c,v 1.2 2010/07/19 13:49:25 schmirl Exp $ */ #include "streamdev-client.h" diff --git a/client/streamdev-client.h b/client/streamdev-client.h index 07befe3..0972dcc 100644 --- a/client/streamdev-client.h +++ b/client/streamdev-client.h @@ -1,5 +1,5 @@ /* - * $Id: streamdev-client.h,v 1.1.2.1 2010/06/14 10:40:11 schmirl Exp $ + * $Id: streamdev-client.h,v 1.2 2010/07/19 13:49:25 schmirl Exp $ */ #ifndef VDR_STREAMDEVCLIENT_H diff --git a/common.c b/common.c index 953b644..3ad290b 100644 --- a/common.c +++ b/common.c @@ -1,5 +1,5 @@ /* - * $Id: common.c,v 1.11.2.1 2010/06/08 07:47:45 schmirl Exp $ + * $Id: common.c,v 1.12 2010/07/19 13:49:24 schmirl Exp $ */ #include @@ -10,7 +10,7 @@ using namespace std; -const char *VERSION = "0.5.0-rc2"; +const char *VERSION = "0.5.0"; const char cMenuEditIpItem::IpCharacters[] = "0123456789."; diff --git a/common.h b/common.h index a8830bd..12025f5 100644 --- a/common.h +++ b/common.h @@ -1,5 +1,5 @@ /* - * $Id: common.h,v 1.15.2.1 2010/06/11 06:06:01 schmirl Exp $ + * $Id: common.h,v 1.16 2010/07/19 13:49:24 schmirl Exp $ */ #ifndef VDR_STREAMDEV_COMMON_H diff --git a/libdvbmpeg/Makefile b/libdvbmpeg/Makefile index 481d9c9..71e1c5d 100644 --- a/libdvbmpeg/Makefile +++ b/libdvbmpeg/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.3.4.1 2010/06/14 10:40:13 schmirl Exp $ +# $Id: Makefile,v 1.4 2010/07/19 13:49:26 schmirl Exp $ ### The object files (add further files here): diff --git a/remux/Makefile b/remux/Makefile index 8adfb89..89cf4fd 100644 --- a/remux/Makefile +++ b/remux/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.1.2.1 2010/06/14 10:40:18 schmirl Exp $ +# $Id: Makefile,v 1.2 2010/07/19 13:49:28 schmirl Exp $ ### The object files (add further files here): diff --git a/server/Makefile b/server/Makefile index 7d46645..8f512ac 100644 --- a/server/Makefile +++ b/server/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.1.2.2 2010/06/20 19:12:56 schmirl Exp $ +# $Id: Makefile,v 1.2 2010/07/19 13:49:31 schmirl Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. diff --git a/server/connection.c b/server/connection.c index 6121b7a..956c42a 100644 --- a/server/connection.c +++ b/server/connection.c @@ -1,5 +1,5 @@ /* - * $Id: connection.c,v 1.13.2.1 2010/06/11 06:06:02 schmirl Exp $ + * $Id: connection.c,v 1.14 2010/07/19 13:49:31 schmirl Exp $ */ #include "server/connection.h" diff --git a/server/connection.h b/server/connection.h index dfaff91..ff5ee98 100644 --- a/server/connection.h +++ b/server/connection.h @@ -1,5 +1,5 @@ /* - * $Id: connection.h,v 1.8.2.1 2010/06/11 06:06:02 schmirl Exp $ + * $Id: connection.h,v 1.9 2010/07/19 13:49:31 schmirl Exp $ */ #ifndef VDR_STREAMDEV_SERVER_CONNECTION_H diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c index b963d64..028b9ea 100644 --- a/server/connectionHTTP.c +++ b/server/connectionHTTP.c @@ -1,5 +1,5 @@ /* - * $Id: connectionHTTP.c,v 1.17.2.1 2010/06/11 06:06:02 schmirl Exp $ + * $Id: connectionHTTP.c,v 1.19 2010/07/20 12:26:29 schmirl Exp $ */ #include @@ -336,7 +336,7 @@ bool cConnectionHTTP::ProcessURI(const std::string& PathInfo) Dprintf("before channelfromstring: type(%s) filespec(%s) fileext(%s)\n", type.c_str(), filespec.c_str(), fileext.c_str()); - if ((m_ChannelList = ChannelListFromString(PathInfo.substr(0, file_pos), filespec.c_str(), fileext.c_str())) != NULL) { + if ((m_ChannelList = ChannelListFromString(PathInfo.substr(1, file_pos), filespec.c_str(), fileext.c_str())) != NULL) { Dprintf("Channel list requested\n"); return true; } else if ((m_Channel = ChannelFromString(filespec.c_str(), &m_Apid[0], &m_Dpid[0])) != NULL) { diff --git a/server/connectionHTTP.h b/server/connectionHTTP.h index 1ea6ed2..56f89b0 100644 --- a/server/connectionHTTP.h +++ b/server/connectionHTTP.h @@ -1,5 +1,5 @@ /* - * $Id: connectionHTTP.h,v 1.6.2.1 2010/06/11 06:06:02 schmirl Exp $ + * $Id: connectionHTTP.h,v 1.7 2010/07/19 13:49:31 schmirl Exp $ */ #ifndef VDR_STREAMDEV_SERVERS_CONNECTIONHTTP_H diff --git a/server/connectionIGMP.c b/server/connectionIGMP.c index 7ea7e11..50db15b 100644 --- a/server/connectionIGMP.c +++ b/server/connectionIGMP.c @@ -1,5 +1,5 @@ /* - * $Id: connectionIGMP.c,v 1.1.4.1 2010/06/11 06:06:02 schmirl Exp $ + * $Id: connectionIGMP.c,v 1.2 2010/07/19 13:49:31 schmirl Exp $ */ #include diff --git a/server/connectionVTP.c b/server/connectionVTP.c index ca73cfb..861bc83 100644 --- a/server/connectionVTP.c +++ b/server/connectionVTP.c @@ -1,5 +1,5 @@ /* - * $Id: connectionVTP.c,v 1.27.2.1 2010/06/11 06:06:03 schmirl Exp $ + * $Id: connectionVTP.c,v 1.28 2010/07/19 13:49:31 schmirl Exp $ */ #include "server/connectionVTP.h" diff --git a/server/setup.c b/server/setup.c index 986f876..8c9b8ad 100644 --- a/server/setup.c +++ b/server/setup.c @@ -1,5 +1,5 @@ /* - * $Id: setup.c,v 1.9.2.2 2010/06/18 19:07:32 schmirl Exp $ + * $Id: setup.c,v 1.10 2010/07/19 13:49:31 schmirl Exp $ */ #include diff --git a/server/setup.h b/server/setup.h index f71162f..9f06aac 100644 --- a/server/setup.h +++ b/server/setup.h @@ -1,5 +1,5 @@ /* - * $Id: setup.h,v 1.3.2.1 2010/06/18 19:07:32 schmirl Exp $ + * $Id: setup.h,v 1.4 2010/07/19 13:49:31 schmirl Exp $ */ #ifndef VDR_STREAMDEV_SETUPSERVER_H diff --git a/server/streamdev-server.c b/server/streamdev-server.c index 8e9f979..b444df7 100644 --- a/server/streamdev-server.c +++ b/server/streamdev-server.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: streamdev-server.c,v 1.1.2.1 2010/06/14 10:40:20 schmirl Exp $ + * $Id: streamdev-server.c,v 1.2 2010/07/19 13:49:32 schmirl Exp $ */ #include diff --git a/server/streamdev-server.h b/server/streamdev-server.h index 1224ecf..4083689 100644 --- a/server/streamdev-server.h +++ b/server/streamdev-server.h @@ -1,5 +1,5 @@ /* - * $Id: streamdev-server.h,v 1.1.2.1 2010/06/14 10:40:20 schmirl Exp $ + * $Id: streamdev-server.h,v 1.2 2010/07/19 13:49:32 schmirl Exp $ */ #ifndef VDR_STREAMDEVSERVER_H diff --git a/server/streamer.c b/server/streamer.c index b545b21..c92e7ee 100644 --- a/server/streamer.c +++ b/server/streamer.c @@ -1,5 +1,5 @@ /* - * $Id: streamer.c,v 1.19.2.1 2010/06/11 06:06:03 schmirl Exp $ + * $Id: streamer.c,v 1.20 2010/07/19 13:49:32 schmirl Exp $ */ #include diff --git a/server/streamer.h b/server/streamer.h index d3ddd23..988775a 100644 --- a/server/streamer.h +++ b/server/streamer.h @@ -1,5 +1,5 @@ /* - * $Id: streamer.h,v 1.11.2.1 2010/06/11 06:06:03 schmirl Exp $ + * $Id: streamer.h,v 1.12 2010/07/19 13:49:32 schmirl Exp $ */ #ifndef VDR_STREAMDEV_STREAMER_H diff --git a/streamdev-server/externremux.sh b/streamdev-server/externremux.sh index 553abf9..21cc60d 100755 --- a/streamdev-server/externremux.sh +++ b/streamdev-server/externremux.sh @@ -225,14 +225,13 @@ function startReply # create FIFO and read from it in the background mkfifo "$FIFO" - trap "kill 0; sleep 1; rm '$FIFO'; trap - EXIT HUP INT TERM ABRT PIPE CHLD" EXIT HUP INT TERM ABRT PIPE CHLD + trap "trap '' EXIT HUP INT TERM ABRT PIPE CHLD; kill -INT 0; sleep 1; fuser -k '$FIFO'; rm '$FIFO'" EXIT HUP INT TERM ABRT PIPE CHLD cat "$FIFO" <&- & } HEADER=() -set > /tmp/env -[ "$LOGGER" ] && exec 2> >($LOGGER -t "vdr: [$$] streamdev EXT" 2>&-) +[ "$LOGGER" ] && exec 2> >($LOGGER -t "vdr: [$$] ${0##*/}" 2>&-) # set default content-types case "$REMUX_VPID" in @@ -242,15 +241,15 @@ esac QUALITY=${REMUX_PARAM_QUALITY:-$QUALITY} case "$QUALITY" in - DSL1000) VBR=96; ABR=16; WIDTH=160;; - DSL2000) VBR=128; ABR=16; WIDTH=160;; - DSL3000) VBR=256; ABR=16; WIDTH=320;; - DSL6000) VBR=378; ABR=32; WIDTH=320;; - DSL16000) VBR=512; ABR=32; WIDTH=480;; - WLAN11) VBR=768; ABR=64; WIDTH=640;; - WLAN45) VBR=2048; ABR=128; WIDTH=;; - LAN10) VBR=4096; ABR=; WIDTH=;; - *) error "Unknown quality '$QUALITY'";; + DSL1000|dsl1000) VBR=96; ABR=16; WIDTH=160;; + DSL2000|dsl2000) VBR=128; ABR=16; WIDTH=160;; + DSL3000|dsl3000) VBR=256; ABR=16; WIDTH=320;; + DSL6000|dsl6000) VBR=378; ABR=32; WIDTH=320;; + DSL16000|dsl16000) VBR=512; ABR=32; WIDTH=480;; + WLAN11|wlan11) VBR=768; ABR=64; WIDTH=640;; + WLAN54|wlan54) VBR=2048; ABR=128; WIDTH=;; + LAN10|lan10) VBR=4096; ABR=; WIDTH=;; + *) error "Unknown quality '$QUALITY'";; esac ABR=${REMUX_PARAM_ABR:-$ABR} VBR=${REMUX_PARAM_VBR:-$VBR} diff --git a/tools/Makefile b/tools/Makefile index f5673db..60da509 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.1.2.1 2010/06/14 10:40:31 schmirl Exp $ +# $Id: Makefile,v 1.2 2010/07/19 13:49:44 schmirl Exp $ ### The object files (add further files here):