Changeset 1925

Timestamp:

Oct 18, 2010, 7:35:40 PM (14 years ago)

Author:

dkearney

Message:

updates for video widget code. adding uploadWord to filexfer to match the downloadWord. adding some images.

Location:

trunk

Files:

• gui/scripts/Makefile.in (modified) (1 diff)
• gui/scripts/filexfer.tcl (modified) (2 diffs)
• gui/scripts/images/flow-forward.png (added)
• gui/scripts/images/folder.gif (added)
• gui/scripts/images/popup.png (added)
• gui/scripts/images/video-forward.png (added)
• gui/scripts/images/video-rewind.png (added)
• gui/scripts/videodial.tcl (added)
• gui/scripts/videoscreen.tcl (added)
• gui/scripts/videoviewer.tcl (modified) (10 diffs)
• lang/tcl/src/RpVideoTclInterface.cc (modified) (10 diffs)
• src/objects/RpVideo.c (modified) (22 diffs)

trunk/gui/scripts/Makefile.in

@@ -114 +114 @@
                 $(srcdir)/utils.tcl \
                 $(srcdir)/valueresult.tcl \
+                $(srcdir)/videodial.tcl \
+                $(srcdir)/videoscreen.tcl \
                 $(srcdir)/videoviewer.tcl \
                 $(srcdir)/videoparticle.tcl \

trunk/gui/scripts/filexfer.tcl

@@ -91 +91 @@
             }
         }
+        uploadWord {
+            if {[Rappture::filexfer::enabled]} {
+                return "Upload"
+            } else {
+                return "Browse"
+            }
+        }
         download {
             if {[Rappture::filexfer::enabled]} {
@@ -106 +113 @@
         }
         default {
-            error "bad option \"$operation\": should be upload, download, or downloadWord"
+            error "bad option \"$operation\": should be upload, uploadWord, download, or downloadWord"
         }
     }

trunk/gui/scripts/videoviewer.tcl

@@ -16 +16 @@
 package require RapptureGUI
 
-option add *VideoViewer.width 5i widgetDefault
+#option add *VideoViewer.width 5i widgetDefault
 option add *VideoViewer*cursor crosshair widgetDefault
-option add *VideoViewer.height 4i widgetDefault
+#option add *VideoViewer.height 4i widgetDefault
 option add *VideoViewer.foreground black widgetDefault
 option add *VideoViewer.controlBackground gray widgetDefault
@@ -34 +34 @@
     itk_option define -plotbackground plotBackground Background ""
     itk_option define -plotoutline plotOutline PlotOutline ""
