X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=avi2swf%2Favi2swf.cc;h=d0fd82379dd2ee7e991826cfce9222ec8f004127;hp=84fad76c3b74f9ae6e4d99ffe659d913ab93b0ac;hb=133453cc112df7e7d5ce35f3dde5178303154da5;hpb=b35ef028cc3f91c3e349aa8c330f52dba3da29b3

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index 84fad76..d0fd823 100644
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -3,16 +3,44 @@
 
    Part of the swftools package.
    
-   Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
+   Copyright (c) 2001,2002,2003 Matthias Kramm <kramm@quiss.org>
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   This file is distributed under the GPL, see file COPYING for details */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <fcntl.h>
+
+#include "../config.h"
+
+#ifdef HAVE_SIGNAL_H
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#include <signal.h>
+#define DO_SIGNALS
+#endif
+#endif
+
 extern "C" {
-#include "../lib/rfxswf.h"
 #include "../lib/args.h"
 }
+#include "v2swf.h"
+#include "../lib/q.h"
+
+#undef HAVE_CONFIG_H
 #include <avifile/version.h>
 #if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) 
    #include <avifile.h>
@@ -31,48 +59,34 @@ extern "C" {
    #define Bpp bpp
 #endif
 
-/*
-statistics: (for now)
-   37   bytes per shape (rectangle)
-   8-12 bytes per placeobject
-   4    bytes per removeobject2
-   696+ bytes per definejpeg2 (576 jpegtables)
-   576  bytes per jpegtables
-   122+ bytes per definejpeg
-
-   blocks*140 = minimal bytes per frames
-   5000/140   = maximal blocks with framerate 5000
-
-   2    bytes per showframe
-*/
-
-static int cache_size=38; //in frames
-
 static char * filename = 0;
 static char * outputfilename = "output.swf";
-static unsigned int firstframe = 0;
-static unsigned int lastframe = 0x7fffffff;
-
-static int jpeg_quality = 20;
+int verbose = 0;
 
-static char zlib = 0;
+static int quality = 80;
 static double scale = 1.0;
 static int flip = 0;
-
-#ifndef ST_DEFINEBITSJPEG
-#define ST_DEFINEBITSJPEG       6 
-#endif
-  
-int filesize = 0;
+static int expensive = 0;
+static int flashversion = 6;
+static int keyframe_interval = -1;
+static int skip = 0;
+static float audio_adjust = 0;
+static int mp3_bitrate = 32;
+static int samplerate = 11025;
 
 struct options_t options[] =
 {
  {"v","verbose"},
+ {"A","adjust"},
  {"o","output"},
- {"n","num"},
  {"p","flip"},
- {"s","start"},
- {"z","zlib"},
+ {"m","mp3-bitrate"},
+ {"r","mp3-samplerate"},
+ {"q","quality"},
+ {"s","scale"},
+ {"S","skip"},
+ {"x","extragood"},
+ {"T","flashversion"},
  {"V","version"},
  {0,0}
 };
@@ -80,26 +94,65 @@ struct options_t options[] =
 int args_callback_option(char*name,char*val)
 {
     if(!strcmp(name, "V")) {
-        printf("avi2swf - part of %s %s\n", PACKAGE, VERSION);
+        printf("avi2swf-ng - part of %s %s\n", PACKAGE, VERSION);
         exit(0);
     } 
     else if(!strcmp(name, "o")) {
 	outputfilename = val;
 	return 1;
     }
-    else if(!strcmp(name, "n")) {
-	lastframe = atoi(val);
-	return 1;
-    }
-    else if(!strcmp(name, "s")) {
-	firstframe = atoi(val);
+    else if(!strcmp(name, "q")) {
+	quality = atoi(val);
+	if(quality<0)
+	    quality = 0;
+	if(quality>100)
+	    quality = 100;
 	return 1;
     }
     else if(!strcmp(name, "p")) {
 	flip = 1;
 	return 0;
     }
-    else if(!strcmp(name, "d")) {
+    else if(!strcmp(name, "A")) {
+	audio_adjust = atof(val);
+	return 1;
+    }
+    else if(!strcmp(name, "v")) {
+	verbose = 1;
+	return 0;
+    }
+    else if(!strcmp(name, "T")) {
+	flashversion = atoi(val);
+	return 1;
+    }
+    else if(!strcmp(name, "x")) {
+	expensive = 1;
+	return 0;
+    }
+    else if(!strcmp(name, "m")) {
+	mp3_bitrate = atoi(val);
+	return 0;
+    }
+    else if(!strcmp(name, "r")) {
+        samplerate = atoi(val);
+        if(samplerate >= 11000 && samplerate <= 12000)
+            samplerate = 11025;
+        else if(samplerate >= 22000 && samplerate <= 23000)
+            samplerate = 22050;
+        else if(samplerate >= 44000 && samplerate <= 45000)
+            samplerate = 44100;
+        else {
+            fprintf(stderr, "Invalid samplerate: %d\n", samplerate);
+            fprintf(stderr, "Allowed values: 11025, 22050, 44100\n", samplerate);
+            exit(1);
+        }
+        return 1;
+    }
+    else if(!strcmp(name, "S")) {
+	skip = atoi(val);
+	return 1;
+    }
+    else if(!strcmp(name, "s")) {
 	scale = atoi(val)/100.0;
 	if(scale>1.0 || scale<=0) {
 	    fprintf(stderr, "Scale must be in the range 1-100!\n");
@@ -107,10 +160,6 @@ int args_callback_option(char*name,char*val)
 	}
 	return 1;
     }
-    else if(!strcmp(name, "z")) {
-	zlib = 1;
-	return 0;
-    }
     fprintf(stderr, "Unknown option: -%s\n", name);
     exit(1);
 }
@@ -123,10 +172,17 @@ void args_callback_usage(char*name)
     printf("\nUsage: %s file.avi\n", name);
     printf("\t-h , --help\t\t Print help and exit\n");
     printf("\t-o , --output filename\t Specify output filename\n"); 
+    printf("\t-A , --adjust seconds\t Audio adjust: Shift sound -seconds to the future or +seconds into the past.\n"); 
     printf("\t-n , --num frames\t Number of frames to encode\n");
-    printf("\t-s , --start frame\t First frame to encode\n");
-    printf("\t-d , --scale factor\t Scale to factor percent\n");
+    printf("\t-m , --mp3-bitrate <rate> (kbps)\t Set the mp3 bitrate to encode audio with\n");
+    printf("\t-r , --mp3-samplerate <rate> (Hz)\t Set the mp3 samplerate to encode audio with (default: 11025)\n");
+    printf("\t-d , --scale <val>\t Scale down to factor <val>. (in %, e.g. 100 = original size)\n");
     printf("\t-p , --flip\t\t Turn movie upside down\n");
+    printf("\t-q , --quality <val>\t Set the quality to <val>. (0-100, 0=worst, 100=best, default:80)\n");
+    printf("\t-x , --extragood\t Enable some *very* expensive compression strategies. You may\n");
+    printf("\t                \t want to let this run overnight.\n");
+    printf("\t-T , --flashversion <n>\t Set output flash version to <n>. Notice: H.263 compression will only be\n");
+    printf("\t                       \t used for n >= 6.\n");
     printf("\t-V , --version\t\t Print program version and exit\n");
     exit(0);
 }
@@ -140,694 +196,404 @@ int args_callback_command(char*name,char*val)
     return 0;
 }
 
-/* id allocation/deallocation */
-char idtab[65536];
-unsigned int idtab_pos=1;
-int get_free_id()
+static char toabuf[128];
+static char*ftoa(double a)
 {
-    while(idtab[idtab_pos] || !idtab_pos)
-	idtab_pos++;
-    idtab[idtab_pos]=1;
-    return idtab_pos;
+    sprintf(toabuf, "%f", a);
+    return toabuf;
 }
-void free_id(int id)
+static char*itoa(int a)
 {
-    idtab[id] = 0;
+    sprintf(toabuf, "%d", a);
+    return toabuf;
 }
 
-void makeshape(int file, int id, int gfxid, int width, int height)
+typedef struct _videoreader_avifile_internal
+{
+    IAviReadFile* player;
+    IAviReadStream* astream;
+    IAviReadStream* vstream;
+    int do_audio;
+    int do_video;
+    int eof;
+    int frame;
+    int soundbits;
+    ringbuffer_t audio_buffer;
+} videoreader_avifile_internal;
+
+static int shutdown_avi2swf = 0;
+static int frameno = 0;
+
+#ifdef DO_SIGNALS
+pthread_t main_thread;
+static void sigterm(int sig)
 {
-    TAG*tag;
-    RGBA rgb;
-    MATRIX m;
-    SHAPE*s;
-    SRECT r;
-    int lines = 0;
-    int ls,fs;
-    tag = swf_InsertTag(NULL, ST_DEFINESHAPE);
-    swf_ShapeNew(&s);
-    rgb.b = rgb.g = rgb.r = 0xff;
-    if(lines)
-	ls = swf_ShapeAddLineStyle(s,20,&rgb);  
-    swf_GetMatrix(NULL,&m);
-    m.sx = 20*65536;
-    m.sy = 20*65536;
-
-    fs = swf_ShapeAddBitmapFillStyle(s,&m,gfxid,0);
-    swf_SetU16(tag,id);   // ID   
-    r.xmin = 0;
-    r.ymin = 0;
-    r.xmax = width*20;
-    r.ymax = height*20;
-    swf_SetRect(tag,&r);
-
-    swf_SetShapeStyles(tag,s);
-    swf_ShapeCountBits(s,NULL,NULL);
-    swf_SetShapeBits(tag,s);
-
-    swf_ShapeSetAll(tag,s,0,0,lines?ls:0,fs,0);
-
-    swf_ShapeSetLine(tag,s,width*20,0);
-    swf_ShapeSetLine(tag,s,0,height*20);
-    swf_ShapeSetLine(tag,s,-width*20,0);
-    swf_ShapeSetLine(tag,s,0,-height*20);
-    swf_ShapeSetEnd(tag);
-    filesize += swf_WriteTag(file, tag);
-    swf_DeleteTag(tag);
-    swf_ShapeFree(s);
+    if(pthread_equal (pthread_self(), main_thread))
+    {
+	if(frameno>0 && !shutdown_avi2swf) {
+	    if(verbose)
+		printf("Thread [%08x] got sigterm %d\n", pthread_self(), sig);
+	    shutdown_avi2swf++;
+	} else {
+	    exit(1);
+	}
+    }
 }
+#endif
 
-void setshape(int file,int id,int depth,int x,int y,CXFORM*cx)
+static void readSamples(videoreader_avifile_internal*i, void*buffer, int buffer_size, int numsamples)
 {
-    TAG*tag;
-    MATRIX m;
-    m.sx = 0x10000; m.sy = 0x10000;
-    m.r0 = 0; m.r1 = 0;
-    m.tx = x*20; 
-    m.ty = y*20;
-    if(cx && !((cx->a0!=256)||(cx->r0!=256)||(cx->g0!=256)||(cx->b0!=256)
-		||(cx->a1|cx->r1|cx->g1|cx->b1))) cx = 0;
-    tag = swf_InsertTag(NULL,ST_PLACEOBJECT2);
-      swf_ObjectPlace(tag,id,depth,&m,cx,0);
-    filesize += swf_WriteTag(file, tag);
-    swf_DeleteTag(tag);
+    int ret;
+    while(i->audio_buffer.available < buffer_size) {
+	unsigned int samples_read = 0, bytes_read = 0;
+	ret = i->astream->ReadFrames(buffer, buffer_size, numsamples, samples_read, bytes_read);
+	if(samples_read<=0)
+	    return;
+	ringbuffer_put(&i->audio_buffer, buffer, bytes_read);
+    }
+    ringbuffer_read(&i->audio_buffer, buffer, buffer_size);
 }
+int videoreader_avifile_getsamples(videoreader_t* v, void*buffer, int num)
+{
+    if(verbose) {
+	printf("videoreader_getsamples(%d)\n", num);fflush(stdout);
+    }
+    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
+    if(i->soundbits == 8) {
+	readSamples(i, buffer, num/2, num/(v->channels*2));
+	unsigned char*b = (unsigned char*)buffer;
+	int t;
+	for(t=num-2;t>=0;t-=2) {
+	    unsigned char x = b[t/2];
+	    b[t] = 0;
+	    b[t+1] = x-128;
+	}
+	return num;
+    }
+    if(i->soundbits == 16) {
+	readSamples(i, buffer, num, num/(v->channels*2));
+	return num;
+    }
+    return 0;
+}
+int videoreader_avifile_getimage(videoreader_t* v, void*buffer)
+{
+    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
+    if(verbose) {
+	printf("videoreader_getimage()\n");fflush(stdout);
+    }
 
+    if(shutdown_avi2swf)
+	i->eof = 1;
+    
+    if(i->eof)
+	return 0;
 
-int xblocksize;
-int yblocksize;
-struct GfxBlock {
-//    static int xblocksize;
-//    static int yblocksize;
-    U8*data;
-    int len;
-};
-
-int width=0;
-int height=0;
-
-int xblocks;
-int yblocks;
-
-U8* blockbuffer = 0;
-   
-class GfxBlockCache {
-
-    GfxBlock*list;
-    char*expire; //0=block's free
-    int*ids;
-    int size;
-    int pos;
-    int hits;
-    int misses;
+    if(i->vstream->ReadFrame() < 0) {
+	if(verbose) printf("vstream->ReadFrame() returned value < 0, shutting down...\n");
+	i->eof = 1;
+	return 0;
+    }
+    CImage*img2 = 0;
+    CImage*img = i->vstream->GetFrame();
+    if(!img) {
+	if(verbose) printf("vstream->GetFrame() returned NULL, shutting down...\n");
+	i->eof = 1;
+	return 0;
+    }
+    /* we convert the image to YUV first, because we can convert to RGB from YUV only */
+    img->ToYUV();
+    img->ToRGB();
+    if(img->Bpp() != 3) {
+	if(verbose) printf("Warning: converthing from bpp %d to bpp 3, this fails on older avifile versions...\n", img->Bpp());
+	BitmapInfo tmp(v->width, v->height, 24);
+	img2 = new CImage(img, &tmp);
+	img = img2;
+    }
 
-    public:
 
-    GfxBlockCache(int file) 
-    {
-	list=0;
-	size = xblocks*yblocks*cache_size;
-	printf("initializing cache (%d entries)\n", size);
-	list = new GfxBlock[size];
-	expire = new char[size];
-	ids = new int[size];
-	memset(expire,0,size);
-	memset(list,0,sizeof(GfxBlock)*size);
-	memset(ids,0,sizeof(int)*size);
-	pos = 0;
-	hits =0;
-	misses =0;
-    }
-    void insert(GfxBlock*block, int gfxid)
-    {
-	int oldpos = pos;
-	while(++pos!=oldpos)
-	{
-	    if(pos==size) pos=0;
-	    if(!expire[pos])
-		break;
-	}
-	if(pos==oldpos) {
-	    // cache full- don't insert item
-	    return;
-	}
-	if(list[pos].data) {
-	    free(list[pos].data);
-	    list[pos].data = 0;
-	    //TODO: free this in the SWF, also
-	}
-	list[pos].data=(U8*)malloc(block->len);
-	memcpy(list[pos].data,block->data,block->len);
-	list[pos].len = block->len;
-	expire[pos] = cache_size;
-	ids[pos] = gfxid;
-    }
-    int find(GfxBlock*block, CXFORM*cxform)
-    {
-	//TODO: do least square regression here to derive cxform
-	int s;
-	int bestsum=-1;
-	int bestid;
-	float best;
-	for(s=0;s<size;s++)
-	if(expire[s])
-	{
-	    int t = (block->len);
-	    U8*ptr1 = block->data;
-	    U8*ptr2 = list[s].data;
-	    int sum2 = 0;
-	    // notice: we treat r,g,b as equal here.
-	    do {
-		int a = (*ptr1++)-(*ptr2++);
-		sum2 += a*a;
-	    } while(--t);
-	    if(bestsum < 0 || bestsum > sum2) {
-		bestid = s;
-		bestsum = sum2;
+    frameno++;
+    i->frame++;
+    unsigned char*data = img->Data();
+    int bpp = img->Bpp();
+    if(bpp == 3) {
+	int x,y;
+	for(y=0;y<v->height;y++) {
+	    unsigned char*from,*to;
+	    to = &((unsigned char*)buffer)[y*v->width*4];
+	    if(flip)
+		from = img->At(v->height-y-1);
+	    else
+		from = img->At(y);
+	    for(x=0;x<v->width;x++) {
+		to[x*4+0] = 0;
+		to[x*4+1] = from[x*3+2];
+		to[x*4+2] = from[x*3+1];
+		to[x*4+3] = from[x*3+0];
 	    }
 	}
-	if(bestsum<0) {
-	    misses++;
-	    return -1;
-	}
-	best = bestsum/block->len;
-
-	if(best > 96.0) {
-	    misses++;
-	    return -1;
-	} 
-	expire[bestid]= cache_size;
-	hits++;
-	cxform->a0 = 256;
-	cxform->r0 = 256;
-	cxform->g0 = 256;
-	cxform->b0 = 256;
-	cxform->a1 = 0;
-	cxform->r1 = 0;
-	cxform->g1 = 0;
-	cxform->b1 = 0;
-	return ids[bestid];
-    }
-    void newframe()
-    {
-	int t;
-	for(t=0;t<size;t++)
-	    if(expire[t])
-		expire[t]--;
-
+	if(img2) delete img2;
+	return v->width*v->height*4;
+    } else {
+	if(img2) delete img2;
+	if(verbose) printf("Can't handle bpp %d, shutting down...\n", bpp);
+	return 0;
     }
-    ~GfxBlockCache()
-    {
-	int t;
-	printf("destroying cache...\n");
-	if(hits+misses) {
-	    printf("hits:%d (%02d%%)\n", hits, hits*100/(hits+misses));
-	    printf("misses:%d (%02d%%)\n", misses, misses*100/(hits+misses));
-	}
-	for(t=0;t<size;t++)
-	    if(expire[t] && list[t].data)
-		free(list[t].data);
-	free(list);
-	free(expire);
-	free(ids);
-    }
-} * cache = 0;
-
-class GfxBlockEncoder {
-    int sizex;
-    int sizey;
-    int posx;
-    int posy;
-    int basedepth;
-    int depth[3];
-    public:
-    void init(int depth, int posx,int posy, int sizex, int sizey) 
-    {
-	this->basedepth = depth;
-	this->posx = posx;
-	this->posy = posy;
-	this->sizex = sizex;
-	this->sizey = sizey;
-	this->depth[0] = this->depth[1] = this->depth[2] = -1;
-    }
-    void clear(int file)
-    {
-	/* clear everything in the block */
-	int t;
-	for(t=0;t<3;t++)
-	if(depth[t]>=0)
-	{
-	    TAG*tag;
-	    tag = swf_InsertTag(NULL, ST_REMOVEOBJECT2);
-	    swf_SetU16(tag, basedepth+t); //depth
-	    filesize += swf_WriteTag(file, tag);
-	    swf_DeleteTag(tag);
-	    depth[t] = -1;
-	}
+}
+bool videoreader_avifile_eof(videoreader_t* v)
+{
+    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
+    if(verbose) {
+	printf("videoreader_eof()\n");fflush(stdout);
     }
-    void writeiframe(int file, GfxBlock*block)
-    {
-	clear(file);
-
-	int gfxid = get_free_id();
-	int shapeid = get_free_id();
-
-	//memset(data,0,sizex*sizey*3);
-	TAG*tag = swf_InsertTag(NULL, ST_DEFINEBITS);
-	JPEGBITS * jb = swf_SetJPEGBitsStart(tag,sizex,sizey,jpeg_quality);
-	tag->len = 0; //bad hack
-	swf_SetU16(tag, gfxid);
-	int y;
-	for(y=0;y<sizey;y++)
-	    swf_SetJPEGBitsLine(jb,&block->data[y*sizex*3]);
-	swf_SetJPEGBitsFinish(jb);
-	filesize += swf_WriteTag(file, tag);
-	swf_DeleteTag(tag);
-
-	cache->insert(block, shapeid);
-
-	makeshape(file, shapeid, gfxid, sizex, sizey);
-	setshape(file, shapeid, basedepth+1, posx, posy, 0);
-	depth[1] = shapeid;
-    }
-    void writereference(int file, int shapeid, CXFORM*form)
-    {
-	if(depth[1]!=shapeid)
-	{
-	    clear(file);
-	    setshape(file, shapeid, basedepth+1, posx, posy, form);
-	    depth[1] = shapeid;
-	}
+    return i->eof;
+}
+void videoreader_avifile_close(videoreader_t* v)
+{
+    videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
+    if(verbose) {
+	printf("videoreader_close()\n");fflush(stdout);
     }
-    void compress(int file, GfxBlock*block)
-    {	
-	CXFORM form;
-	int id = cache->find(block, &form);
-	if(id<0)
-	    writeiframe(file, block);
-	else {
-	    writereference(file, id, &form);
-	}
+    if(i->do_audio) {
+	ringbuffer_clear(&i->audio_buffer);
     }
-} *blocks = 0;
-
-void initdisplay(int file)
+}
+void* videoreader_avifile_getinfo(videoreader_t* v, char* name)
 {
-    if(blockbuffer)
-	free(blockbuffer);
-    if(blocks) {
-	int t;
-	for(t=0;t<xblocks;t++)
-	    blocks[t].clear(file);
-	free(blocks);
-    }
-    if(cache)
-	delete cache;
-    xblocksize = (width/3)&~7;
-    yblocksize = (height/2)&~7;
-    xblocks = width/xblocksize;
-    yblocks = height/yblocksize;
-    printf("%dx%d blocks of size %dx%d\n", xblocks,yblocks, xblocksize, yblocksize);
-    printf("cutting lower %d lines, right %d columns\n", 
-	    height-yblocks*yblocksize, width-xblocks*xblocksize);
-    blocks = new GfxBlockEncoder[xblocks*yblocks];
-    blockbuffer = new U8[xblocksize*yblocksize*4]; //should be 3
-    cache = new GfxBlockCache(file);
-    int t;
-    for(t=0;t<xblocks*yblocks;t++) {
-	blocks[t].init(t*64,
-		       (t%xblocks)*xblocksize,
-		       (t/xblocks)*yblocksize,
-		       xblocksize, yblocksize);
-    }
-
-    TAG*tag = swf_InsertTag(NULL, ST_JPEGTABLES);
-    JPEGBITS * jpeg = swf_SetJPEGBitsStart(tag, xblocksize, yblocksize, jpeg_quality);
-    filesize += swf_WriteTag(file, tag);
-    swf_DeleteTag(tag);
-    free(jpeg);
+    return 0;
 }
-
-void destroydisplay(int file)
+void videoreader_avifile_setparameter(videoreader_t*v, char*name, char*value)
 {
-    delete cache;
-    free(blocks);
-    free(blockbuffer);
+    if(verbose) {
+	printf("videoreader_setparameter(%s, %s)\n", name, value);fflush(stdout);
+    }
 }
 
-SWF swf;
-TAG*tag;
-
-class SoundReader
+int videoreader_avifile_open(videoreader_t* v, char* filename)
 {
-
-    short int* sound_buffer;
-    int mp3_block_size;
-    int write_pos;
-    int read_pos;
-    IAviReadStream* astream;
-    void readBlock()
-    {
-	unsigned samples_read, bytes_read;
-	int ret;
-	short int tmpbuf[4096];
-	ret = astream->ReadFrames(tmpbuf, 4096*sizeof(short int),
-		4096, samples_read, bytes_read);
-	if(ret<0) {
-	    printf("couldn't read %d samples\n", mp3_block_size);
-	    exit(1);
-	}
-	int t;
-	samples_read = bytes_read/sizeof(short int);
-	for(t=0;t<samples_read/2;t++) {
-	    sound_buffer[write_pos+t] = tmpbuf[t*2];
-	}
-	write_pos += samples_read/2;
-
-	if(write_pos >= mp3_block_size*8)
-	{
-	    if(write_pos > mp3_block_size*8)
-		memcpy(&sound_buffer[0],&sound_buffer[mp3_block_size*8],write_pos - mp3_block_size*8);
-	    write_pos %= (mp3_block_size*8);
-	}
+    videoreader_avifile_internal* i;
+    i = (videoreader_avifile_internal*)malloc(sizeof(videoreader_avifile_internal));
+    memset(i, 0, sizeof(videoreader_avifile_internal));
+    memset(v, 0, sizeof(videoreader_t));
+    v->getsamples = videoreader_avifile_getsamples;
+    v->getinfo = videoreader_avifile_getinfo;
+    v->close = videoreader_avifile_close;
+    v->eof = videoreader_avifile_eof;
+    v->getimage = videoreader_avifile_getimage;
+    v->getsamples = videoreader_avifile_getsamples;
+    v->setparameter = videoreader_avifile_setparameter;
+    v->internal = i;
+    
+    i->do_video = 1;
+    i->do_audio = 1;
+
+    i->player = CreateIAviReadFile(filename);    
+    if(verbose) {
+	printf("%d streams (%d video, %d audio)\n", 
+		i->player->StreamCount(),
+		i->player->VideoStreamCount(),
+		i->player->AudioStreamCount());
     }
-    public:
-
-    SoundReader(IAviReadStream*astream)
-    {
-	this->astream = astream;
-	this->write_pos = 0;
-	this->read_pos = 0;
-	this->mp3_block_size = 2304;
-	this->sound_buffer = new short int[mp3_block_size*16];
+    i->astream = i->player->GetStream(0, AviStream::Audio);
+    i->vstream = i->player->GetStream(0, AviStream::Video);
+    if(!i->vstream) {
+	printf("Couldn't open video stream\n");
+	i->do_video = 0;
     }
-    ~SoundReader()
-    {
-	delete sound_buffer;
+    if(!i->astream) {
+	printf("Couldn't open video stream\n");
+	i->do_audio = 0;
     }
-    int available()
-    {
-	if(read_pos<=write_pos)
-	    return write_pos-read_pos;
-	else
-	    return (write_pos+mp3_block_size*8)-read_pos;
+#ifdef NO_MP3
+    if(i->do_audio) {
+	printf(stderr, "MP3 support has been disabled at compile time, not converting soundtrack");
+	i->do_audio = 0;
+    }
+#endif
+
+    if(!i->do_video && !i->do_audio) {
+	printf("File has neither audio nor video streams.(?)\n");
+	return 0;
     }
-    short int* readFrame()
+
+#ifndef VERSION6
+    MainAVIHeader head;
+    int dwMicroSecPerFrame = 0;
+    player->GetFileHeader(&head);
+    printf("fps: %d\n", 1000000/head.dwMicroSecPerFrame);
+    printf("frames: %d\n", head.dwTotalFrames);
+    printf("streams: %d\n", head.dwStreams);
+    printf("width: %d\n", head.dwWidth);
+    printf("height: %d\n", head.dwHeight);
+    printf("sound: %u samples (%f seconds)\n", i->astream->GetEndPos(), i->astream->GetEndTime());
+    v->width = head.dwWidth;
+    v->height = head.dwHeight;
+    dwMicroSecPerFrame = head.dwMicroSecPerFrame;
+    samplesperframe = astream->GetEndPos()/astream->GetEndTime()*head.dwMicroSecPerFrame/1000000;
+    v->rate = (int)(astream->GetEndPos()/astream->GetEndTime());
+    v->fps = 1000000.0/dwMicroSecPerFrame;
+    i->soundbits = 16;
+#else
+    if(i->do_video)
     {
-	int tmp;
-	while(available()<mp3_block_size) {
-	    readBlock();
-	}
-	tmp = read_pos;
-	read_pos += mp3_block_size;
-	read_pos %= mp3_block_size*8;
-	return &sound_buffer[tmp];
+	StreamInfo*videoinfo;
+	videoinfo = i->vstream->GetStreamInfo();
+	v->width = videoinfo->GetVideoWidth();
+	v->height = videoinfo->GetVideoHeight();
+	v->fps = (double)(videoinfo->GetFps());
     }
-};
+    if(i->do_audio)
+    {
+	WAVEFORMATEX wave;
+	StreamInfo*audioinfo;
+
+	i->astream->GetAudioFormatInfo(&wave,0);
+	audioinfo = i->astream->GetStreamInfo();
 
+	v->channels = wave.nChannels;
+	v->rate = wave.nSamplesPerSec;
+	i->soundbits = wave.wBitsPerSample;
 
-static int mp3_block_size = 2304;
+	if(v->channels==0 || v->rate==0 || i->soundbits==0 || wave.wFormatTag!=1) {
+	    v->rate = audioinfo->GetAudioSamplesPerSec();
+	    v->channels = audioinfo->GetAudioChannels();
+	    i->soundbits = audioinfo->GetAudioBitsPerSample();
+	}
+
+	if(verbose) {
+	    printf("formatinfo: format %d, %d channels, %d bits/sample, rate %d, blockalign %d\n", wave.wFormatTag, wave.nChannels, wave.wBitsPerSample, wave.nSamplesPerSec, wave.nBlockAlign);
+	    printf("audioinfo: %d channels, %d bits/sample, rate %d\n", audioinfo->GetAudioChannels(), audioinfo->GetAudioBitsPerSample(), audioinfo->GetAudioSamplesPerSec());
+	}
+	if(i->soundbits != 8 && i->soundbits != 16) {
+	    printf("Can't handle %d bit audio, disabling sound\n", wave.wBitsPerSample);
+	    i->do_audio = 0;
+	    i->soundbits = 0;
+	    v->channels = 0;
+	    v->rate = 0;
+	}
+    }
+#endif
+    i->vstream -> StartStreaming();
+    if(i->do_audio) {
+	i->astream -> StartStreaming();
+	ringbuffer_init(&i->audio_buffer);
+#ifdef VERSION6
+	WAVEFORMATEX wave;
+	i->astream -> GetOutputFormat(&wave, sizeof(wave));
+	printf("formatinfo: format %d, %d channels, %d bits/sample, rate %d, blockalign %d\n", wave.wFormatTag, wave.nChannels, wave.wBitsPerSample, wave.nSamplesPerSec, wave.nBlockAlign);
+#endif
+    }
 
-static int do_video = 1;
-static int do_audio = 1;
+    return 1;
+}
 
 int main (int argc,char ** argv)
 { 
-  int file;
-  IAviReadFile* player;
-  IAviReadStream* astream;
-  IAviReadStream* vstream;
-  SRECT r;
-  double samplesperframe;
-  int samplerate;
-  int samplefix;
-  double fps;
-  int oldwidth;
-  int oldheight;
-  double reziscale;
-
-  processargs(argc, argv);
-  lastframe += firstframe;
-  if(!filename)
-      exit(0);
-
-  memset(idtab, 0, sizeof(idtab));
-
-  player = CreateIAviReadFile(filename);    
-  astream = player->GetStream(0, AviStream::Audio);
-  vstream = player->GetStream(0, AviStream::Video);
-  if(!vstream)
-      do_video = 0;
-  if(!astream)
-      do_audio = 0;
-#ifndef VERSION6
-  MainAVIHeader head;
-  int dwMicroSecPerFrame = 0;
-  player->GetFileHeader(&head);
-  printf("fps: %d\n", 1000000/head.dwMicroSecPerFrame);
-  printf("frames: %d\n", head.dwTotalFrames);
-  printf("streams: %d\n", head.dwStreams);
-  printf("width: %d\n", head.dwWidth);
-  printf("height: %d\n", head.dwHeight);
-  printf("sound: %u samples (%f seconds)\n", astream->GetEndPos(),
-	  astream->GetEndTime());
-  oldwidth = head.dwWidth;
-  oldheight = head.dwHeight;
-  dwMicroSecPerFrame = head.dwMicroSecPerFrame;
-  samplesperframe = astream->GetEndPos()/astream->GetEndTime()*head.dwMicroSecPerFrame/1000000;
-  samplerate = (int)(astream->GetEndPos()/astream->GetEndTime());
-  fps = 1000000.0/dwMicroSecPerFrame;
-#else
-  StreamInfo*audioinfo;
-  StreamInfo*videoinfo;
-  if(do_video)
-  {
-    videoinfo = vstream->GetStreamInfo();
-    oldwidth = videoinfo->GetVideoWidth();
-    oldheight = videoinfo->GetVideoHeight();
-    fps = (double)(videoinfo->GetFps());
-    delete(videoinfo);
-  }
-  if(do_audio)
-  {
-    audioinfo = astream->GetStreamInfo();
-    samplerate = audioinfo->GetAudioSamplesPerSec();
-    samplesperframe = audioinfo->GetAudioSamplesPerSec()/videoinfo->GetFps();
-    delete(audioinfo);
-  }
+    videoreader_t video;
+    v2swf_t v2swf;
+    int ret;
+    FILE*fi;
+
+#ifdef DO_SIGNALS
+    signal(SIGTERM, sigterm);
+    signal(SIGINT , sigterm);
+    signal(SIGQUIT, sigterm);
+    main_thread = pthread_self();
 #endif
-  width = (int)(oldwidth*scale);
-  height = (int)(oldheight*scale);
-  reziscale = 1/scale;
-
-  vstream -> StartStreaming();
-  if(do_audio)
-  {
-    astream -> StartStreaming();
-    printf("%f framerate\n", fps);
-    printf("%f samples/frame\n", samplesperframe);
-    printf("%d samplerate\n", samplerate);
-  }
-
-  if(zlib)
-    file = open("__tmp__.swf", O_WRONLY|O_CREAT|O_TRUNC, 0644);
-  else
-    file = open(outputfilename, O_WRONLY|O_CREAT|O_TRUNC, 0644);
-  
-  memset(&swf, 0, sizeof(swf));
-  swf.frameRate = (int)(fps*256);
-  swf.fileVersion = 4;
-  swf.fileSize = 0x0fffffff;
-  swf.frameCount = lastframe - firstframe;
-  r.xmin = 0;
-  r.ymin = 0;
-  r.xmax = width*20;
-  r.ymax = height*20;
-  swf.movieSize = r;
-
-  filesize += swf_WriteHeader(file, &swf);
-
-  tag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR);
-  swf_SetU8(tag,0); //black
-  swf_SetU8(tag,0);
-  swf_SetU8(tag,0);
-  filesize += swf_WriteTag(file, tag);
-  swf_DeleteTag(tag);
-
-  tag = swf_InsertTag(NULL, ST_SOUNDSTREAMHEAD2);
-  swf_SetSoundStreamHead(tag, (int)samplesperframe/4);
-  filesize += swf_WriteTag(file, tag);
-  swf_DeleteTag(tag);
-
-  int frame = 0;
-  initdisplay(file);
-
-  double movie_sound_pos = 0;
-  int mp3_sound_pos = 0;
-
-  if(do_audio)
-  {
-      WAVEFORMATEX wave;
-      astream->GetAudioFormatInfo(&wave,0);
-
-      printf("nChannels:%d\n", wave.nChannels);
-      printf("nSamplesPerSec:%d\n", wave.nSamplesPerSec);
-      printf("nAvgBytesPerSec:%d\n", wave.nAvgBytesPerSec);
-      printf("nBlockAlign:%d\n", wave.nBlockAlign);
-      printf("wBitsPerSample:%d\n", wave.wBitsPerSample);
-      printf("cbSize:%d\n", wave.cbSize);
-  }
-
-  SoundReader* sound = new SoundReader(astream);
-
-  while(1) {
-    if(vstream->ReadFrame()<0) {
-	printf("\n");
-	break;
-    }
 
-    if(frame < firstframe)
-    {
-	movie_sound_pos += samplesperframe;
-	if(do_audio)
-	while(mp3_sound_pos<movie_sound_pos) {
-	    short int* samples = sound->readFrame();
-	    mp3_sound_pos += mp3_block_size;
-	}
-	printf("\rskipping frame %d",frame);
-	fflush(stdout);
-	frame++;
-	if(frame == firstframe)
-	    printf("\n");
-	continue;
+    processargs(argc, argv);
+    if(!filename)
+	exit(0);
+    if(keyframe_interval<0) {
+	if(flashversion>=6)
+	    keyframe_interval=200;
+	else
+	    keyframe_interval=5;
     }
     
-    printf("\rconvert frame %d",frame);
-    fflush(stdout);
-
-    // audio
-    movie_sound_pos += samplesperframe;
-
-    int first=1;
-    if(do_audio)
-    while(mp3_sound_pos<movie_sound_pos) {
-	// rawplay -s 44100 -f s16_le -c 2 samples.test 
-	short int* samples = sound->readFrame();
-	int s;
-	int c=0;
-	if(first) { //first run
-	      tag = swf_InsertTag(NULL, ST_SOUNDSTREAMBLOCK);
-	      swf_SetSoundStreamBlock(tag, samples, 1);
-	} else {
-	      swf_SetSoundStreamBlock(tag, samples, 0);
-	}
-	
-	mp3_sound_pos += mp3_block_size;
+    fi = fopen(outputfilename, "wb");
+    if(!fi) {
+	fflush(stdout); fflush(stderr);
+	fprintf(stderr, "Couldn't open %s\n", outputfilename);
+	exit(1);
+    }
 
-	if(mp3_sound_pos>=movie_sound_pos) { // last run
-	    filesize += swf_WriteTag(file, tag);
-	    swf_DeleteTag(tag);
-	}
-	first = 0;
+    ret = videoreader_avifile_open(&video, filename);
+
+    if(!ret) {
+	printf("Error opening %s\n", filename);
+	exit(1);
     }
- 
-    // video
 
-    CImage*img = vstream->GetFrame();
-    img->ToRGB();
-    U8*data = img->Data();
-    int bpp = img->Bpp();
-    int x,y;
-    int xx,yy;
-    int fs,ls;
-    SHAPE*s;
-    MATRIX m;
-    SRECT r;
-    RGBA rgb;
-
-    /* some movies have changing dimensions */
-    if(img->Width() != oldwidth ||
-       img->Height() != oldheight) {
-	printf("\n");
-	oldwidth = img->Width();
-	oldheight = img->Height();
-	width = (int)(oldwidth*scale);
-	height = (int)(oldheight*scale);
-	initdisplay(file);
+    if(verbose) {
+	printf("| video framerate: %f\n", video.fps);
+	printf("| video size: %dx%d\n", video.width, video.height);
+	printf("| audio rate: %d\n", video.rate);
+	printf("| audio channels: %d\n", video.channels);
     }
 
-    for(yy=0;yy<yblocks;yy++)
-    for(xx=0;xx<xblocks;xx++) 
-    {
-	int x,y;
-	for(y=0;y<yblocksize;y++) {
-	    /* some avifile versions flip the image some don't. Maybe this is
-	       even movie dependent. We just let the user decide which side's up. */
-	    U8*mydata;
-	    if(flip)
-		mydata = img->At(oldheight-(int)((yy*yblocksize+y)*reziscale));
-	    else
-		mydata = img->At((int)((yy*yblocksize+y)*reziscale));
+    ret = v2swf_init(&v2swf, &video);
+    if(verbose)
+	v2swf_setparameter(&v2swf, "verbose", "1");
+    v2swf_setparameter(&v2swf, "quality", itoa(quality));
+    v2swf_setparameter(&v2swf, "blockdiff", "0");
+    v2swf_setparameter(&v2swf, "blockdiff_mode", "exact");
+    v2swf_setparameter(&v2swf, "mp3_bitrate", itoa(mp3_bitrate));
+    v2swf_setparameter(&v2swf, "samplerate", itoa(samplerate));
+    //v2swf_setparameter(&v2swf, "fixheader", "1");
+    //v2swf_setparameter(&v2swf, "framerate", "15");
+    v2swf_setparameter(&v2swf, "scale", ftoa(scale));
+    v2swf_setparameter(&v2swf, "prescale", "1");
+    v2swf_setparameter(&v2swf, "flash_version", itoa(flashversion));
+    v2swf_setparameter(&v2swf, "keyframe_interval", itoa(keyframe_interval));
+    if(expensive)
+	v2swf_setparameter(&v2swf, "motioncompensation", "1");
+
+    if(!verbose)
+	printf("\n");
 
-	    for(x=0;x<xblocksize;x++) {
-		blockbuffer[(y*xblocksize+x)*3+2] = mydata[((int)(((xx*xblocksize+x)*reziscale)))*3+0];
-		blockbuffer[(y*xblocksize+x)*3+1] = mydata[((int)(((xx*xblocksize+x)*reziscale)))*3+1];
-		blockbuffer[(y*xblocksize+x)*3+0] = mydata[((int)(((xx*xblocksize+x)*reziscale)))*3+2];
+    if(audio_adjust>0) {
+	int num = ((int)(audio_adjust*video.rate))*video.channels*2;
+	void*buf = malloc(num);
+	video.getsamples(&video, buf, num);
+	free(buf);
+    } else if(audio_adjust<0) {
+	int num = (int)(-audio_adjust*video.fps);
+	void*buf = malloc(video.width*video.height*4);
+	int t;
+	for(t=0;t<num;t++) {
+	    video.getimage(&video, buf);
+	}
+	free(buf);
+    }
+
+    if(skip) {
+	int t;
+	void*buf = malloc(video.width*video.height*4);
+	for(t=0;t<skip;t++) {
+	    video.getimage(&video, buf);
+	    video.getsamples(&video, buf, (int)((video.rate/video.fps)*video.channels*2));
+	    if(!verbose) {
+		printf("\rSkipping frame %d", frameno);fflush(stdout);
 	    }
 	}
-	GfxBlock b;
-	b.data = blockbuffer;
-	b.len = xblocksize*yblocksize*3;
-	blocks[yy*xblocks+xx].compress(file, &b);
-    }
-
-    tag = swf_InsertTag(NULL, ST_SHOWFRAME);
-    filesize += swf_WriteTag(file, tag);
-    swf_DeleteTag(tag);
-
-    cache->newframe();
-
-    frame++;
-    if(frame == lastframe)
-	break;
-  }
-  delete sound;
-  printf("\n");
-  destroydisplay(file);
-
-  tag = swf_InsertTag(NULL, ST_END);
-  filesize += swf_WriteTag(file, tag);
-  swf_DeleteTag(tag);
-
-  close(file);
-
-  FILE*fi;
-  if(zlib)
-    fi=fopen("tmp.swf", "r+");
-  else
-    fi=fopen(outputfilename, "r+");
-
-  if(fi)
-  {
-       fseek(fi,4,SEEK_SET);
-       unsigned char f;
-       f = filesize      ;fwrite(&f,1,1,fi);
-       f = filesize >> 8 ;fwrite(&f,1,1,fi);
-       f = filesize >> 16;fwrite(&f,1,1,fi);
-       f = filesize >> 24;fwrite(&f,1,1,fi);
-       fclose(fi);
-  }
-
-  if(zlib) {
-      char buffer[1024];
-      snprintf(buffer, 1024, "swfcombine -dz __tmp__.swf -o %s", outputfilename);
-      printf("%s\n", buffer);
-      system(buffer);
-      sprintf(buffer, "rm __tmp__.swf");
-      printf("%s\n", buffer);
-      system(buffer);
-  }
-  
-  return 0;
+	free(buf);
+    }
+
+    char buffer[4096];
+    while(1) {
+	int l=v2swf_read(&v2swf, buffer, 4096);
+	fwrite(buffer, l, 1, fi);
+	if(!l)
+	    break;
+	if(!verbose) {
+	    printf("\rConverting frame %d", frameno);fflush(stdout);
+	}
+    }
+    if(!verbose)
+	printf("\n");
+    fclose(fi);
+    v2swf_backpatch(&v2swf, outputfilename);
+    v2swf_close(&v2swf);
 }