diff options
| author | frank <frank@puter.schmirler.de> | 2011-05-02 23:39:19 +0200 |
|---|---|---|
| committer | frank <frank@puter.schmirler.de> | 2011-05-02 23:39:19 +0200 |
| commit | 09e0a0176bfea6b37ba9ffc5aa0fe11f6de30f61 (patch) | |
| tree | a7480509a13274e1f96d9c51137797a7f2f8f6e8 | |
| parent | 19e8cf2a286bb56c0b10eb12859c8c5feeff8ce9 (diff) | |
| download | vdr-plugin-streamdev-09e0a0176bfea6b37ba9ffc5aa0fe11f6de30f61.tar.gz vdr-plugin-streamdev-09e0a0176bfea6b37ba9ffc5aa0fe11f6de30f61.tar.bz2 | |
- new externremux.sh mencoder config options: audio pid by language code
(-alang) and verbosity (-msglevel) (thanks to Pekko Tiitto)
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rwxr-xr-x | streamdev-server/externremux.sh | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 33ec5b1..ca6bb33 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -185,3 +185,7 @@ wtor Javier Bradineras for providing Spanish language texts + +Pekko Tiitto + for providing a git mirror of streamdev's lost CVS repository + for suggesting to use mencoder params -alang and -msglevel in externremux @@ -1,6 +1,8 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +- new externremux.sh mencoder config options: audio pid by language code + (-alang) and verbosity (-msglevel) (thanks to Pekko Tiitto) - writer must not spend too much time waiting in select() without checking if the thread has been cancelled - added Spanish translation (thanks to Javier Bradineras) diff --git a/streamdev-server/externremux.sh b/streamdev-server/externremux.sh index 20fda78..422e213 100755 --- a/streamdev-server/externremux.sh +++ b/streamdev-server/externremux.sh @@ -44,6 +44,8 @@ ABR_MONO=64 ### # mencoder binary MENCODER=mencoder +# verbosity from all=-1 to all=9 (-msglevel ...) +MENCODER_MSGLEVEL=all=1 ### video part # Default video codec (e.g. lavc/x264/copy) MENCODER_VC=lavc @@ -52,6 +54,8 @@ MENCODER_LAVC_VOPTS=vcodec=mpeg4 # Default video options if x264 is used (-ovc x264 -x264encopts ...) MENCODER_X264_VOPTS=threads=auto ### audio part +# Audio language to use if several audio PIDs are available (-alang ...) +MENCODER_ALANG=eng # Default audio codec (e.g. lavc/mp3lame/faac/copy) MENCODER_AC=mp3lame # Default audio options if lavc is used (-oac lavc -lavcopts ...) @@ -193,14 +197,18 @@ function remux_mencoder startReply exec 3<&0 echo $MENCODER \ + ${MENCODER_MSGLEVEL:+-msglevel $MENCODER_MSGLEVEL} \ -ovc $VC $VOPTS \ -oac $AC $AOPTS \ + ${MENCODER_ALANG:+-alang $MENCODER_ALANG} \ ${WIDTH:+-vf scale=$WIDTH:$HEIGHT -zoom} \ ${FPS:+-ofps $FPS} \ -o "$FIFO" -- - >&2 $MENCODER \ + ${MENCODER_MSGLEVEL:+-msglevel $MENCODER_MSGLEVEL} \ -ovc $VC $VOPTS \ -oac $AC $AOPTS \ + ${MENCODER_ALANG:+-alang $MENCODER_ALANG} \ ${WIDTH:+-vf scale=$WIDTH:$HEIGHT -zoom} \ ${FPS:+-ofps $FPS} \ -o "$FIFO" -- - 0<&3 >/dev/null & |