+    itk_option define -width width Width -1
+    itk_option define -height height Height -1
+    itk_option define -controls controls Controls "show"
 
     constructor { args } {
@@ -44 +47 @@
     public method load {filename}
     public method video {args}
+    public method query {type}
 
     protected method togglePtrBind {pbvar}
@@ -58 +62 @@
     protected method updateMeasurements {}
     protected method calculateTrajectory {args}
+    protected method fixSize {}
+
+
 
     private common   _settings
 
-    private variable _width 0
-    private variable _height 0
+    private variable _width -1
+    private variable _height -1
+    private variable _controls ""
     private variable _x0 0          ;# start x for rubberbanding
     private variable _y0 0          ;# start y for rubberbanding
@@ -399 +407 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VideoViewer::load {filename} {
-    set _movie [Rappture::Video $filename]
+
+    # open the file
+
+    set _movie [Rappture::Video "file" $filename]
     set _framerate [${_movie} get framerate]
     set _mspf [expr round(((1.0/${_framerate})*1000)/pow(2,[$itk_component(speed) value]-1))]
-    # set _mspf 7
     puts "framerate = ${_framerate}"
     puts "mspf = ${_mspf}"
 
+    ${_movie} seek 0
+
+    # setup the image display
+
     set _imh [image create photo]
-    $_imh put [$_movie next]
+    foreach {w h} [query dimensions] break
+    if {${_width} == -1} {
+        set _width $w
+    }
+    if {${_height} == -1} {
+        set _height $h
+    }
+#    ${_imh} put [$_movie get image ${_width} ${_height}]
     $itk_component(main) create image 0 0 -anchor nw -image $_imh
+
+    # setup timings for playing video
 
     set _lastFrame [$_movie get position end]
@@ -424 +447 @@
     $itk_component(framenum) configure -max ${_lastFrame} -width $cnt
 
-    set pch [$itk_component(pointercontrols) cget -height]
-    set mch [$itk_component(moviecontrols) cget -height]
-    set pch 30
-    set mch 30
+    fixSize
+}
+
+# ----------------------------------------------------------------------
+# fixSize
+# ----------------------------------------------------------------------
+itcl::body Rappture::VideoViewer::fixSize {} {
+
+    if {[string compare "" ${_movie}] == 0} {
+        return
+    }
+
+    # get an image with the new size
+    ${_imh} put [${_movie} get image ${_width} ${_height}]
+
+    # fix the dimesions of the canvas
+    $itk_component(main) configure -width ${_width} -height ${_height}
+
     $itk_component(main) configure -scrollregion [$itk_component(main) bbox all]
-    foreach { x0 y0 x1 y1 } [$itk_component(main) bbox all] break
-    set w [expr abs($x1-$x0)]
-    set h [expr abs($y1-$y0+$pch+$mch)]
-    # $itk_component(main) configure -width $w -height $h
-    .main configure -width $w -height $h
-
+    #foreach { x0 y0 x1 y1 } [$itk_component(main) bbox all] break
+    #set w [expr abs($x1-$x0)]
+    #set h [expr abs($y1-$y0)]
+    #$itk_component(main) configure -width $w -height $h
+    # component hull configure -width $w -height $h
 }
 
@@ -483 +519 @@
 
 # ----------------------------------------------------------------------
+# query - query things about the video
+# ----------------------------------------------------------------------
+itcl::body Rappture::VideoViewer::query { type } {
+    set ret ""
+    switch -- $type {
+        "dimensions" {
+            set ret [${_movie} size]
+        }
+        default {
+            error "bad type \"$type\": should be dimensions."
+        }
+    }
+    return $ret
+}
+
+# ----------------------------------------------------------------------
 # togglePtrCtrl - choose pointer mode:
 #                 rectangle, distance, measure, particlemark
@@ -617 +669 @@
 
     # display the next frame
-    $_imh put [$_movie next]
+    $_movie next
+    $_imh put [$_movie get image ${_width} ${_height}]
 
     # update the dial and framenum widgets
@@ -670 +723 @@
         error "bad value: \"$val\": should be \"seek \[-percent\] value\""
     }
-    $_imh put [$_movie seek $val]
-    set cur [$_movie get position cur]
+    ${_movie} seek $val
+    ${_imh} put [${_movie} get image ${_width} ${_height}]
+    set cur [${_movie} get position cur]
     set _settings($this-currenttime) [expr double($cur) / double(${_lastFrame})]
 }
@@ -1006 +1060 @@
 }
 
+# ----------------------------------------------------------------------
+# OPTION: -width
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::VideoViewer::width {
+    # $_dispatcher event -idle !fixsize
+    if {[string is integer $itk_option(-width)] == 0} {
+        error "bad value: \"$itk_option(-width)\": width should be an integer"
+    }
+    set _width $itk_option(-width)
+    after idle [itcl::code $this fixSize]
+}
+
+# ----------------------------------------------------------------------
+# OPTION: -height
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::VideoViewer::height {
+    # $_dispatcher event -idle !fixsize
+    if {[string is integer $itk_option(-height)] == 0} {
+        error "bad value: \"$itk_option(-height)\": height should be an integer"
+    }
+    set _height $itk_option(-height)
+    after idle [itcl::code $this fixSize]
+}
+
+# ----------------------------------------------------------------------
+# OPTION: -controls
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::VideoViewer::controls {
+    switch $itk_option(-controls) {
+        show {
+        }
+        hide {
+        }
+        default {
+            error "bad value: \"$itk_option(-height)\": height should be an integer"
+        }
+    }
+    set _height $itk_option(-height)
+    after idle [itcl::code $this fixSize]
+}
+

trunk/lang/tcl/src/RpVideoTclInterface.cc

@@ -26 +26 @@
 static Tcl_ObjCmdProc NextOp;
 static Tcl_ObjCmdProc SeekOp;
