Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1:/tmp/cvs-serv4827
Modified Files:
freevo freevo_config.py
Log Message:
BSD patches from Lars
Index: freevo
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** freevo 11 Oct 2003 12:49:25 -0000 1.87
--- freevo 12 Oct 2003 09:54:27 -0000 1.88
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.88 2003/10/12 09:54:27 dischi
+ # BSD patches from Lars
+ #
# Revision 1.87 2003/10/11 12:49:25 dischi
# check for valid parameter
***************
*** 207,211 ****
$RUNAPP $PYTHON "$script" &
echo $! > $PID_FILE
! disown
elif [ "$1" = "stop" ]; then
if [ -e $PIDFILE ]; then
--- 210,216 ----
$RUNAPP $PYTHON "$script" &
echo $! > $PID_FILE
! if [ `uname -s` != "FreeBSD" ]; then
! disown
! fi
elif [ "$1" = "stop" ]; then
if [ -e $PIDFILE ]; then
***************
*** 379,383 ****
echo $! > $PID_FILE
! disown
exit 0
fi
--- 384,390 ----
echo $! > $PID_FILE
! if [ `uname -s` != "FreeBSD" ]; then
! disown
! fi
exit 0
fi
Index: freevo_config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.269
retrieving revision 1.270
diff -C2 -d -r1.269 -r1.270
*** freevo_config.py 12 Oct 2003 09:42:36 -0000 1.269
--- freevo_config.py 12 Oct 2003 09:54:27 -0000 1.270
***************
*** 901,904 ****
--- 901,908 ----
TV_INPUT = 0
+ # Additional options to pass to mplayer in TV mode.
+ # For example, TV_OPTS = '-vop pp=ci' would turn on deinterlacing.
+ TV_OPTS = ''
+
TV_SETTINGS = '%s television %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
***************
*** 954,973 ****
RECORD_SERVER_PORT = 18001
#
# XXX Please see the mencoder docs for more info about the settings
# XXX below. Some stuff must be changed (adevice), others probably
# XXX should be ("Change"), or could be in some cases ("change?")
! VCR_CMD = ('/usr/local/bin/mencoder ' + # Change. Absolute path to the runtime
'-tv on:driver=%s:input=%d' % (TV_DRIVER, TV_INPUT) +
':norm=%s' % CONF.tv +
':channel=%(channel)s' + # Filled in by Freevo
':chanlist=%s' % CONF.chanlist +
! ':width=320:height=240' + # Change if needed
! ':outfmt=yv12' + # Prob. ok, yuy2 might be faster
':device=%s' % TV_DEVICE +
! ':adevice=%s' % AUDIO_DEVICE +
! ':audiorate=32000' + # 44100 for better sound
! ':forceaudio:forcechan=1:' + # Forced mono for bug in my driver
! 'buffersize=64' + # 64 Megabyte capture buffer, change?
' -ovc lavc -lavcopts ' + # Mencoder lavcodec video codec
'vcodec=mpeg4' + # lavcodec mpeg-4
--- 958,1000 ----
RECORD_SERVER_PORT = 18001
+ if os.uname()[0] == 'FreeBSD':
+ # FreeBSD's bsdbt848 TV driver doesn't support audio settings?
+ VCR_AUDIO = ''
+ else:
+ VCR_AUDIO = (':adevice=%s' % AUDIO_DEVICE +
+ ':audiorate=32000' + # 44100 for better sound
+ ':forceaudio:forcechan=1:' + # Forced mono for bug in my driver
+ 'buffersize=64') # 64MB capture buffer, change?
+
+ # TV capture size for viewing and recording. Max 768x480 for NTSC,
+ # 768x576 for PAL. Set lower if you have a slow computer!
#
+ # For the 'tvtime' TV viewing application, only the horizontal size is used.
+ # Set the horizontal size to 400 or 480 if you have a slow (~500MHz) computer,
+ # it still looks OK, and the picture will not be as jerky.
+ # The vertical size is always either fullscreen or 480/576 (NTSC/PAL)
+ # for tvtime.
+ TV_VIEW_SIZE = (640, 480)
+ TV_REC_SIZE = (320, 240) # Default for slower computers
+
+ # Input formats for viewing and recording. The format affect viewing
+ # and recording performance. It is specific to your hardware, so read
+ # the MPlayer docs and experiment with mplayer to see which one fits
+ # your computer best.
+ TV_VIEW_OUTFMT = 'yuy2' # Better quality, slower on pure FB/X11
+ TV_REC_OUTFMT = 'yuy2'
+
# XXX Please see the mencoder docs for more info about the settings
# XXX below. Some stuff must be changed (adevice), others probably
# XXX should be ("Change"), or could be in some cases ("change?")
! VCR_CMD = (CONF.mencoder + ' ' +
'-tv on:driver=%s:input=%d' % (TV_DRIVER, TV_INPUT) +
':norm=%s' % CONF.tv +
':channel=%(channel)s' + # Filled in by Freevo
':chanlist=%s' % CONF.chanlist +
! ':width=%d:height=%d' % (TV_REC_SIZE[0], TV_REC_SIZE[1]) +
! ':outfmt=%s' % TV_REC_OUTFMT +
':device=%s' % TV_DEVICE +
! VCR_AUDIO + # set above
' -ovc lavc -lavcopts ' + # Mencoder lavcodec video codec
'vcodec=mpeg4' + # lavcodec mpeg-4
***************
*** 982,1006 ****
# XXX Not used yet
VCR_SETTINGS = '%s composite1 %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
-
- # TV capture size for viewing and recording. Max 768x480 for NTSC,
- # 768x576 for PAL. Set lower if you have a slow computer!
- #
- # For the 'tvtime' TV viewing application, only the horizontal size is used.
- # Set the horizontal size to 400 or 480 if you have a slow (~500MHz) computer,
- # it still looks OK, and the picture will not be as jerky.
- # The vertical size is always either fullscreen or 480/576 (NTSC/PAL)
- # for tvtime.
- TV_VIEW_SIZE = (640, 480)
-
- # XXX Not used yet
- TV_REC_SIZE = (320, 240) # Default for slower computers
-
- # Input formats for viewing and recording. The format affect viewing
- # and recording performance. It is specific to your hardware, so read
- # the MPlayer docs and experiment with mplayer to see which one fits
- # your computer best.
- TV_VIEW_OUTFMT = 'yuy2' # Better quality, slower on pure FB/X11
- # XXX Not used yet
- TV_REC_OUTFMT = 'yuy2'
--- 1009,1012 ----
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
