X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2Ftags.c;h=f1b69a9e15720d94551165a73f2477f5b4d8186b;hb=d9e7b27c4c906d5962d53cc00b060c48ddb1b5e3;hp=96929326129d6e6e86d9bb7a5cc9924da9441a0f;hpb=e771c1276a8b8a7831de866b17fc1fba561936e5;p=swftools.git

diff --git a/lib/python/tags.c b/lib/python/tags.c
index 9692932..f1b69a9 100644
--- a/lib/python/tags.c
+++ b/lib/python/tags.c
@@ -123,9 +123,10 @@ static PyObject* po_create(PyObject* self, PyObject* args, PyObject* kwargs,char
     SWFPLACEOBJECT* po;
     po = malloc(sizeof(SWFPLACEOBJECT));
     memset(po, 0, sizeof(SWFPLACEOBJECT));
-
+    
     swf_GetPlaceObject(0, po);
-
+   
+    PyErr_Clear();
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|O!O!isiO!", kwlist, 
 		&character, 
 		&depth, 
@@ -137,6 +138,7 @@ static PyObject* po_create(PyObject* self, PyObject* args, PyObject* kwargs,char
 		&ActionClass, &action
 		))
 	return NULL;
+
     po->depth = depth;
     po->clipdepth = clipdepth;
     po->ratio = ratio;
@@ -417,6 +419,7 @@ typedef struct _text_internal
     SWFFONT* swffont;
     RGBA rgba;
     int size;
+    SRECT bbox;
 } text_internal_t;
 staticforward tag_internals_t placeobject_tag;
 
@@ -425,9 +428,17 @@ static int text_fillTAG(tag_internals_t*self)
     text_internal_t*ti = (text_internal_t*)self->data;
     self->tag= swf_InsertTag(0, ST_DEFINETEXT2);
     swf_SetU16(self->tag, /*ID*/0);
-    SRECT r = swf_SetDefineText(self->tag, ti->swffont, &ti->rgba, ti->text, ti->size);
+    ti->bbox = swf_SetDefineText(self->tag, ti->swffont, &ti->rgba, ti->text, ti->size);
     return 1;
 }