+static Tcl_ObjCmdProc SizeOp;
 static Tcl_ObjCmdProc ReleaseOp;
 
 static Rp_OpSpec rpVideoOps[] = {
-    {"get",  1, (void *)GetOp, 3, 5, "[image width height]|[position cur|end]|[framerate]",},
+    {"get",  1, (void *)GetOp, 3, 5, "[image ?width height?]|[position cur|end]|[framerate]",},
     {"next",  1, (void *)NextOp, 2, 2, "",},
     {"seek",  1, (void *)SeekOp, 3, 3, "+n|-n|n",},
+    {"size",  1, (void *)SizeOp, 2, 2, "",},
     {"release", 1, (void *)ReleaseOp, 2, 2, "",},
 };
@@ -56 +58 @@
 
 /*
- * USAGE: Video <file>
+ * USAGE: Video <type> <data>
  */
 static int
@@ -64 +66 @@
     char cmdName[64];
     static int movieCount = 0;
-    const char *filename = Tcl_GetString(objv[1]);
+    const char *type = NULL;
+    const char *data = NULL;
+    int err = 0;
+
+    if (objc != 3) {
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+            "Video <type> <data>\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    type = Tcl_GetString(objv[1]);
+    data = Tcl_GetString(objv[2]);
 
     // create a new command
@@ -74 +87 @@
         return TCL_ERROR;
     }
-    VideoOpenFile(movie,filename,"r");
+
+    if ((*type == 'd') && (strcmp(type,"data") == 0)) {
+        Tcl_AppendResult(interp, "error while creating movie: type == data not supported",
+                         "\n", "VideoInitCmd(movie);", (char*)NULL);
+        return TCL_ERROR;
+    } else if ((*type == 'f') && (strcmp(type,"file") == 0)) {
+        err = VideoOpenFile(movie,data,"r");
+        if (err) {
+            Tcl_AppendResult(interp, "error while creating movie object: ",
+                             "\n", "VideoInitCmd(movie);", (char*)NULL);
+            return TCL_ERROR;
+        }
+    }
 
     sprintf(cmdName,"::movieObj%d",movieCount);
+    movieCount++;
 
     Tcl_CreateObjCommand(interp, cmdName, VideoCallCmd,
@@ -109 +135 @@
  * get position cur
  * get position end
- * get image width height
+ * get image ?width height?
  * get framerate
  *
@@ -153 +179 @@
     }
     else if ((*info == 'i') && (strcmp(info,"image") == 0)) {
-        if (objc != 5) {
+        if ((objc != 3) && (objc != 5)) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", cmd,
-                " image width height\"", (char*)NULL);
+                " image ?width height?\"", (char*)NULL);
             return TCL_ERROR;
         }
 
         void *img = NULL;
-        int width = 0;
-        int height = 0;
+        int width = -1;
+        int height = -1;
         int bufSize = 0;
 
-        Tcl_GetIntFromObj(interp, objv[3], &width);
-        Tcl_GetIntFromObj(interp, objv[4], &height);
-
-//        VideoGoNext((VideoObj *)clientData);
+        if (objc == 5) {
+            Tcl_GetIntFromObj(interp, objv[3], &width);
+            Tcl_GetIntFromObj(interp, objv[4], &height);
+        }
+
         VideoGetImage((VideoObj *)clientData, width, height, &img, &bufSize);
 
@@ -181 +208 @@
 
         double fr = 0;
-
-        VideoGetFrameRate((VideoObj *)clientData, &fr);
+        int err = 0;
+
+        err = VideoGetFrameRate((VideoObj *)clientData, &fr);
+        if (err) {
+            Tcl_AppendResult(interp, "error while calculating framerate",
+                (char*)NULL);
+            return TCL_ERROR;
+        }
         Tcl_SetObjResult(interp, Tcl_NewDoubleObj(fr));
     }
@@ -211 +244 @@
 {
 
-    void *img = NULL;
-    int width = 960;
-    int height = 540;
-    int bufSize = 0;
-
+//    void *img = NULL;
+//    int width = 960;
+//    int height = 540;
+//    int bufSize = 0;
+
+    int pos = 0;
     VideoGoNext((VideoObj *)clientData);
-    VideoGetImage((VideoObj *)clientData, width, height, &img, &bufSize);
-
-    Tcl_SetByteArrayObj(Tcl_GetObjResult(interp),
-                        (const unsigned char*)img, bufSize);
+    VideoGetPositionCur((VideoObj *)clientData,&pos);
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(pos));
+//    VideoGetImage((VideoObj *)clientData, width, height, &img, &bufSize);
+
+//    Tcl_SetByteArrayObj(Tcl_GetObjResult(interp),
+//                        (const unsigned char*)img, bufSize);
 
     return TCL_OK;
