frodovdr/vdr-plugin-streamdev
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Streamdev 0.5.0

Browse Source
This commit is contained in:
Frank Schmirler 2010-12-02 09:51:02 +01:00
parent 91c5199ac3
commit e0a00f90ae
25 changed files with 56 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CONTRIBUTORS
View File

@ -150,3 +150,10 @@ Eric Valette
carel carel
for reporting "plugin doesn't honor APIVERSION" error in new Makefile 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

14
HISTORY
View File

@ -1,6 +1,20 @@
VDR Plugin 'streamdev' Revision History 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 - added --remove-destination to cp commands installing plugins
- fixed "plugin doesn't honor APIVERSION" (reported by carel@vdrportal) - fixed "plugin doesn't honor APIVERSION" (reported by carel@vdrportal)
- updated Italian translation (thanks to Diego Pierotto) - updated Italian translation (thanks to Diego Pierotto)

2
Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The main source file name.
# #

2
client/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.

2
client/streamdev-client.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * 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" #include "streamdev-client.h"

2
client/streamdev-client.h
View File

@ -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 #ifndef VDR_STREAMDEVCLIENT_H

4
common.c
View File

@ -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 <vdr/channels.h> #include <vdr/channels.h>
@ -10,7 +10,7 @@
using namespace std; using namespace std;
const char *VERSION = "0.5.0-rc2"; const char *VERSION = "0.5.0";
const char cMenuEditIpItem::IpCharacters[] = "0123456789."; const char cMenuEditIpItem::IpCharacters[] = "0123456789.";

2
common.h
View File

@ -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 #ifndef VDR_STREAMDEV_COMMON_H

2
libdvbmpeg/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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): ### The object files (add further files here):

2
remux/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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): ### The object files (add further files here):

2
server/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.

2
server/connection.c
View File

@ -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" #include "server/connection.h"

2
server/connection.h
View File

@ -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 #ifndef VDR_STREAMDEV_SERVER_CONNECTION_H

4
server/connectionHTTP.c
View File

@ -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 <ctype.h> #include <ctype.h>
@ -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()); 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"); Dprintf("Channel list requested\n");
return true; return true;
} else if ((m_Channel = ChannelFromString(filespec.c_str(), &m_Apid[0], &m_Dpid[0])) != NULL) { } else if ((m_Channel = ChannelFromString(filespec.c_str(), &m_Apid[0], &m_Dpid[0])) != NULL) {

2
server/connectionHTTP.h
View File

@ -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 #ifndef VDR_STREAMDEV_SERVERS_CONNECTIONHTTP_H

2
server/connectionIGMP.c
View File

@ -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 <ctype.h> #include <ctype.h>

2
server/connectionVTP.c
View File

@ -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" #include "server/connectionVTP.h"

2
server/setup.c
View File

@ -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 <vdr/menuitems.h> #include <vdr/menuitems.h>

2
server/setup.h
View File

@ -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 #ifndef VDR_STREAMDEV_SETUPSERVER_H

2
server/streamdev-server.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * 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 <getopt.h> #include <getopt.h>

2
server/streamdev-server.h
View File

@ -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 #ifndef VDR_STREAMDEVSERVER_H

2
server/streamer.c
View File

@ -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 <vdr/ringbuffer.h> #include <vdr/ringbuffer.h>

2
server/streamer.h
View File

@ -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 #ifndef VDR_STREAMDEV_STREAMER_H

23
streamdev-server/externremux.sh
View File

@ -225,14 +225,13 @@ function startReply
# create FIFO and read from it in the background # create FIFO and read from it in the background
mkfifo "$FIFO" 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" <&- & cat "$FIFO" <&- &
} }
HEADER=() HEADER=()
set > /tmp/env [ "$LOGGER" ] && exec 2> >($LOGGER -t "vdr: [$$] ${0##*/}" 2>&-)
[ "$LOGGER" ] && exec 2> >($LOGGER -t "vdr: [$$] streamdev EXT" 2>&-)
# set default content-types # set default content-types
case "$REMUX_VPID" in case "$REMUX_VPID" in
@ -242,15 +241,15 @@ esac
QUALITY=${REMUX_PARAM_QUALITY:-$QUALITY} QUALITY=${REMUX_PARAM_QUALITY:-$QUALITY}
case "$QUALITY" in case "$QUALITY" in
DSL1000) VBR=96; ABR=16; WIDTH=160;; DSL1000|dsl1000) VBR=96; ABR=16; WIDTH=160;;
DSL2000) VBR=128; ABR=16; WIDTH=160;; DSL2000|dsl2000) VBR=128; ABR=16; WIDTH=160;;
DSL3000) VBR=256; ABR=16; WIDTH=320;; DSL3000|dsl3000) VBR=256; ABR=16; WIDTH=320;;
DSL6000) VBR=378; ABR=32; WIDTH=320;; DSL6000|dsl6000) VBR=378; ABR=32; WIDTH=320;;
DSL16000) VBR=512; ABR=32; WIDTH=480;; DSL16000|dsl16000) VBR=512; ABR=32; WIDTH=480;;
WLAN11) VBR=768; ABR=64; WIDTH=640;; WLAN11|wlan11) VBR=768; ABR=64; WIDTH=640;;
WLAN45) VBR=2048; ABR=128; WIDTH=;; WLAN54|wlan54) VBR=2048; ABR=128; WIDTH=;;
LAN10) VBR=4096; ABR=; WIDTH=;; LAN10|lan10) VBR=4096; ABR=; WIDTH=;;
*) error "Unknown quality '$QUALITY'";; *) error "Unknown quality '$QUALITY'";;
esac esac
ABR=${REMUX_PARAM_ABR:-$ABR} ABR=${REMUX_PARAM_ABR:-$ABR}
VBR=${REMUX_PARAM_VBR:-$VBR} VBR=${REMUX_PARAM_VBR:-$VBR}

2
tools/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # 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): ### The object files (add further files here):