Changeset 2893 for trunk/video

Timestamp:

Mar 28, 2012, 12:22:32 PM (12 years ago)

Author:

gah

Message:

updates to video package

Location:

trunk/video

Files:

• RpMediaPlayerTclInterface.cc (copied) (copied from trunk/lang/tcl/src/RpMediaPlayerTclInterface.cc)
• RpVideo.c (copied) (copied from trunk/src/objects/RpVideo.c) (13 diffs)
• RpVideo.h (copied) (copied from trunk/src/objects/RpVideo.h)
• RpVideoTclInterface.cc (copied) (copied from trunk/lang/tcl/src/RpVideoTclInterface.cc) (3 diffs)
• hold (deleted)

trunk/video/RpVideo.c

@@ -177 +177 @@
 }
 
-int
-VideoOpenFile(vidPtr, fileName, mode)
-    VideoObj *vidPtr;
-    const char *fileName;
-    const char *mode;
-{
-    int fnlen = 0;
-    int err = 0;
-    int lastframe = 0;
-
-    if (fileName == NULL) {
-        // missing value for fileName
-        // return TCL_ERROR;
-        return -1;
-    }
-    if (fileName == '\0') {
-        /* no file name set -- do nothing */
-        return 0;
-    }
-
-    fnlen = strlen(fileName);
-    if (vidPtr->fileName != NULL) {
-        free(vidPtr->fileName);
-    }
-    vidPtr->fileName = (char *) malloc((fnlen+1)*sizeof(char));
-    if (vidPtr->fileName == NULL) {
-        // trouble mallocing space
-        return -1;
-    }
-    strncpy(vidPtr->fileName,fileName,fnlen);
-    vidPtr->fileName[fnlen] = '\0';
-
-    // FIXME: remove this constraint when we support
-    // the modes: r, r+, w, w+, a, a+, b and combinations
-    if (strlen(mode) > 1) {
-        return -1;
-    }
-
-    if (*mode == 'r') {
-        /* we're now in "input" mode */
-        err = VideoModeRead(vidPtr);
-        if (err) {
-            return err;
-        }
-
-        VideoFindLastFrame(vidPtr,&lastframe);
-        vidPtr->lastframe = lastframe;
-    } else if (*mode == 'w') {
-        /* we're now in "input" mode */
-        // VideoModeWrite(vidPtr);
-    } else {
-        // unrecognized mode
-        return -1;
-    }
-
-    return 0;
-}
-
 /*
  * ------------------------------------------------------------------------
@@ -280 +222 @@
     *lastframe = nframe;
     VideoGoToN(vidPtr,f);
+
+    return 0;
+}
+
+
+int
+VideoOpenFile(vidPtr, fileName, mode)
+    VideoObj *vidPtr;
+    const char *fileName;
+    const char *mode;
+{
+    int fnlen = 0;
+    int err = 0;
+    int lastframe = 0;
+
+    if (fileName == NULL) {
+        // missing value for fileName
+        // return TCL_ERROR;
+        return -1;
+    }
+    if (fileName == '\0') {
+        /* no file name set -- do nothing */
+        return 0;
+    }
+
+    fnlen = strlen(fileName);
+    if (vidPtr->fileName != NULL) {
+        free(vidPtr->fileName);
+    }
+    vidPtr->fileName = (char *) malloc((fnlen+1)*sizeof(char));
+    if (vidPtr->fileName == NULL) {
+        // trouble mallocing space
+        return -1;
+    }
+    strncpy(vidPtr->fileName,fileName,fnlen);
+    vidPtr->fileName[fnlen] = '\0';
+
+    // FIXME: remove this constraint when we support
+    // the modes: r, r+, w, w+, a, a+, b and combinations
+    if (strlen(mode) > 1) {
+        return -1;
+    }
+
+    if (*mode == 'r') {
+        /* we're now in "input" mode */
+        err = VideoModeRead(vidPtr);
+        if (err) {
+            return err;
+        }
+
+        VideoFindLastFrame(vidPtr,&lastframe);
+        vidPtr->lastframe = lastframe;
+    } else if (*mode == 'w') {
+        /* we're now in "input" mode */
+        // VideoModeWrite(vidPtr);
+    } else {
+        // unrecognized mode
+        return -1;
+    }
 
     return 0;
@@ -315 +316 @@
     VideoObj *vidPtr;
 {
-    char c, buffer[64]; int i;
+    int i;
     const char *fmt;
     AVCodecContext *vcodecCtx;
@@ -358 +359 @@
     }
 #endif
+#ifdef HAVE_AVFORMAT_FIND_STREAM_INFO
+    if (avformat_find_stream_info(vidPtr->pFormatCtx, NULL) < 0) {
+#else
     if (av_find_stream_info(vidPtr->pFormatCtx) < 0) {
+#endif
         // Tcl_AppendResult(interp, "couldn't find streams in file \"",
         //     fileName, "\"", (char*)NULL);
@@ -397 +402 @@
         return -6;
     }
+#ifdef HAVE_AVCODEC_OPEN2
+    if (avcodec_open2(vcodecCtx, vcodec, NULL) < 0) {
+#else
     if (avcodec_open(vcodecCtx, vcodec) < 0) {
+#endif
         // Tcl_AppendResult(interp, "couldn't open codec for file \"",
         //     fileName, "\"", (char*)NULL);
@@ -925 +934 @@
     int n;
 {
-    int nrel, nabs, seekFlags, gotframe, t;
+    int nrel, nabs, seekFlags, gotframe;
     int64_t nseek;
     AVCodecContext *vcodecCtx;
@@ -1031 +1040 @@
 {
 
-    int nframe, numBytes;
-    char c, buffer[64];
+    int numBytes;
     AVCodecContext *vcodecCtx;
-    AVStream *vstreamPtr;
 
     if (vidPtr == NULL) {
@@ -1117 +1124 @@
 */
 
-        int bufsize = 0;
         if (vidPtr->img == NULL) {
             VideoAllocImgBuffer(vidPtr,iw,ih);
@@ -1176 +1182 @@
     const char **fname;
 {
-    AVStream *vstreamPtr;
-
     if (vidPtr == NULL) {
         return -1;
@@ -1231 +1235 @@
     int *den;
 {
-    AVCodecContext *vcodecCtx;
     int width = 0;
     int height = 0;
     int64_t gcd = 0;
-    int64_t gcd2 = 0;
 
     if (vidPtr == NULL) {
@@ -1315 +1317 @@
 {
     int fnum = -1;
-    AVStream *vstreamPtr;
 
     if (vidPtr == NULL) {
@@ -1342 +1343 @@
     int *pos;
 {
-    AVStream *vstreamPtr;
-
     if (vidPtr == NULL) {
         return -1;
@@ -1658 +1657 @@
     }
     if (vidPtr->pFormatCtx) {
+#ifdef HAVE_AVFORMAT_CLOSE_INPUT
+        avformat_close_input(&vidPtr->pFormatCtx);
+#else
         av_close_input_file(vidPtr->pFormatCtx);
+#endif
         vidPtr->pFormatCtx = NULL;
     }

trunk/video/RpVideoTclInterface.cc

@@ -17 +17 @@
 #include "RpVideo.h"
 
-extern "C" Tcl_AppInitProc RpVideo_Init;
+extern "C" Tcl_AppInitProc Rpvideo_Init;
 
 #include "RpOp.h"
@@ -54 +54 @@
  */
 int
-RpVideo_Init(Tcl_Interp *interp)
+Rpvideo_Init(Tcl_Interp *interp)
 {
 
@@ -521 +521 @@
     return TCL_OK;
 }
+