@@ -242 +278 @@
 {
 
-    void *img = NULL;
-    int width = 960;
-    int height = 540;
-    int bufSize = 0;
+//    void *img = NULL;
+//    int width = 960;
+//    int height = 540;
+//    int bufSize = 0;
     const char *val_s = NULL;
     int val = 0;
+    int pos = 0;
 
     val_s = Tcl_GetString(objv[2]);
@@ -277 +314 @@
     }
 
-    VideoGetImage((VideoObj *)clientData, width, height, &img, &bufSize);
-
-    if (img == NULL) {
-        printf("img is null\n");
-    }
-
-    Tcl_SetByteArrayObj(Tcl_GetObjResult(interp),
-                        (const unsigned char*)img, bufSize);
+//    VideoGetImage((VideoObj *)clientData, width, height, &img, &bufSize);
+
+//    if (img == NULL) {
+//        printf("img is null\n");
+//    }
+
+//    Tcl_SetByteArrayObj(Tcl_GetObjResult(interp),
+//                        (const unsigned char*)img, bufSize);
+
+    VideoGetPositionCur((VideoObj *)clientData,&pos);
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(pos));
+
+    return TCL_OK;
+}
+
+/**********************************************************************/
+// FUNCTION: SizeOp()
+/// Get the size of the video
+/**
+ * Return the original size of the video frame
+ *
+ * Full function call:
+ *
+ * size
+ *
+ */
+static int
+SizeOp (ClientData clientData, Tcl_Interp *interp, int objc,
+         Tcl_Obj *const *objv)
+{
+
+    int width = 0;
+    int height = 0;
+    int err = 0;
+    Tcl_Obj *dim = NULL;
+
+
+    err = VideoSizeCmd((VideoObj *)clientData,&width,&height);
+
+    if (err) {
+        Tcl_AppendResult(interp, "error while calculating size of video",
+            (char*)NULL);
+        return TCL_ERROR;
+    }
+
+
+    dim = Tcl_NewListObj(0, NULL);
+    Tcl_ListObjAppendElement(interp, dim, Tcl_NewIntObj(width));
+    Tcl_ListObjAppendElement(interp, dim, Tcl_NewIntObj(height));
+    Tcl_SetObjResult(interp, dim);
 
     return TCL_OK;

trunk/src/objects/RpVideo.c

@@ -140 +140 @@
 {
     int fnlen = 0;
+    int err = 0;
 
     if (fileName == NULL) {
@@ -161 +162 @@
     }
     strncpy(vidPtr->fileName,fileName,fnlen);
+    vidPtr->fileName[fnlen] = '\0';
 
     // FIXME: remove this constraint when we support
@@ -170 +172 @@
     if (*mode == 'r') {
         /* we're now in "input" mode */
-        VideoModeRead(vidPtr);
+        err = VideoModeRead(vidPtr);
+        if (err) {
+            return err;
+        }
     } else if (*mode == 'w') {
         /* we're now in "input" mode */
@@ -195 +200 @@
  *  Returns TCL_OK if successful, and TCL_ERROR if there is a problem
  *  opening or closing the stream.
+ *
+ *  Error Codes
+ *  -1
+ *  -2      missing file name
+ *  -3      couldn't open file
+ *  -4      couldn't find streams in file
+ *  -5      couldn't find video stream in file
+ *  -6      unsupported codec for file
+ *  -7      couldn't open codec for file
+ *  -8      couldn't allocate frame space
+ *  -9      strcpy input to vidPtr->mode failed
  * ------------------------------------------------------------------------
  */
@@ -213 +229 @@
         // Tcl_AppendResult(interp, "missing value for -file", (char*)NULL);
         // return TCL_ERROR;
-        return -1;
+
+        // missing file name
+        return -2;
     }
     if (*vidPtr->fileName == '\0') {
@@ -236 +254 @@
         //     fileName, "\"", (char*)NULL);
         // return TCL_ERROR;
-        return -1;
+
+        // couldn't open file
+        return -3;
     }
     if (av_find_stream_info(vidPtr->pFormatCtx) < 0) {
@@ -242 +262 @@
         //     fileName, "\"", (char*)NULL);
         // return TCL_ERROR;
-        return -1;
+
+        // couldn't find streams in file
+        return -4;
     }
 
@@ -260 +282 @@
         //     fileName, "\"", (char*)NULL);
         // return TCL_ERROR;
-        return -1;
+
+        // couldn't find video stream in file
+        return -5;
     }
 
@@ -269 +293 @@
         //     fileName, "\"", (char*)NULL);
         // return TCL_ERROR;
-        return -1;
+
+        // unsupported codec for file
+        return -6;
     }
     if (avcodec_open(vcodecCtx, vcodec) < 0) {
@@ -275 +301 @@
         //     fileName, "\"", (char*)NULL);
         // return TCL_ERROR;
-        return -1;
+
+        // couldn't open codec for file
+        return -7;
     }
 