+static PyObject* text_getattr(tag_internals_t*self,char*a)
+{
+    text_internal_t*si = (text_internal_t*)self->data;
+    if(!strcmp(a, "bbox")) {
+	return f_BBox2(si->bbox);
+    }
+    return 0;
+}
 static PyObject* f_DefineText(PyObject* self, PyObject* args, PyObject* kwargs)
 {
     static char *kwlist[] = {"font", "text", "size", "color", NULL};
@@ -441,7 +452,11 @@ static PyObject* f_DefineText(PyObject* self, PyObject* args, PyObject* kwargs)
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!Oi|O!", kwlist, &TagClass, &font, &otext, &size, &ColorClass, &color))
 	return NULL;
-    text = PyString_AS_STRING(PyUnicode_AsUTF8String(otext));
+    if(PyUnicode_Check(otext)) {
+	text = PyString_AS_STRING(PyUnicode_AsUTF8String(otext));
+    } else if(PyString_Check(otext)) {
+	text = PyString_AS_STRING(otext);
+    }
 
     if(color)
 	rgba = color_getRGBA(color);
@@ -466,7 +481,7 @@ static tag_internals_t text_tag =
     parse: 0,
     fillTAG: text_fillTAG,
     dealloc: 0,
-    getattr: 0, 
+    getattr: text_getattr, 
     setattr: 0,
     tagfunctions: 0,
     datasize: sizeof(text_internal_t),
@@ -649,8 +664,6 @@ static PyObject* f_DefineVideoStream(PyObject* self, PyObject* args, PyObject* k
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|i", kwlist, &width, &height, &frames))
 	return NULL;
 
-    printf(": %d %d\n", width, height);
-    
     tag_internals_t*itag = tag_getinternals(tag);
     videostream_internal_t*fi = (videostream_internal_t*)itag->data;
     fi->stream = malloc(sizeof(VIDEOSTREAM));
@@ -684,6 +697,24 @@ static PyObject* videostream_getbheight(PyObject*self, PyObject*args)
     int height = fi->stream->bby;
     return Py_BuildValue("i", height);
 }
+static PyObject* videostream_addBlackFrame(PyObject*self, PyObject*args, PyObject*kwargs)
+{
+    tag_internals_t*_itag = tag_getinternals(self);
+    videostream_internal_t*fi = (videostream_internal_t*)_itag->data;
+    
+    TAG* t = swf_InsertTag(0, ST_VIDEOFRAME);
+    
+    PyObject*tag = tag_new(&videoframe_tag);
+    tag_internals_t*itag = tag_getinternals(tag);
+    
+    swf_SetU16(t,0); /* id */
+    swf_SetVideoStreamBlackFrame(t, fi->stream);
+    fi->lastiframe = fi->stream->frame;
+    
+    itag->tag = t;
+    tagmap_addMapping(itag->tagmap, 0, self);
+    return tag;
+}
 static PyObject* videostream_addFrame(PyObject*self, PyObject*args, PyObject*kwargs)
 {
     tag_internals_t*_itag = tag_getinternals(self);
@@ -708,8 +739,7 @@ static PyObject* videostream_addFrame(PyObject*self, PyObject*args, PyObject*kwa
     if(!pic)
 	return 0;
 
-    
-{  int f,j=0,i=0,rr,gg,bb;
+/*{  int f,j=0,i=0,rr,gg,bb;
    FILE *o;
    RGBA*it = pic;
    char*filename="test.ppm";
@@ -726,7 +756,7 @@ static PyObject* videostream_addFrame(PyObject*self, PyObject*args, PyObject*kwa
     j++;
    }
    fclose(o);
-}
+}*/
 
     TAG* t = swf_InsertTag(0, ST_VIDEOFRAME);
     if((type && (type[0]=='I' || type[0]=='i')) || (type==0 && fi->lastiframe+64 < fi->stream->frame)) {
@@ -753,10 +783,12 @@ static PyObject* videostream_addDistortionFrame(PyObject*self, PyObject*args, Py
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i", kwlist, &array, &quant))
 	return NULL;
 
-    signed char* movex = malloc(fi->stream->bbx * fi->stream->bby);
-    signed char* movey = malloc(fi->stream->bbx * fi->stream->bby);
+    signed char* movex = malloc(fi->stream->bbx * fi->stream->bby * 1);
+    signed char* movey = malloc(fi->stream->bbx * fi->stream->bby * 1);
+    RGBA** pics = (RGBA**)malloc(fi->stream->bbx * fi->stream->bby * sizeof(void*));
     signed char* itx=movex;
     signed char* ity=movey;
+    RGBA**pic=pics;
     int x,y;
     if(!array || !PySequence_Check(array))
 	return PY_ERROR("Not an array");
@@ -771,18 +803,54 @@ static PyObject* videostream_addDistortionFrame(PyObject*self, PyObject*args, Py
 
 	for(x=0;x<fi->stream->bbx;x++) {
 	    PyObject*pixel = PySequence_GetItem(line, x);
+	    PyObject*xy = 0;
+	    PyObject*image = 0;
+
 	    if(!pixel) {
-		*itx = 0;
-		*ity = 0;
+		xy = image = 0;
 	    } else {
-		if(!PyComplex_Check(pixel)) {
-		    return PY_ERROR("Not an array of arrays of complex numbers");
+		if(PyComplex_Check(pixel)) {
+		    xy = pixel; image = 0;
+		} else if(PyString_Check(pixel)) {
+		    xy = 0; image = pixel;
+		} else if(PyTuple_Check(pixel)) {
+		    int size = PyTuple_GET_SIZE(pixel);
+		    if(size!=2) return PY_ERROR("Tuples have to have size 2 (xy,img)");
+		    xy = PyTuple_GetItem(pixel, 0);
+		    if(!xy) return 0;
+		    if(!PyComplex_Check(xy)) return PY_ERROR("Tuples must be (COMPLEX,string)");
+		    image = PyTuple_GetItem(pixel, 1);
+		    if(!image) return 0;
+		    if(!PyString_Check(image)) return PY_ERROR("Tuples must be (complex,STRING)");
 		}
+	    }
+
+	    *itx = *ity = 0;
+	    *pic= 0;
+
+	    if(xy) {
 		*itx = (signed char)PyComplex_RealAsDouble(pixel);
 		*ity = (signed char)PyComplex_ImagAsDouble(pixel);
 	    }
+	    if(image) {
+		char*string;
+		int size;
+		PyString_AsStringAndSize(image,&string,&size);
+		if(size<256*3) {
+		    return PY_ERROR("image strings must be >= 256*3");
+		}
+		*pic = malloc(sizeof(RGBA)*16*16);
+		int t;
+		for(t=0;t<16*16;t++) {
+		    (*pic)[t].r = string[t*3];
+		    (*pic)[t].g = string[t*3+1];
+		    (*pic)[t].b = string[t*3+2];
+		    (*pic)[t].a = 255;
+		}
+	    }
 	    itx++;
 	    ity++;
+	    pic++;
 	}
     }
     
@@ -791,13 +859,20 @@ static PyObject* videostream_addDistortionFrame(PyObject*self, PyObject*args, Py
     
     TAG* t = swf_InsertTag(0, ST_VIDEOFRAME);
     swf_SetU16(t,0); /* id */
-    swf_SetVideoStreamMover(t, fi->stream, movex, movey, quant);
+    swf_SetVideoStreamMover(t, fi->stream, movex, movey,(void**)pics, quant);
 
     itag->tag = t;
     tagmap_addMapping(itag->tagmap, 0, self);
 
+    for(x=0;x<fi->stream->bbx*fi->stream->bby;x++) {
+	if(pics[x]) {
+	    free(pics[x]);pics[x] = 0;
+	}
+    }
+
     free(movex);
     free(movey);
+    free(pics);
 
     return tag;
 }
@@ -805,6 +880,7 @@ static PyMethodDef videostream_methods[] =
 {{"xblocks", videostream_getbwidth, METH_VARARGS, "get's the number of horizontal blocks"},
  {"yblocks", videostream_getbheight, METH_VARARGS, "get's the number of vertical blocks"},
  {"addFrame", (PyCFunction)videostream_addFrame, METH_KEYWORDS, "add a Video Frame"},
+ {"addBlackFrame", (PyCFunction)videostream_addBlackFrame, METH_KEYWORDS, "add a black Video Frame"},
  {"addDistortionFrame", (PyCFunction)videostream_addDistortionFrame, METH_KEYWORDS, "add a MVD frame"},
  {NULL, NULL, 0, NULL}
 };