Changeset 2711 for trunk

Timestamp:

Dec 2, 2011, 1:54:27 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• gui/scripts/field.tcl (modified) (2 diffs)
• src/objects/RpVideo.c (modified) (3 diffs)
• src/objects/RpVideo.h (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -603 +603 @@
             }
         } elseif {[$_field element $cname.opendx] != ""} {
-            set type "opendx"
+            set type "dx"
         } elseif {[$_field element $cname.dx] != ""} {
             set type "dx"
@@ -809 +809 @@
             set _comp2dims($cname) "3D"
             set _comp2dx($cname)  [$_field get -decode no $cname.dx]
+            if 0 {
+            set data  [$_field get -decode yes $cname.dx]
+            set file "/tmp/junk.dx"
+            set f [open $file "w"]
+            puts $f $data
+            close $f
+            if { [string match "<ODX>*" $data] } {
+                set data [string range $data 5 end]
+                set _comp2dx($cname) \
+                        [Rappture::encoding::encode -as zb64 $data]
+            } 
+            }
             set _comp2style($cname) [$_field get $cname.style]
             if {[$_field element $cname.flow] != ""} {

trunk/src/objects/RpVideo.c

@@ -54 +54 @@
 
 #include "RpVideo.h"
+
+#if LIBAVUTIL_VERSION_MAJOR < 51
+#define AVMEDIA_TYPE_VIDEO      CODEC_TYPE_VIDEO
+#define AV_PKT_FLAG_KEY         PKT_FLAG_KEY            
+#endif  /* LIBAVUTIL_VERSION_MAJOR */
+
 
 /*
@@ -358 +364 @@
     vidPtr->videoStream = -1;
     for (i=0; i < vidPtr->pFormatCtx->nb_streams; i++) {
-        if (vidPtr->pFormatCtx->streams[i]->codec->codec_type
-                == CODEC_TYPE_VIDEO) {
+        if (vidPtr->pFormatCtx->streams[i]->codec->codec_type 
+            == AVMEDIA_TYPE_VIDEO) {
             vidPtr->videoStream = i;
             break;
@@ -1497 +1503 @@
         }
         if (codecCtx->coded_frame->key_frame) {
-            pkt.flags |= PKT_FLAG_KEY;
+            pkt.flags |= AV_PKT_FLAG_KEY;
         }
         pkt.stream_index = vidPtr->outVideoStr->index;

trunk/src/objects/RpVideo.h

@@ -46 +46 @@
 }
 #endif
+