@@ -287 +315 @@
         //     " for file \"", fileName, "\"", (char*)NULL);
         // return TCL_ERROR;
-        return -1;
+
+        // couldn't allocate frame space
+        return -8;
     }
 
@@ -308 +338 @@
 
     if (strcpy(vidPtr->mode,"input") == NULL) {
-        return -1;
+        // strcpy input to vidPtr->mode failed
+        return -9;
     }
 
@@ -730 +761 @@
         return -1;
     }
+
+    if (vidPtr->pFormatCtx == NULL) {
+        // "internal error: video stream is not open",
+        return -1;
+    }
+
     if (vidPtr->pFormatCtx) {
         vcodecCtx = vidPtr->pFormatCtx->streams[vidPtr->videoStream]->codec;
@@ -773 +810 @@
     }
 
-    if (vidPtr->pFormatCtx == NULL) {
-        // "internal error: video stream is not open",
-        return -1;
-    }
-
     nabs = vidPtr->frameNumber + n;
     return VideoGoToN(vidPtr, nabs);
@@ -872 +904 @@
  */
 int
-VideoGetImage(vidPtr, width, height, img, bufSize)
+VideoGetImage(vidPtr, iw, ih, img, bufSize)
     VideoObj *vidPtr;
-    int width;
-    int height;
+    int iw;
+    int ih;
     void **img;
     int *bufSize;
 {
 
-    int nframe, iw, ih, numBytes;
+    int nframe, numBytes;
     char c, buffer[64];
     AVCodecContext *vcodecCtx;
@@ -893 +925 @@
     }
 
+    /*
     if (vidPtr->pFormatCtx) {
         vcodecCtx = vidPtr->pFormatCtx->streams[vidPtr->videoStream]->codec;
@@ -898 +931 @@
         vcodecCtx = NULL;
     }
+    */
+
+    if (vidPtr->pFormatCtx == NULL) {
+        // vidPtr->pFormatCtx is NULL, video not open
+        return -1;
+    }
+    vcodecCtx = vidPtr->pFormatCtx->streams[vidPtr->videoStream]->codec;
 
     /*
@@ -905 +945 @@
      */
 
-    iw = width;
-    ih = height;
+    // if the user's desired size is less then 0,
+    // use the default size
+
+    if (iw < 0) {
+        iw = vcodecCtx->width;
+    }
+    if (ih < 0) {
+        ih = vcodecCtx->height;
+    }
+
 
     if (iw != vidPtr->rgbw || ih != vidPtr->rgbh) {
@@ -950 +998 @@
 */
 
-        int bufsize = 0; 
+        int bufsize = 0;
         if (vidPtr->img == NULL) {
             VideoAllocImgBuffer(vidPtr,iw,ih);
@@ -990 +1038 @@
     }
 
+    if (vidPtr->pFormatCtx == NULL) {
+        // vidPtr->pFormatCtx is NULL, video not open
+        return -1;
+    }
     vstreamPtr = vidPtr->pFormatCtx->streams[vidPtr->videoStream];
 
@@ -1053 +1105 @@
     }
 
-// FIXME: store the name of the file within vidPtr object
     if (VideoModeRead(vidPtr) != 0) {
         return -1;
@@ -1082 +1133 @@
     }
 
-// FIXME: store the name of the file within vidPtr object
     if (VideoModeRead(vidPtr) != 0) {
         return -1;