gatos-cvs Mailing List for GATOS (Page 10)
Status: Beta
Brought to you by:
volodya
Menu
▾
▴
gatos-cvs
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(35) |
Feb
(67) |
Mar
(41) |
Apr
(4) |
May
(7) |
Jun
(9) |
Jul
(7) |
Aug
(2) |
Sep
(9) |
Oct
(3) |
Nov
(5) |
Dec
(30) |
| 2004 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
(6) |
Jul
(8) |
Aug
(3) |
Sep
(5) |
Oct
(15) |
Nov
(25) |
Dec
(14) |
| 2005 |
Jan
(11) |
Feb
(5) |
Mar
(8) |
Apr
(5) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
(1) |
Nov
(3) |
Dec
|
| 2006 |
Jan
(2) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(2) |
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <gat...@li...> - 2003-05-04 20:24:56
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv15820
Modified Files:
km.c
Log Message:
Add PCI ID for Radeon 514d.
Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- km.c 6 Mar 2003 00:51:50 -0000 1.81
+++ km.c 4 May 2003 20:24:53 -0000 1.82
@@ -720,6 +720,10 @@
#define PCI_DEVICE_ID_ATI_RADEON_QG 0x5147
#endif
+#ifndef PCI_DEVICE_ID_ATI_RADEON_QN
+#define PCI_DEVICE_ID_ATI_RADEON_QN 0x514d
+#endif
+
#ifndef PCI_DEVICE_ID_ATI_RADEON_QW
#define PCI_DEVICE_ID_ATI_RADEON_QW 0x5157
#endif
@@ -863,6 +867,8 @@
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QF,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QG,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
+ {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QN,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QW,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
|
|
From: <gat...@li...> - 2003-04-19 20:45:29
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv1909
Modified Files:
r128_accel.c
Log Message:
Fix problem with Sync() call during early initialization.
Index: r128_accel.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/r128_accel.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- r128_accel.c 14 Dec 2002 10:00:27 -0000 1.6
+++ r128_accel.c 19 Apr 2003 20:45:24 -0000 1.7
@@ -231,6 +231,10 @@
R128InfoPtr info = R128PTR(pScrn);
int ret, i;
+ if(!info->CCEInUse){
+ R128WaitForIdle(pScrn);
+ return;
+ }
FLUSH_RING();
for (;;) {
|
|
From: <gat...@li...> - 2003-04-12 04:17:34
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv10410
Modified Files:
avview.scp km.scp
Log Message:
Add option to turn off warning about missing km.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- avview.scp 6 Apr 2003 16:35:09 -0000 1.130
+++ avview.scp 12 Apr 2003 04:17:31 -0000 1.131
@@ -48,6 +48,7 @@
disable_fullscreen_switching "false"
message_visible_secs 14
save_settings_on_exit "unset"
+ warn_about_missing_km "true"
} {
global $variable
set $variable $value
@@ -415,12 +416,16 @@
puts $fileid "\n# General settings"
-foreach variable {current_port current_encoding_name current_table_name
+#
+# The order these come in is really important
+#
+
+foreach variable {warn_about_missing_km current_port current_encoding_name current_table_name
current_channel attributes_window capture_window alsa_window
show_control_window always_start_fullscreen remember_fullscreen_state
display_setup_window_on_startup file_save_path dpms_off_on_fullscreen_power_off
disable_fullscreen_switching use_physical_screen_size message_visible_secs
- on_screen_cc_page save_settings_on_exit } {
+ on_screen_cc_page save_settings_on_exit} {
global $variable
puts $fileid "\nglobal $variable"
puts $fileid "set $variable \"[set $variable]\""
@@ -847,7 +852,8 @@
"Display capture(V4L) subsection" checkbutton capture_window \
"Display mixer(ALSA) subsection" checkbutton alsa_window \
"Use physical screen size for aspect ratio" checkbutton use_physical_screen_size \
- "On screen message stays visible for as long as (secs)" choice { message_visible_secs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 }
+ "On screen message stays visible for as long as (secs)" choice { message_visible_secs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 } \
+ "Warn about missing km" checkbutton warn_about_missing_km
} {
add_parameter_pane "/User interface settings" "User interface settings" \
"Display setup window on startup" checkbutton display_setup_window_on_startup \
@@ -855,7 +861,8 @@
"Display attributes subsection" checkbutton attributes_window \
"Display capture(V4L) subsection" checkbutton capture_window \
"Use physical screen size for aspect ratio" checkbutton use_physical_screen_size \
- "Temporary message stays visible for as long as (secs)" choice { message_visible_secs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 }
+ "Temporary message stays visible for as long as (secs)" choice { message_visible_secs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 } \
+ "Warn about missing km" checkbutton warn_about_missing_km
}
add_parameter_pane "/User interface settings/Fullscreen behaviour" "Fullscreen behaviour" \
Index: km.scp
===================================================================
RCS file: /cvsroot/gatos/avview/km.scp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- km.scp 10 Mar 2003 00:31:17 -0000 1.5
+++ km.scp 12 Apr 2003 04:17:31 -0000 1.6
@@ -21,8 +21,8 @@
proc find_km_device { location_id } {
puts "Looking for km device that corresponds to $location_id"
if { ! [file exists /proc/km ] } {
- global km_warning
- if { [info exists km_warning ] } { return }
+ global km_warning warn_about_missing_km
+ if { !$warn_about_missing_km || [info exists km_warning ] } { return }
tk_dialog .controlwin.b "KM is not loaded" "It does not appear that KM driver has been loaded.\nThis driver is required for snapshot and video capture and for closed captioning.\nSee README for more details\n" "" 0 "Acknowledged"
set km_warning 1
return
|
|
From: <gat...@li...> - 2003-04-06 16:35:13
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv16011 Modified Files: avview.scp Log Message: Fix typo. Index: avview.scp =================================================================== RCS file: /cvsroot/gatos/avview/avview.scp,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- avview.scp 3 Apr 2003 13:06:47 -0000 1.129 +++ avview.scp 6 Apr 2003 16:35:09 -0000 1.130 @@ -427,7 +427,7 @@ } global aspect_ratio puts $fileid "\nglobal aspect_ratio" -puts $fileid "set aspect_ration \[list $aspect_ratio\]" +puts $fileid "set aspect_ratio \[list $aspect_ratio\]" save_theme $fileid puts $fileid "update idletasks" |
|
From: <gat...@li...> - 2003-04-03 13:06:51
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv18968
Modified Files:
alsa.scp avview.scp
Log Message:
Use alsa_card_get_name properly.
Index: alsa.scp
===================================================================
RCS file: /cvsroot/gatos/avview/alsa.scp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- alsa.scp 24 Mar 2003 06:22:23 -0000 1.18
+++ alsa.scp 3 Apr 2003 13:06:46 -0000 1.19
@@ -326,7 +326,7 @@
for {set i [alsa_card_next -1]} {$i >= 0 } { set i [alsa_card_next $i] } {
set alsa_handle "hw:CARD=$i"
alsa_card_load $alsa_handle
- $alsa_device_menu add radiobutton -label "hw:CARD=$i [alsa_card_get_name $alsa_handle]"\
+ $alsa_device_menu add radiobutton -label "hw:CARD=$i [alsa_card_get_name $i]"\
-value $alsa_handle -variable $variable
}
}
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- avview.scp 26 Mar 2003 05:55:31 -0000 1.128
+++ avview.scp 3 Apr 2003 13:06:47 -0000 1.129
@@ -701,7 +701,8 @@
menu .video_menu.interface_menu.theme_menu -type normal -tearoff false
menu .video_menu.cc_menu -type normal -tearoff false
-.video_menu add command -label "Toggle mute" -command { toggle_mute }
+.video_menu add command -label "Toggle mute" -command toggle_mute
+.video_menu add command -label "Toggle mute and fullscreen" -command "toggle_mute ; toggle_fullscreen"
.video_menu add cascade -menu .video_menu.channel_menu -label "Channel"
.video_menu add cascade -menu .video_menu.connector_menu -label "Connector"
.video_menu add cascade -menu .video_menu.cc_menu -label "Closed caption"
@@ -727,7 +728,7 @@
.video_menu.size_menu add command -label "Double size" -command "set_video_window_size *2 *2"
.video_menu.size_menu add command -label "160x120" -command "set_video_window_size 160 120"
.video_menu.size_menu add command -label "320x240" -command "set_video_window_size 320 240"
-.video_menu.size_menu add command -label "480x320" -command "set_video_window_size 480 320"
+.video_menu.size_menu add command -label "480x360" -command "set_video_window_size 480 360"
.video_menu.size_menu add command -label "640x480" -command "set_video_window_size 640 480"
.video_menu.size_menu add command -label "800x600" -command "set_video_window_size 800 600"
.video_menu.size_menu add radiobutton -label "Unconstrained aspect ratio" -variable aspect_ratio -value [list NONE NONE]
|
|
From: <gat...@li...> - 2003-03-26 05:55:34
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv1404
Modified Files:
avview.scp
Log Message:
Revise .video_menu.size_menu
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- avview.scp 7 Mar 2003 22:43:20 -0000 1.127
+++ avview.scp 26 Mar 2003 05:55:31 -0000 1.128
@@ -610,21 +610,7 @@
set in_set_fullscreen false
}
-proc make_half_size {} {
-global VIDEO_WINDOW
-global fullscreen_mode
-
-if {$fullscreen_mode} {
- set fullscreen_mode 0
- return
- }
-
-$VIDEO_WINDOW configure -width [expr [winfo width $VIDEO_WINDOW]/2] \
- -height [expr [winfo height $VIDEO_WINDOW]/2]
-wm geometry . =[$VIDEO_WINDOW cget -width]x[$VIDEO_WINDOW cget -height]
-}
-
-proc make_double_size {} {
+proc set_video_window_size { w h } {
global VIDEO_WINDOW
global fullscreen_mode
@@ -632,32 +618,21 @@
set fullscreen_mode 0
return
}
-
-$VIDEO_WINDOW configure -width [expr [winfo width $VIDEO_WINDOW]*2] \
- -height [expr [winfo height $VIDEO_WINDOW]*2]
-wm geometry . =[$VIDEO_WINDOW cget -width]x[$VIDEO_WINDOW cget -height]
-}
-
-proc make_aspect_ratio {xr yr} {
-global VIDEO_WINDOW
-global fullscreen_mode
-
-if {$fullscreen_mode} {
- set fullscreen_mode 0
- return
+
+if { [ regexp {^\*} $w ] } {
+ set new_width [expr [winfo width $VIDEO_WINDOW] $w ]
+ } {
+ set new_width $w
}
-set current_width [winfo width $VIDEO_WINDOW]
-set current_height [winfo width $VIDEO_WINDOW]
-set new_width [expr $current_height*$xr/$yr]
-set new_height [expr $current_width*$yr/$xr]
-if { $new_width <= $current_width } {
- set new_height $current_height
+if { [ regexp {^\*} $h ] } {
+ set new_height [expr [winfo height $VIDEO_WINDOW] $h ]
} {
- set new_width $current_width
+ set new_height $h
}
-$VIDEO_WINDOW configure -width $new_width -height $new_height
+$VIDEO_WINDOW configure -width [expr $new_width] \
+ -height [expr $new_height]
wm geometry . =[$VIDEO_WINDOW cget -width]x[$VIDEO_WINDOW cget -height]
}
@@ -748,16 +723,18 @@
}
.video_menu.size_menu add checkbutton -variable fullscreen_mode -label "Fullscreen" -onvalue true -offvalue false
-.video_menu.size_menu add command -label "Half size" -command "make_half_size"
-.video_menu.size_menu add command -label "Double size" -command "make_double_size"
+.video_menu.size_menu add command -label "Half size" -command "set_video_window_size *0.5 *0.5"
+.video_menu.size_menu add command -label "Double size" -command "set_video_window_size *2 *2"
+.video_menu.size_menu add command -label "160x120" -command "set_video_window_size 160 120"
+.video_menu.size_menu add command -label "320x240" -command "set_video_window_size 320 240"
+.video_menu.size_menu add command -label "480x320" -command "set_video_window_size 480 320"
+.video_menu.size_menu add command -label "640x480" -command "set_video_window_size 640 480"
+.video_menu.size_menu add command -label "800x600" -command "set_video_window_size 800 600"
.video_menu.size_menu add radiobutton -label "Unconstrained aspect ratio" -variable aspect_ratio -value [list NONE NONE]
.video_menu.size_menu add radiobutton -label "Aspect ratio 4:3" -variable aspect_ratio -value [list 4 3]
.video_menu.size_menu add radiobutton -label "Aspect ratio 3:4" -variable aspect_ratio -value [list 3 4]
.video_menu.size_menu add radiobutton -label "Aspect ratio 16:9" -variable aspect_ratio -value [list 16 9]
.video_menu.size_menu add radiobutton -label "Aspect ratio 9:16" -variable aspect_ratio -value [list 9 16]
-#.video_menu.size_menu add command -label "Adjust to 4:3 aspect ratio" -command "make_aspect_ratio 4 3"
-#.video_menu.size_menu add command -label "Adjust to 16:9 aspect ratio" -command "make_aspect_ratio 16 9"
-#.video_menu.size_menu add command -label "Adjust to 9:16 aspect ratio" -command "make_aspect_ratio 9 16"
.video_menu.interface_menu add command -label "Show setup window" -command "create_setup_window"
.video_menu.interface_menu add command -label "Favorite channel editor" -command scan_channels
|
|
From: <gat...@li...> - 2003-03-24 06:32:36
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv13496 Modified Files: INSTALL configure.in Log Message: Cleanup, update INSTALL file. Index: INSTALL =================================================================== RCS file: /cvsroot/gatos/avview/INSTALL,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- INSTALL 6 Mar 2003 06:00:14 -0000 1.9 +++ INSTALL 24 Mar 2003 06:32:32 -0000 1.10 @@ -5,7 +5,7 @@ libzvbi 0.2.3 (http://zapping.sf.net/) Alsa 0.9.0 drivers and library (optional) (http://www.alsa-project.org/) FFmpeg 0.4.6 (optional, http://ffmpeg.sf.net/) - autoconf 2.52 or later (if compiling from CVS) (http://www.gnu.org/) + autoconf 2.57 or later (if compiling from CVS) (http://www.gnu.org/) automake 1.6.3 (if compiling from CVS) (http://www.gnu.org) To compile: Index: configure.in =================================================================== RCS file: /cvsroot/gatos/avview/configure.in,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- configure.in 13 Mar 2003 18:59:48 -0000 1.49 +++ configure.in 24 Mar 2003 06:32:32 -0000 1.50 @@ -105,33 +105,6 @@ AC_SUBST([TK_INC_DIR]) AC_SUBST([TK_XLIBSW]) -dnl [echo "" -dnl echo " Could not find Tcl/Tk headers. Please install Tcl/Tk 8.3" -dnl echo "" -dnl exit -dnl ],) -dnl ],) -dnl ],) - -# Another way of checking for tcl/tk.. unfinished at the moment -## we are not using tclsh as 8.3 and 8.4 are the only -## versions we support -#AC_CHECK_PROG(TCL_SHELL8_4, tclsh8.4, present, absent) -#AC_CHECK_PROG(TCL_SHELL8_3, tclsh8.3, present, absent) -# -#if test $TCL_SHELL8_4 = present ; then -#TCL_SHELL=tclsh8.4 -#elif test $TCL_SHELL8_3 = present ; then -#TCL_SHELL=tclsh8.3 -#else -#echo "Could not find Tcl/Tk 8.3 or 8.4, please install and run configure again" -#exit -#fi - -#echo "quering $TCL_SHELL:" -#TCL_LIB=`echo 'puts "$tcl_library"' | $TCL_SHELL` -#echo "TCL_LIB=$TCL_LIB" - AC_SUBST(X_CFLAGS) AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) |
|
From: <gat...@li...> - 2003-03-24 06:25:02
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv11450
Modified Files:
v4l.scp
Log Message:
Preserve current_alsa_capture_device across restarts.
Index: v4l.scp
===================================================================
RCS file: /cvsroot/gatos/avview/v4l.scp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- v4l.scp 24 Mar 2003 06:22:24 -0000 1.51
+++ v4l.scp 24 Mar 2003 06:24:58 -0000 1.52
@@ -620,7 +620,7 @@
ffmpeg_max_fifo_size ffmpeg_recording_chunk_size
}
-foreach variable [concat [list current_v4l_mode current_v4l_rrate] $ffmpeg_vars ] {
+foreach variable [concat [list current_v4l_mode current_v4l_rrate current_alsa_capture_device] $ffmpeg_vars ] {
catch {
global $variable
puts $fileid "\nglobal $variable"
|
|
From: <gat...@li...> - 2003-03-24 06:22:32
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv10643
Modified Files:
alsa.c alsa.scp v4l.scp
Log Message:
Provide for separate ALSA sound device selection in the capture panel.
Index: alsa.c
===================================================================
RCS file: /cvsroot/gatos/avview/alsa.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- alsa.c 15 Feb 2003 01:19:59 -0000 1.33
+++ alsa.c 24 Mar 2003 06:22:23 -0000 1.34
@@ -138,8 +138,8 @@
ALSA_DATA *ad;
Tcl_ResetResult(interp);
-if(argc<3){
- Tcl_AppendResult(interp,"ERROR: alsa_hctl_open requires two arguments", NULL);
+if(argc<2){
+ Tcl_AppendResult(interp,"ERROR: alsa_hctl_open requires one argument", NULL);
return TCL_ERROR;
}
i=add_string(alsa_sc, (char*)argv[1]);
Index: alsa.scp
===================================================================
RCS file: /cvsroot/gatos/avview/alsa.scp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- alsa.scp 22 Aug 2002 05:15:29 -0000 1.17
+++ alsa.scp 24 Mar 2003 06:22:23 -0000 1.18
@@ -266,7 +266,7 @@
set alsa_device_menu [tk_optionMenu $cw.device_optionmenu current_alsa_device1 none]
eval $cw.device_optionmenu configure [get_settings $cw.device_optionmenu ALSA]
eval $alsa_device_menu configure [get_settings $alsa_device_menu ALSA menu]
-button $cw.rescan_button -text "Rescan" -command rescan_alsa_devices
+button $cw.rescan_button -text "Rescan" -command "rescan_alsa_devices $alsa_device_menu current_alsa_device1"
eval $cw.rescan_button configure [get_settings $cw.rescan_button ALSA]
grid $cw.devicel $cw.device_optionmenu $cw.rescan_button -sticky news
grid configure $cw.devicel -sticky nws
@@ -276,7 +276,7 @@
grid $cw.f - - -sticky news
set save_alsa_device "$current_alsa_device"
-after idle rescan_alsa_devices
+after idle "global current_alsa_device ; set current_alsa_device none ; rescan_alsa_devices $alsa_device_menu current_alsa_device1"
global current_alsa_device1
set current_alsa_device1 "$save_alsa_device"
@@ -317,20 +317,17 @@
}
-proc rescan_alsa_devices {} {
-global alsa_device_menu
-global current_alsa_device
-global current_alsa_device1
-set current_alsa_device1 none
-set current_alsa_device none
+proc rescan_alsa_devices { alsa_device_menu variable} {
+global $variable
+set $variable none
$alsa_device_menu delete 0 end
$alsa_device_menu add radiobutton -label "none"\
- -value "none" -variable current_alsa_device1
+ -value "none" -variable $variable
for {set i [alsa_card_next -1]} {$i >= 0 } { set i [alsa_card_next $i] } {
set alsa_handle "hw:CARD=$i"
alsa_card_load $alsa_handle
$alsa_device_menu add radiobutton -label "hw:CARD=$i [alsa_card_get_name $alsa_handle]"\
- -value $alsa_handle -variable current_alsa_device1
+ -value $alsa_handle -variable $variable
}
}
@@ -339,13 +336,13 @@
global current_alsa_device1
global current_alsa_info
global alsa_window
-if { "$current_alsa_device" != "none" } {
- alsa_hctl_close "$current_alsa_device"
+if { $current_alsa_device != "none" } {
+ alsa_hctl_close $current_alsa_device
}
-set current_alsa_device "$current_alsa_device1"
-if { "$current_alsa_device" != "none" } {
- alsa_hctl_open "$current_alsa_device" he
- set current_alsa_info [alsa_hctl_get_elements_info "$current_alsa_device"]
+set current_alsa_device $current_alsa_device1
+if { $current_alsa_device != "none" } {
+ alsa_hctl_open $current_alsa_device
+ set current_alsa_info [alsa_hctl_get_elements_info $current_alsa_device]
}
if { $alsa_window } {
generate_mixer_window $cw.f1.c $cw.f1.c.f
Index: v4l.scp
===================================================================
RCS file: /cvsroot/gatos/avview/v4l.scp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- v4l.scp 2 Mar 2003 04:00:19 -0000 1.50
+++ v4l.scp 24 Mar 2003 06:22:24 -0000 1.51
@@ -57,6 +57,20 @@
grid $cw.devicel $cw.device_optionmenu $cw.rescan_button -sticky news
grid configure $cw.devicel -sticky nws
+if { [alsa_present] } {
+ eval label $cw.alsadevicel -text "\"ALSA device: \"" [get_settings $cw.alsadevicel Capture V4L]
+ global v4l_alsadevice_menu
+ set v4l_alsadevice_menu [tk_optionMenu $cw.alsadevice_optionmenu current_alsa_capture_device none]
+ eval $cw.alsadevice_optionmenu configure [get_settings $cw.alsadevice_optionmenu Capture V4L]
+ eval $v4l_alsadevice_menu configure [get_settings $v4l_alsadevice_menu Capture V4L menu]
+ eval button $cw.rescan_ad_button -text "Rescan" [get_settings $cw.rescan_button Capture V4L]
+ $cw.rescan_ad_button configure -command "rescan_alsa_devices $v4l_alsadevice_menu current_alsa_capture_device"
+ grid $cw.alsadevicel $cw.alsadevice_optionmenu $cw.rescan_ad_button -sticky news
+ grid configure $cw.alsadevicel -sticky nws
+ after idle "$cw.rescan_ad_button invoke"
+ }
+
+
set methods [get_deinterlacing_methods]
eval label $cw.model -text "\"Recording mode: \"" [get_settings $cw.model Capture V4L]
set menu [tk_optionMenu $cw.mode_optionmenu current_v4l_mode None]
@@ -343,11 +357,11 @@
proc verify_v4l_stream_parameters {} {
global v4l_capture_on ffmpeg_video_codec ffmpeg_audio_codec ffmpeg_file_format \
current_v4l_mode current_v4l_rrate current_capture_filename current_v4l_device \
- current_alsa_device file_save_path
+ current_alsa_capture_device file_save_path
if { ("$ffmpeg_file_format" == "none") &&
("$current_v4l_device" != "none") &&
- ("$current_alsa_device" != "none") } {
+ ("$current_alsa_capture_device" != "none") } {
tk_dialog .controlwin.capture.wrong_parameters "Incompatible capture parameters" \
"If you want to record both audio and video the file format must not be \"none\"" ""\
0 "OK"
@@ -380,7 +394,7 @@
ffmpeg_file_format ffmpeg_audio_sample_rate ffmpeg_audio_bitrate \
ffmpeg_video_bitrate ffmpeg_video_quality ffmpeg_video_bitrate_control \
current_v4l_mode current_v4l_rrate current_capture_filename \
- current_alsa_device file_save_path \
+ current_alsa_capture_device file_save_path \
current_video_rate current_v4l_device
if { $v4l_capture_on } {
if { ! [verify_v4l_stream_parameters] } {
@@ -397,13 +411,17 @@
after idle "$cw.record_button deselect"
return
}
+ set alsa_device $current_alsa_capture_device
+ if { $alsa_device != "none" } {
+ alsa_hctl_open $alsa_device
+ }
set status [ffmpeg_encode_v4l_stream -v4l_handle current_v4l_handle \
-video_codec $ffmpeg_video_codec \
-audio_codec $ffmpeg_audio_codec \
-deinterlace_mode $current_v4l_mode \
-step_frames $current_v4l_rrate \
-av_format $ffmpeg_file_format \
- -audio_device "$current_alsa_device" \
+ -audio_device $alsa_device \
-audio_rate "$ffmpeg_audio_sample_rate" \
-audio_bitrate "$ffmpeg_audio_bitrate" \
-v4l_rate "$current_video_rate" \
@@ -411,6 +429,11 @@
-video_quality "$ffmpeg_video_quality" \
-video_bitrate_control "$ffmpeg_video_bitrate_control" \
-filename "$file_save_path/$current_capture_filename"]
+ if { $alsa_device != "none" } {
+ # we are not really closing it - just decrementing the use count
+ # it will stay up as long as alsa_reader_thread is active
+ alsa_hctl_close $alsa_device
+ }
if { "$status" == "" } {
after cancel "check_fifo $cw"
after 800 "check_fifo $cw"
|
|
From: <gat...@li...> - 2003-03-13 18:59:52
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv1159 Modified Files: configure.in xv.scp Log Message: More checking for libzvbi. Index: configure.in =================================================================== RCS file: /cvsroot/gatos/avview/configure.in,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- configure.in 2 Mar 2003 04:59:46 -0000 1.48 +++ configure.in 13 Mar 2003 18:59:48 -0000 1.49 @@ -4,7 +4,7 @@ # Note to self: always bump version number when there are changes # in setup window or avview_shell # -AC_INIT([AVview], [0.11.10], [gat...@li...]) +AC_INIT([AVview], [0.11.12], [gat...@li...]) # # For now I'll be happier without NEWS and Changelog files. # @@ -81,6 +81,8 @@ fi AC_CHECK_HEADER(linux/videodev.h, ,echo "Avview requires video4linux support. You may want to upgrade to Linux 2.4.x."; exit) + +AC_CHECK_HEADER(libzvbi.h, , echo "Avview requires libzvbi 0.2.3 or later" ; exit ) AC_CHECK_LIB([X11], [XCreateSimpleWindow],,,[$X_LIBS]) AC_CHECK_LIB([Xext], [XInitExtension],,,[$X_LIBS]) Index: xv.scp =================================================================== RCS file: /cvsroot/gatos/avview/xv.scp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- xv.scp 10 Mar 2003 00:31:17 -0000 1.19 +++ xv.scp 13 Mar 2003 18:59:48 -0000 1.20 @@ -357,3 +357,4 @@ } } } + |
|
From: <gat...@li...> - 2003-03-10 00:33:38
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv32670
Modified Files:
r128_video.c radeon_video.c
Log Message:
Fix breakage after patch. (GATOS code is slightly different from regular XF 4.3.0).
Index: r128_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/r128_video.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- r128_video.c 8 Mar 2003 06:47:04 -0000 1.38
+++ r128_video.c 10 Mar 2003 00:33:35 -0000 1.39
@@ -2252,8 +2252,8 @@
BoxRec dstBox;
CARD32 tmp;
int retcode;
-#if X_BYTE_ORDER == X_BIG_ENDIAN
unsigned char *R128MMIO = info->MMIO;
+#if X_BYTE_ORDER == X_BIG_ENDIAN
CARD32 config_cntl = INREG(R128_CONFIG_CNTL);
/* We need to disable byte swapping, or the data gets mangled */
Index: radeon_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/radeon_video.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- radeon_video.c 8 Mar 2003 06:47:04 -0000 1.90
+++ radeon_video.c 10 Mar 2003 00:33:35 -0000 1.91
@@ -2900,8 +2900,8 @@
int top, left, npixels, nlines, bpp;
BoxRec dstBox;
CARD32 tmp;
-#if X_BYTE_ORDER == X_BIG_ENDIAN
unsigned char *RADEONMMIO = info->MMIO;
+#if X_BYTE_ORDER == X_BIG_ENDIAN
CARD32 surface_cntl = INREG(RADEON_SURFACE_CNTL);
OUTREG(RADEON_SURFACE_CNTL, (surface_cntl |
|
|
From: <gat...@li...> - 2003-03-10 00:31:20
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv31952
Modified Files:
channel_scan.scp km.scp xv.scp
Log Message:
Update attribute variables.
Index: channel_scan.scp
===================================================================
RCS file: /cvsroot/gatos/avview/channel_scan.scp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- channel_scan.scp 9 Sep 2002 11:19:15 -0000 1.10
+++ channel_scan.scp 10 Mar 2003 00:31:17 -0000 1.11
@@ -1,10 +1,7 @@
#!avview_shell
proc scan_channels {} {
-global current_table
-global VIDEO_WINDOW
-global current_port
-global current_channel
+global current_table VIDEO_WINDOW current_port current_channel LOCATION_ID
if { "$current_table" == "none" } {
return
}
@@ -27,8 +24,8 @@
-showvalue false
eval $A.progress_scale configure [get_settings $A.progress_scale ChannelList]
button $A.scan_now_button -text "Scan" -command do_scan -state disabled
-global tuner_status_present_${current_port}
-if { [set tuner_status_present_${current_port}] } {
+global tuner_status_present
+if { [set tuner_status_present] } {
$A.scan_now_button configure -state normal
}
eval $A.scan_now_button configure [get_settings $A.scan_now_button ChannelList]
@@ -39,7 +36,7 @@
set column 0
set row 0
foreach channel $CHANNEL_LIST {
- checkbutton $A.ch_list.sel_${ch_scan_progress} -variable "is_favorite_channel(${current_port}_${current_table}_${ch_scan_progress})"
+ checkbutton $A.ch_list.sel_${ch_scan_progress} -variable "is_favorite_channel(${LOCATION_ID}_${current_table}_${ch_scan_progress})"
radiobutton $A.ch_list.cch_${ch_scan_progress} -indicatoron false -text " [lindex $CHANNEL_LIST $ch_scan_progress] " \
-value "[lindex $CHANNEL_LIST $ch_scan_progress]" -variable current_channel
eval $A.ch_list.sel_${ch_scan_progress} configure [get_settings $A.ch_list.sel_${ch_scan_progress} ChannelList $row $column $ch_scan_progress]
@@ -108,16 +105,13 @@
}
proc reflect_favorite_channels {} {
-global current_channel_menu
-global current_port
-global current_table
-global is_favorite_channel
+global current_channel_menu current_port current_table is_favorite_channel LOCATION_ID
set num_entries [$current_channel_menu index end]
for { set i 0 } { $i < $num_entries} { incr i } {
$current_channel_menu entryconfigure $i -foreground #505050
.video_menu.channel_menu entryconfigure $i -foreground #505050
catch {
- if { [set is_favorite_channel(${current_port}_${current_table}_$i)] } {
+ if { [set is_favorite_channel(${LOCATION_ID}_${current_table}_$i)] } {
$current_channel_menu entryconfigure $i -foreground black
.video_menu.channel_menu entryconfigure $i -foreground black
}
@@ -161,10 +155,7 @@
}
proc find_first_favorite_channel {start_with dir} {
-global current_channel_menu
-global current_port
-global current_table
-global is_favorite_channel
+global current_channel_menu current_port current_table is_favorite_channel LOCATION_ID
if { $current_port == "none" } { return "none" }
set CHANNEL_LIST [freq_get_channel_list $current_table]
set answer [lindex $CHANNEL_LIST [expr $start_with+$dir]]
@@ -174,7 +165,7 @@
for { set i [expr $start_with+$dir] } { $i != $start_with } { incr i $dir} {
if { $i >= $num_entries } { set i 0 }
if { $i < 0 } { set i [expr $num_entries - 1] }
- if { [set is_favorite_channel(${current_port}_${current_table}_$i)] } {
+ if { [set is_favorite_channel(${LOCATION_ID}_${current_table}_$i)] } {
set answer [lindex $CHANNEL_LIST $i]
break;
}
Index: km.scp
===================================================================
RCS file: /cvsroot/gatos/avview/km.scp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- km.scp 5 Mar 2003 03:56:00 -0000 1.4
+++ km.scp 10 Mar 2003 00:31:17 -0000 1.5
@@ -59,12 +59,14 @@
}
proc update_primary_globals {} {
+global LOCATION_ID
foreach var { primary_v4l_device primary_vbi_device } {
global $var
set $var ""
}
+if { ! [info exists LOCATION_ID] } { return }
catch {
- foreach {var value } [find_km_device [get_location_id]] {
+ foreach {var value } [find_km_device $LOCATION_ID] {
set $var $value
}
foreach {var value} $attrs {
Index: xv.scp
===================================================================
RCS file: /cvsroot/gatos/avview/xv.scp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- xv.scp 2 Mar 2003 04:00:20 -0000 1.18
+++ xv.scp 10 Mar 2003 00:31:17 -0000 1.19
@@ -4,20 +4,7 @@
set type1 [xv_port_attribute_type $video_window $port $attribute]
set range [xv_port_attribute_range $video_window $port $attribute]
set name [xv_port_attribute_name $video_window $port $attribute]
-if { [regexp {^XV_(LOCATION_ID|DEVICE_ID|INSTANCE_ID|ENCODING|AUTOPAINT_COLORKEY|COLORKEY)$} $name] } { return "none"}
-if {$name == "XV_TUNER_STATUS" } {
- global tuner_status_present_$port
- set tuner_status_present_$port true
- return "none"
- }
-if {$name == "XV_MUTE" } {
- global audio_mute_present_$port
- set audio_mute_present_$port true
- }
-if {$name == "XV_FREQ" } {
- global tuner_freq_present_$port
- set tuner_freq_present_$port true
- }
+if { [regexp {^XV_(LOCATION_ID|DEVICE_ID|INSTANCE_ID|ENCODING|AUTOPAINT_COLORKEY|COLORKEY|TUNER_STATUS)$} $name] } { return "none"}
if { [lsearch $type1 "gettable"] < 0 } {
if { ("$range" == "0 1") && ([lsearch $type1 "settable"] >=0 ) } {
return "button"
@@ -132,7 +119,19 @@
proc update_attribute_variables {} {
global VIDEO_WINDOW
-global current_port
+global current_port LOCATION_ID INSTANCE_ID DEVICE_ID
+foreach {var value} [subst -nocommands {
+ LOCATION_ID "XV_PORT:$current_port"
+ INSTANCE_ID "XV_PORT:$current_port"
+ DEVICE_ID "XV_PORT:$current_port"
+ freq_present false
+ mute_present false
+ tuner_status_present false
+ autopaint_colorkey_present false
+ }] {
+ global $var
+ set $var $value
+ }
if { $current_port == "none" } { return }
set num_attributes [xv_num_port_attributes $VIDEO_WINDOW $current_port]
for {set i 0 } { $i < $num_attributes} { incr i } {
@@ -140,6 +139,32 @@
set name [xv_port_attribute_name $VIDEO_WINDOW $current_port $i]
set attr_var [find_attribute_variable $VIDEO_WINDOW $current_port $i]
set type [find_attribute_widget $VIDEO_WINDOW $current_port $i]
+ switch -exact -- $name {
+ "XV_LOCATION_ID" {
+ set atom [xv_getportattribute $VIDEO_WINDOW $current_port "XV_LOCATION_ID"]
+ set LOCATION_ID [winfo atomname $atom]
+ }
+ "XV_INSTANCE_ID" {
+ set atom [xv_getportattribute $VIDEO_WINDOW $current_port "XV_LOCATION_ID"]
+ set LOCATION_ID [winfo atomname $atom]
+ }
+ "XV_DEVICE_ID" {
+ set atom [xv_getportattribute $VIDEO_WINDOW $current_port "XV_LOCATION_ID"]
+ set LOCATION_ID [winfo atomname $atom]
+ }
+ "XV_FREQ" {
+ set freq_present true
+ }
+ "XV_MUTE" {
+ set mute_present true
+ }
+ "XV_TUNER_STATUS" {
+ set tuner_status_present true
+ }
+ "XV_AUTOPAINT_COLORKEY" {
+ set autopaint_colorkey_present true
+ }
+ }
global $attr_var
if { ($type != "button") && ($type != "none") } {
catch "
@@ -249,14 +274,6 @@
return
}
-puts stderr "test"
-global tuner_status_present_$current_port
-global audio_mute_present_$current_port
-global tuner_freq_present_$current_port
-set tuner_status_present_$current_port false
-set audio_mute_present_$current_port false
-set tuner_freq_present_$current_port false
-
set NUM_ENCODINGS [xv_num_port_encodings $VIDEO_WINDOW $current_port]
set vd_param [get_pane_frame "/Video device parameters"]
@@ -311,13 +328,6 @@
if { $current_channel == "none" } {
set current_channel [find_first_favorite_channel 0 1]
}
-}
-
-proc get_location_id {} {
-global current_port VIDEO_WINDOW
-if { $current_port == "none" } { return "NONE" }
-set atom [xv_getportattribute $VIDEO_WINDOW $current_port "XV_LOCATION_ID"]
-return [winfo atomname $atom]
}
proc set_attribute_by_index { index value } {
|
|
From: <gat...@li...> - 2003-03-08 07:27:41
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv20141
Modified Files:
r128_video.c radeon_video.c
Log Message:
Commit PPC fix from Patric Smith.
Index: r128_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/r128_video.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- r128_video.c 7 Mar 2003 07:40:29 -0000 1.37
+++ r128_video.c 8 Mar 2003 06:47:04 -0000 1.38
@@ -2244,7 +2244,6 @@
){
R128InfoPtr info = R128PTR(pScrn);
R128PortPrivPtr pPriv = (R128PortPrivPtr)data;
- unsigned char *R128MMIO = info->MMIO;
INT32 xa, xb, ya, yb;
int pitch, new_size, offset, s1offset, s2offset, s3offset;
int srcPitch, srcPitch2, dstPitch;
@@ -2252,6 +2251,7 @@
int top, left, npixels, nlines, bpp;
BoxRec dstBox;
CARD32 tmp;
+ int retcode;
#if X_BYTE_ORDER == X_BIG_ENDIAN
unsigned char *R128MMIO = info->MMIO;
CARD32 config_cntl = INREG(R128_CONFIG_CNTL);
@@ -2305,7 +2305,10 @@
dstBox.y2 = drw_y + drw_h;
if(!R128ClipVideo(&dstBox, &xa, &xb, &ya, &yb, clipBoxes, width, height))
- return Success;
+ {
+ retcode = Success;
+ goto done;
+ }
dstBox.x1 -= pScrn->frameX0;
dstBox.x2 -= pScrn->frameX0;
@@ -2348,7 +2351,8 @@
if(!(pPriv->linear = R128AllocateMemory(pScrn, pPriv->linear,
pPriv->doubleBuffer ? (new_size << 1) : new_size)))
{
- return BadAlloc;
+ retcode = BadAlloc;
+ goto done;
}
pPriv->currentBuffer ^= 1;
@@ -2442,14 +2446,16 @@
pPriv->videoStatus = CLIENT_VIDEO_ON;
info->VideoTimerCallback = R128VideoTimerCallback;
+ retcode = Success;
- return Success;
-}
-
+done:
#if X_BYTE_ORDER == X_BIG_ENDIAN
/* restore byte swapping */
OUTREG(R128_CONFIG_CNTL, config_cntl);
#endif
+
+ return retcode;
+}
static int
R128QueryImageAttributes(
Index: radeon_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/radeon_video.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- radeon_video.c 2 Mar 2003 23:16:22 -0000 1.89
+++ radeon_video.c 8 Mar 2003 06:47:04 -0000 1.90
@@ -2893,7 +2893,6 @@
){
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
- unsigned char *RADEONMMIO = info->MMIO;
INT32 xa, xb, ya, yb;
unsigned char *dst_start;
int pitch, new_size, offset, s2offset, s3offset;
|
|
From: <gat...@li...> - 2003-03-07 22:43:25
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv26017
Modified Files:
avview.scp
Log Message:
Fix missing backslash.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- avview.scp 5 Mar 2003 17:05:27 -0000 1.126
+++ avview.scp 7 Mar 2003 22:43:20 -0000 1.127
@@ -876,7 +876,7 @@
"Display control window" checkbutton show_control_window \
"Display attributes subsection" checkbutton attributes_window \
"Display capture(V4L) subsection" checkbutton capture_window \
- "Use physical screen size for aspect ratio" checkbutton use_physical_screen_size
+ "Use physical screen size for aspect ratio" checkbutton use_physical_screen_size \
"Temporary message stays visible for as long as (secs)" choice { message_visible_secs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 }
}
|
|
From: <gat...@li...> - 2003-03-07 16:18:46
|
Update of /cvsroot/gatos/ati.2 In directory sc8-pr-cvs1:/tmp/cvs-serv4836 Modified Files: radeon_reg.h Log Message: Fix typo. Index: radeon_reg.h =================================================================== RCS file: /cvsroot/gatos/ati.2/radeon_reg.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- radeon_reg.h 1 Mar 2003 08:02:17 -0000 1.11 +++ radeon_reg.h 7 Mar 2003 16:18:41 -0000 1.12 @@ -998,7 +998,7 @@ # define RADEON_P2PLL_REF_DIV_MASK 0x03ff # define RADEON_P2PLL_ATOMIC_UPDATE_R (1 << 15) /* same as _W */ # define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */ -# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff < 18) +# define R300_PPLL_REF_DIV_ACC_MASK (0x3ff << 18) # define R300_PPLL_REF_DIV_ACC_SHIFT 18 #define RADEON_PALETTE_DATA 0x00b4 #define RADEON_PALETTE_30_DATA 0x00b8 |
|
From: <gat...@li...> - 2003-03-07 07:40:32
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv1585
Modified Files:
r128_video.c
Log Message:
Tentative fix for Rage128 DRM problems.
Index: r128_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/r128_video.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- r128_video.c 5 Mar 2003 03:26:56 -0000 1.36
+++ r128_video.c 7 Mar 2003 07:40:29 -0000 1.37
@@ -1805,7 +1805,9 @@
if ((passes = (h+hpass-1)/hpass) > MAXPASSES)
return FALSE;
+#if 0
R128CCEWaitForIdle(pScrn);
+#endif
/* Request indirect buffers */
srcpassbytes = w*hpass;
|
|
From: <gat...@li...> - 2003-03-06 07:35:20
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv5116
Modified Files:
radeon.c
Log Message:
More sophisticated handling of stall of hardware GUI DMA queue.
Index: radeon.c
===================================================================
RCS file: /cvsroot/gatos/km/radeon.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- radeon.c 6 Mar 2003 00:51:50 -0000 1.93
+++ radeon.c 6 Mar 2003 07:35:16 -0000 1.94
@@ -167,13 +167,27 @@
int radeon_start_gui_dma_queue(KM_STRUCT *kms)
{
u32 a;
+int count;
a=readl(kms->reg_aperture+RADEON_DMA_GUI_STATUS);
a=a& ~(3<<22); /* set swap control to no swap */
if(a & RADEON_DMA_GUI_STATUS__ABORT){
if(a & RADEON_DMA_GUI_STATUS__ACTIVE){
- printk("km: DMA_GUI_QUEUE stalled after abort\n");
- return 0;
+ count=20;
+ while(count){
+ writel(a, kms->reg_aperture+RADEON_DMA_GUI_STATUS);
+ udelay(1);
+ a=readl(kms->reg_aperture+RADEON_DMA_GUI_STATUS);
+ a=a& ~(3<<22); /* set swap control to no swap */
+ if(!(a & RADEON_DMA_GUI_STATUS__ACTIVE)){
+ break;
+ }
+ count--;
+ }
+ if(!count){
+ printk("km: DMA_GUI_QUEUE stalled after abort\n");
+ return 0;
+ }
}
wmb();
|
|
From: <gat...@li...> - 2003-03-06 06:00:19
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv10242 Modified Files: INSTALL bindings.scp Log Message: Update INSTALL file with new library requirements. Use exit_avview in place of all instances of save_settings ; exit ; . Index: INSTALL =================================================================== RCS file: /cvsroot/gatos/avview/INSTALL,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- INSTALL 7 Dec 2002 20:51:47 -0000 1.8 +++ INSTALL 6 Mar 2003 06:00:14 -0000 1.9 @@ -2,10 +2,11 @@ Requirements: Tcl/Tk 8.3 or 8.4 + libzvbi 0.2.3 (http://zapping.sf.net/) Alsa 0.9.0 drivers and library (optional) (http://www.alsa-project.org/) - FFmpeg tarball (optional) + FFmpeg 0.4.6 (optional, http://ffmpeg.sf.net/) autoconf 2.52 or later (if compiling from CVS) (http://www.gnu.org/) - automake 1.6.3 (if compiling from CVS) (http://www.gnu.org) + automake 1.6.3 (if compiling from CVS) (http://www.gnu.org) To compile: Index: bindings.scp =================================================================== RCS file: /cvsroot/gatos/avview/bindings.scp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- bindings.scp 9 Jan 2003 04:06:05 -0000 1.21 +++ bindings.scp 6 Mar 2003 06:00:14 -0000 1.22 @@ -18,8 +18,8 @@ "next_channel -1" "<Control-Key-KP_Subtract>" "toggle_mute" "<Key-KP_Multiply>" "toggle_mute" "<Key-XF86AudioMute>" - "save_settings ; exit" "<Control-Key-q>" - "save_settings ; exit" "<Key-Escape>" + "exit_avview" "<Control-Key-q>" + "exit_avview" "<Key-Escape>" "remote_power_off" "<Key-XF86PowerOff>" "next_encoding 1" "<Control-Key-i>" "switch_to_control XV_VOLUME; change_control 1" "<Key-XF86AudioRaiseVolume>" @@ -367,8 +367,7 @@ if { $fullscreen_mode && $dpms_off_on_fullscreen_power_off } { toggle_screensaver } { - save_settings - exit + exit_avview } } |
|
From: <gat...@li...> - 2003-03-06 00:51:53
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv14044
Modified Files:
km.c radeon.c
Log Message:
Cleanup.
Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- km.c 5 Mar 2003 17:13:26 -0000 1.80
+++ km.c 6 Mar 2003 00:51:50 -0000 1.81
@@ -80,7 +80,7 @@
stream->dvb_info.n=1;
stream->dvb_info.free=&(stream->info_free);
stream->info_free=num_buffers*sizeof(KM_STREAM_BUFFER_INFO);
-stream->dvb_info.ptr=&(stream->dvb.kmsbi);
+stream->dvb_info.ptr=(void **) &(stream->dvb.kmsbi);
stream->dvb_info.kmsbi=NULL; /* no meta-metainfo */
stream->info_du=km_allocate_data_virtual_block(&(stream->dvb_info), S_IFREG | S_IRUGO);
if(stream->info_du<0)return -1;
Index: radeon.c
===================================================================
RCS file: /cvsroot/gatos/km/radeon.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- radeon.c 5 Mar 2003 17:13:27 -0000 1.92
+++ radeon.c 6 Mar 2003 00:51:50 -0000 1.93
@@ -390,7 +390,7 @@
#if 0
mask=readl(kms->reg_aperture+RADEON_GEN_INT_CNTL) & ((1<<30)|7);
#endif
- KM_DEBUG_LEVEL(3)("GEN_INT_STATUS=0x%08x mask=0x%08x\n", status, mask);
+ KM_DEBUG_LEVEL(3)("GEN_INT_STATUS=0x%08x\n", status);
status &=INT_BIT_GUIDMA|
INT_BIT_VLINE|
INT_BIT_VSYNC|
|
|
From: <gat...@li...> - 2003-03-05 17:24:00
|
Update of /cvsroot/gatos/km In directory sc8-pr-cvs1:/tmp/cvs-serv19049 Modified Files: mach64.c rage128.c Log Message: Propagate radeon modifications to mach64 and rage128 drivers. Index: mach64.c =================================================================== RCS file: /cvsroot/gatos/km/mach64.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- mach64.c 4 Mar 2003 19:59:19 -0000 1.49 +++ mach64.c 5 Mar 2003 17:23:54 -0000 1.50 @@ -130,7 +130,7 @@ KM_STRUCT *kms=kmtr->user_data; mach64_wait_for_idle(kms); wmb(); -writel(kvirt_to_bus(kms->capture.dma_table[kmtr->buffer])|MACH64_SYSTEM_TRIGGER_VIDEO_TO_SYSTEM, +writel(kms->capture.dma_table_physical[kmtr->buffer]|MACH64_SYSTEM_TRIGGER_VIDEO_TO_SYSTEM, kms->reg_aperture+MACH64_BM_SYSTEM_TABLE); } @@ -160,7 +160,7 @@ stream->dvb.kmsbi[buffer].age=stream->total_frames; wmb(); km_add_transfer_request(&(kms->gui_dma_queue), - &(stream->dvb), buffer, KM_TRANSFER_TO_SYSTEM_RAM, mach64_start_request_transfer, kms); + stream, buffer, KM_TRANSFER_TO_SYSTEM_RAM, mach64_start_request_transfer, kms); } void mach64_km_irq(int irq, void *dev_id, struct pt_regs *regs) Index: rage128.c =================================================================== RCS file: /cvsroot/gatos/km/rage128.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- rage128.c 4 Mar 2003 19:59:20 -0000 1.40 +++ rage128.c 5 Mar 2003 17:23:55 -0000 1.41 @@ -140,7 +140,7 @@ KM_STRUCT *kms=kmtr->user_data; rage128_wait_for_idle(kms); wmb(); -writel(kvirt_to_bus(kms->capture.dma_table[kmtr->buffer])|RAGE128_SYSTEM_TRIGGER_VIDEO_TO_SYSTEM, +writel(kms->capture.dma_table_physical[kmtr->buffer]|RAGE128_SYSTEM_TRIGGER_VIDEO_TO_SYSTEM, kms->reg_aperture+RAGE128_BM_VIDCAP_BUF0); } @@ -170,7 +170,7 @@ stream->dvb.kmsbi[buffer].age=stream->total_frames; wmb(); km_add_transfer_request(&(kms->gui_dma_queue), - &(stream->dvb), buffer, KM_TRANSFER_TO_SYSTEM_RAM, rage128_start_request_transfer, kms); + stream, buffer, KM_TRANSFER_TO_SYSTEM_RAM, rage128_start_request_transfer, kms); } static int rage128_is_capture_irq_active(KM_STRUCT *kms) |
|
From: <gat...@li...> - 2003-03-05 17:13:31
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv14718
Modified Files:
km.c km.h radeon.c
Log Message:
Avoid calling kvirt_to_bus during an interrupt.
Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- km.c 4 Mar 2003 06:30:38 -0000 1.79
+++ km.c 5 Mar 2003 17:13:26 -0000 1.80
@@ -109,6 +109,7 @@
stream->dma_table=kmalloc(sizeof(*(stream->dma_table))*num_buffers, GFP_KERNEL);
+stream->dma_table_physical=kmalloc(sizeof(u32)*num_buffers, GFP_KERNEL);
for(k=0;k<num_buffers;k++){
stream->dvb.free[k]=size;
stream->dvb.kmsbi[k].flag=0;
@@ -117,6 +118,7 @@
stream->dvb.kmsbi[k].prev=k-1;
stream->dvb.kmsbi[k].age=-1;
stream->dma_table[k]=rvmalloc(4096);
+ stream->dma_table_physical[k]=kvirt_to_bus(stream->dma_table[k]);
stream->free[k]=size;
memset(stream->dma_table[k], 0, 4096);
KM_DEBUG("dma_table[%d]=0x%08x\n", k, stream->dma_table[k]);
@@ -152,6 +154,7 @@
for(k=0;k<stream->num_buffers;k++){
rvfree(stream->dma_table[k], 4096);
}
+kfree(stream->dma_table_physical);
kfree(stream->dma_table);
stream->dma_table=NULL;
km_deallocate_data(stream->du);
Index: km.h
===================================================================
RCS file: /cvsroot/gatos/km/km.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- km.h 3 Mar 2003 08:27:25 -0000 1.48
+++ km.h 5 Mar 2003 17:13:26 -0000 1.49
@@ -34,6 +34,8 @@
int num_buffers;
/* dma buffers */
bm_list_descriptor **dma_table;
+ u32 *dma_table_physical;
+
int du;
KM_DATA_VIRTUAL_BLOCK dvb;
long next_buf;
Index: radeon.c
===================================================================
RCS file: /cvsroot/gatos/km/radeon.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- radeon.c 4 Mar 2003 19:57:19 -0000 1.91
+++ radeon.c 5 Mar 2003 17:13:27 -0000 1.92
@@ -330,7 +330,7 @@
KM_DEBUG("status=0x%08lx\n", status);
} while (!(status & 0x1f));
wmb();
-writel(kvirt_to_bus(kmtr->stream->dma_table[kmtr->buffer])&~1, kms->reg_aperture+RADEON_DMA_GUI_TABLE_ADDR);
+writel(kmtr->stream->dma_table_physical[kmtr->buffer]&~1, kms->reg_aperture+RADEON_DMA_GUI_TABLE_ADDR);
}
static void radeon_schedule_request(KM_STRUCT *kms, KM_STREAM *stream, u32 offset, int odd)
|
|
From: <gat...@li...> - 2003-03-05 17:05:31
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv11171
Modified Files:
avview.scp
Log Message:
Prevent AVview from saving settings on exit before initialization is complete.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- avview.scp 2 Mar 2003 17:24:25 -0000 1.125
+++ avview.scp 5 Mar 2003 17:05:27 -0000 1.126
@@ -47,6 +47,7 @@
dpms_off_on_fullscreen_power_off "false"
disable_fullscreen_switching "false"
message_visible_secs 14
+ save_settings_on_exit "unset"
} {
global $variable
set $variable $value
@@ -419,7 +420,7 @@
show_control_window always_start_fullscreen remember_fullscreen_state
display_setup_window_on_startup file_save_path dpms_off_on_fullscreen_power_off
disable_fullscreen_switching use_physical_screen_size message_visible_secs
- on_screen_cc_page } {
+ on_screen_cc_page save_settings_on_exit } {
global $variable
puts $fileid "\nglobal $variable"
puts $fileid "set $variable \"[set $variable]\""
@@ -490,6 +491,17 @@
after idle {switch_to_pane "/Video device parameters"}
}
}
+global save_settings_on_exit
+if { $save_settings_on_exit == "unset" } { set save_settings_on_exit "true" }
+}
+
+proc exit_avview {} {
+global save_settings_on_exit
+if { [ffmpeg_present] == "yes" } {
+ ffmpeg_stop_encoding
+ }
+if { $save_settings_on_exit == "true" } { save_settings }
+exit
}
proc check_mapped_state {} {
@@ -722,7 +734,7 @@
.video_menu add separator
.video_menu add cascade -menu .video_menu.interface_menu -label "User interface"
.video_menu add separator
-.video_menu add command -label "Exit AVview" -command { save_settings; exit }
+.video_menu add command -label "Exit AVview" -command exit_avview
.video_menu add separator
.video_menu add command -label "Dismiss this menu"
@@ -816,13 +828,8 @@
-wm protocol . WM_DELETE_WINDOW {
- if { [ffmpeg_present] == "yes" } {
- ffmpeg_stop_encoding
- }
- save_settings
- exit
- }
+wm protocol . WM_DELETE_WINDOW exit_avview
+
#wm protocol .controlwin WM_DELETE_WINDOW {
# if { [ffmpeg_present] == "yes" } {
# ffmpeg_stop_encoding
|
|
From: <gat...@li...> - 2003-03-05 03:56:03
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv19315
Modified Files:
km.scp
Log Message:
Close km_api control file handle when not needed.
Index: km.scp
===================================================================
RCS file: /cvsroot/gatos/avview/km.scp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- km.scp 22 Feb 2003 07:32:49 -0000 1.3
+++ km.scp 5 Mar 2003 03:56:00 -0000 1.4
@@ -50,6 +50,7 @@
}
if { [regexp {END_STATUS} $line] } { break }
}
+ close $FILE
}
if { $LOCATION_ID == $location_id } {
return [list file $file attrs $attrs]
|
|
From: <gat...@li...> - 2003-03-05 03:26:59
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv11031
Modified Files:
r128_video.c theatre.c
Log Message:
Fix problem reported by Benoit.
Index: r128_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/r128_video.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- r128_video.c 1 Mar 2003 08:02:14 -0000 1.35
+++ r128_video.c 5 Mar 2003 03:26:56 -0000 1.36
@@ -2033,7 +2033,8 @@
+ ((pScrn->currentMode->Flags & V_INTERLACE)?1:0)
- ((pScrn->currentMode->Flags & V_DBLSCAN)?1:0)));
- v_inc_d = src_h/drw_h;
+ v_inc_d = src_h;
+ v_inc_d = v_inc_d/drw_h;
v_inc = v_inc * v_inc_d;
h_inc = ((src_w << (12
Index: theatre.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/theatre.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- theatre.c 3 Mar 2003 03:59:14 -0000 1.18
+++ theatre.c 5 Mar 2003 03:26:56 -0000 1.19
@@ -1849,7 +1849,7 @@
}
WriteRT_fld (fld_LP_CONTRAST, dwTempContrast);
xf86DrvMsg(t->VIP->scrnIndex, X_INFO, "Rage Theatre Checkpoint 5 counter=%d (%d)\n", counter, ReadRT_fld (fld_VS_LINE_COUNT));
- if(counter>=100000)xf86DrvMsg(t->VIP->scrnIndex, X_INFO, "Rage Theatre: timeout waiting for line count (%d)\n", ReadRT_fld (fld_VS_LINE_COUNT));
+ if(counter>=10000)xf86DrvMsg(t->VIP->scrnIndex, X_INFO, "Rage Theatre: timeout waiting for line count (%d)\n", ReadRT_fld (fld_VS_LINE_COUNT));
|
|
From: <gat...@li...> - 2003-03-04 19:59:25
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv14462
Modified Files:
mach64.c rage128.c
Log Message:
Make sure *_setup_dma_table functions always put EOL marker.
Index: mach64.c
===================================================================
RCS file: /cvsroot/gatos/km/mach64.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- mach64.c 2 Mar 2003 05:43:50 -0000 1.48
+++ mach64.c 4 Mar 2003 19:59:19 -0000 1.49
@@ -111,13 +111,14 @@
int i;
long count;
count=free;
-for(i=0;i<(kms->capture.dvb.size/PAGE_SIZE);i++){
+for(i=0;;i++){
dma_table[i].from_addr=offset+i*PAGE_SIZE;
if(count>PAGE_SIZE){
dma_table[i].command=PAGE_SIZE;
count-=PAGE_SIZE;
} else {
dma_table[i].command=count | MACH64_DMA_GUI_COMMAND__EOL;
+ break;
}
}
return 0;
Index: rage128.c
===================================================================
RCS file: /cvsroot/gatos/km/rage128.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- rage128.c 2 Mar 2003 05:43:50 -0000 1.39
+++ rage128.c 4 Mar 2003 19:59:20 -0000 1.40
@@ -121,14 +121,14 @@
int i;
long count;
count=free;
-for(i=0;i<(kms->capture.dvb.size/PAGE_SIZE);i++){
+for(i=0;;i++){
dma_table[i].from_addr=offset+i*PAGE_SIZE;
if(count>PAGE_SIZE){
dma_table[i].command=PAGE_SIZE | RAGE128_BM_FORCE_TO_PCI;
count-=PAGE_SIZE;
} else {
dma_table[i].command=count | RAGE128_BM_FORCE_TO_PCI | RAGE128_BM_END_OF_LIST;
- return 0;
+ break;
}
}
return 0;
|