[Mplayer-cvslog] CVS: main/libmpcodecs ve_qtvideo.c,NONE,1.1 Makefile,1.81,1.82 vd_qtvideo.c,1.11,1.12 ve.c,1.4,1.5
Arpi of Ize
arpi at mplayerhq.hu
Mon Dec 16 02:49:42 CET 2002
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv26287/libmpcodecs
Modified Files:
Makefile vd_qtvideo.c ve.c
Added Files:
ve_qtvideo.c
Log Message:
Sorenson 1/3 encoding just for fun :)
ve_qtvideo code by Sascha Sommer
SVQ3 support hack by /me
--- NEW FILE ---
/*qt video encoder using win32 libs
released under gnu gpl
(C)Sascha Sommer */
#define MAX_IDSIZE 0x6F
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../config.h"
#include "../mp_msg.h"
#include "../bswap.h"
#ifdef USE_QTX_CODECS
#include "../loader/qtx/qtxsdk/components.h"
#include "wine/windef.h"
#include "codec-cfg.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "aviwrite.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
HMODULE WINAPI LoadLibraryA(LPCSTR);
FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR);
int WINAPI FreeLibrary(HMODULE);
static HMODULE handler;
static OSErr (*FindCodec)(CodecType cType,
CodecComponent specCodec,
CompressorComponent * compressor,
DecompressorComponent * decompressor);
static OSErr (*InitializeQTML)(long flags);
static PixMapHandle (*GetGWorldPixMap)(GWorldPtr offscreenGWorld);
static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw,
OSType pixelFormat,
const Rect *boundsRect,
CTabHandle cTable,
/*GDHandle*/void* aGDevice, /*unused anyway*/
GWorldFlags flags,
void *baseAddr,
long rowBytes);
static OSErr (*NewHandleClear)(Size byteCount);
static OSErr (*CompressSequenceBegin) (
ImageSequence *seqID,
PixMapHandle src,
PixMapHandle prev,
const Rect *srcRect,
const Rect *prevRect,
short colorDepth,
CodecType cType,
CompressorComponent codec,
CodecQ spatialQuality,
CodecQ temporalQuality,
long keyFrameRate,
CTabHandle ctable,
CodecFlags flags,
ImageDescriptionHandle desc );
static OSErr (*CompressSequenceFrame) (
ImageSequence seqID,
PixMapHandle src,
const Rect *srcRect,
CodecFlags flags,
Ptr data,
long *dataSize,
UInt8 *similarity,
ICMCompletionProcRecordPtr asyncCompletionProc );
static OSErr (*GetMaxCompressionSize)(PixMapHandle src,
const Rect *srcRect,
short colorDepth,
CodecQ quality,
CodecType cType,
CompressorComponent codec,
long *size );
static OSErr (*CDSequenceEnd)( ImageSequence seqID );
static Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
static long (*CountComponents)(ComponentDescription* desc);
static OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3);
extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags);
//static int format=mmioFOURCC('S','V','Q','1');
static int format=mmioFOURCC('S','V','Q','3');
//static void *frame_in; //input frame
static void *frame_prev; //previous frame
static void *frame_comp; //compressed frame
static GWorldPtr frame_GWorld_in = NULL;//a GWorld is some kind of description for a drawing environment
static GWorldPtr frame_GWorld_prev = NULL;
static Rect FrameRect;
static CompressorComponent compressor;
static DecompressorComponent decompressor;
static ImageDescriptionHandle desc;
static ImageSequence seq;
struct vf_priv_s {
aviwrite_stream_t* mux;
//dv_encoder_t* enc;
};
#define mux_v (vf->priv->mux)
//===========================================================================//
static int config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt){
OSErr cres;
ComponentDescription cdesc;
mux_v->bih->biWidth=width;
mux_v->bih->biHeight=height;
mux_v->bih->biSizeImage=width*height*2;
memset(&desc,0,sizeof(cdesc));
cdesc.componentType= (((unsigned char)'i')<<24)|
(((unsigned char)'m')<<16)|
(((unsigned char)'c')<<8)|
(((unsigned char)'o'));
cdesc.componentSubType=bswap_32(format);
cdesc.componentManufacturer=0;
cdesc.componentFlags=0;
cdesc.componentFlagsMask=0;
printf("Count = %d\n",CountComponents(&cdesc));
compressor=FindNextComponent(NULL,&cdesc);
if(!compressor){
printf("Cannot find requested component\n");
return(0);
}
printf("Found it! ID = 0x%X\n",compressor);
// cres= FindCodec (fourcc,anyCodec,&compressor,&decompressor );
// printf("FindCodec returned:%i compressor: 0x%X decompressor: 0x%X\n",cres&0xFFFF,compressor,decompressor);
return 1;
}
static int control(struct vf_instance_s* vf, int request, void* data){
return CONTROL_UNKNOWN;
}
static int query_format(struct vf_instance_s* vf, unsigned int fmt){
if(fmt==IMGFMT_YUY2) return 3;
return 0;
}
static int codec_inited = 0;
static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
OSErr cres;
long framesizemax;
UInt8 similarity;
long compressedsize;
int in_format=kYUVSPixelFormat;
int width = mpi->width;
int height = mpi->height;
int stride = width*2;
if(!codec_inited){
FrameRect.top=0;
FrameRect.left=0;
FrameRect.right=width;
FrameRect.bottom=height;
cres = QTNewGWorldFromPtr(
&frame_GWorld_in,
in_format,
&FrameRect,
0,
0,
0,
mpi->planes[0],
stride);
printf("NewGWorldFromPtr returned:%i\n",cres&0xFFFF);
//dunno what todo about this
frame_prev = malloc(stride * height);
cres = QTNewGWorldFromPtr(
&frame_GWorld_prev,
in_format,
&FrameRect,
0,
0,
0,
frame_prev,
stride);
printf("height:%i width:%i stride:%i\n",height,width,stride);
printf("NewGWorldFromPtr returned:%i\n",cres&0xFFFF);
cres= GetMaxCompressionSize (
GetGWorldPixMap(frame_GWorld_in),
&FrameRect,
24,
codecNormalQuality,
bswap_32(format),
compressor,
&framesizemax );
printf("GetMaxCompressionSize returned:%i : MaxSize:%i\n",cres&0xFFFF,framesizemax);
frame_comp=malloc(framesizemax);
desc = (ImageDescriptionHandle)NewHandleClear(MAX_IDSIZE); //memory where the desc will be stored
(*desc)->idSize=MAX_IDSIZE;
cres= CompressSequenceBegin (
&seq,
GetGWorldPixMap( frame_GWorld_in),
GetGWorldPixMap( frame_GWorld_prev),
&FrameRect,
&FrameRect,
24, // color depth
bswap_32(format), // fourcc
compressor, // codec component
codecNormalQuality, //codecNormalQuality,
codecMaxQuality, //codecNormalQuality,
10*25, // keyframe rate
0,
0,
desc);
printf("CompressSequenceBegin returned:%i\n",cres&0xFFFF);
printf("Sequence ID:%i\n",seq);
dump_ImageDescription(*desc);
codec_inited++;
}
cres = CompressSequenceFrame (
seq,
GetGWorldPixMap(frame_GWorld_in),
&FrameRect,
0,
(char*)mux_v->buffer,
&compressedsize,
&similarity,
0);
if(cres&0xFFFF)printf("CompressSequenceFrame returned:%i\n",cres&0xFFFF);
printf("Size %i->%i \n",stride*height,compressedsize);
#if 0
printf("Ratio: %i:1\n",(stride*height)/compressedsize);
#endif
mencoder_write_chunk(mux_v, compressedsize , 0x10);
if(((*desc)->idSize)>MAX_IDSIZE){
printf("FATAL! idSize=%d too big, increase MAX_IDSIZE in ve_qtvideo.c!\n",((*desc)->idSize));
} else {
// according to QT docs, imagedescription may be changed while encoding
// a frame (even its size may (and does!) change!)
memcpy(mux_v->bih+1,*desc,(*desc)->idSize);
}
return 1;
}
//===========================================================================//
static int vf_open(vf_instance_t *vf, char* args){
OSErr cres = 1;
vf->config=config;
vf->control=control;
vf->query_format=query_format;
vf->put_image=put_image;
vf->priv=malloc(sizeof(struct vf_priv_s));
memset(vf->priv,0,sizeof(struct vf_priv_s));
vf->priv->mux=(aviwrite_stream_t*)args;
mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)+MAX_IDSIZE);
mux_v->bih->biSize=sizeof(BITMAPINFOHEADER)+MAX_IDSIZE;
mux_v->bih->biWidth=0;
mux_v->bih->biHeight=0;
mux_v->bih->biCompression=format;
mux_v->bih->biPlanes=1;
mux_v->bih->biBitCount=24;
Setup_LDT_Keeper();
handler = LoadLibraryA("qtmlClient.dll");
InitializeQTML = GetProcAddress(handler, "InitializeQTML");
GetGWorldPixMap = GetProcAddress(handler, "GetGWorldPixMap");
QTNewGWorldFromPtr = GetProcAddress(handler, "QTNewGWorldFromPtr");
NewHandleClear = GetProcAddress(handler, "NewHandleClear");
FindCodec = GetProcAddress(handler,"FindCodec");
CompressSequenceBegin = GetProcAddress(handler,"CompressSequenceBegin");
CompressSequenceFrame = GetProcAddress(handler,"CompressSequenceFrame");
GetMaxCompressionSize = GetProcAddress(handler,"GetMaxCompressionSize");
CDSequenceEnd = GetProcAddress(handler,"CDSequenceEnd");
FindNextComponent = GetProcAddress(handler, "FindNextComponent");
CountComponents = GetProcAddress(handler, "CountComponents");
GetComponentInfo = GetProcAddress(handler, "GetComponentInfo");
if(!InitializeQTML ||!CompressSequenceBegin){
printf("invalid qt DLL!\n");
return 0;
}
//printf("%i,%i,%i\n",mmioFOURCC('S','V','Q','1'),'SVQ1',bswap_32(mmioFOURCC('S','V','Q','1')));
cres=InitializeQTML(6+16);
printf("InitializeQTML returned %i\n",cres);
return 1;
}
vf_info_t ve_info_qtvideo = {
"Quicktime video encoder using win32 DLLs",
"qtvideo",
"Sascha Sommer",
"for internal use by mencoder",
vf_open
};
//===========================================================================//
#endif
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Makefile 1 Dec 2002 16:40:05 -0000 1.81
+++ Makefile 16 Dec 2002 01:49:39 -0000 1.82
@@ -15,7 +15,7 @@
VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c
-ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c
+ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c
NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c
Index: vd_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtvideo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd_qtvideo.c 14 Dec 2002 17:55:56 -0000 1.11
+++ vd_qtvideo.c 16 Dec 2002 01:49:39 -0000 1.12
@@ -206,9 +206,11 @@
fclose(f);
}
#else
+ if(!sh->ImageDesc) sh->ImageDesc=(sh->bih+1); // hack for SVQ3-in-AVI
printf("ImageDescription size: %d\n",((ImageDescription*)(sh->ImageDesc))->idSize);
framedescHandle=(ImageDescriptionHandle)NewHandleClear(((ImageDescription*)(sh->ImageDesc))->idSize);
memcpy(*framedescHandle,sh->ImageDesc,((ImageDescription*)(sh->ImageDesc))->idSize);
+ dump_ImageDescription(*framedescHandle);
#endif
//Find codecscomponent for video decompression
// result = FindCodec ('SVQ1',anyCodec,&compressor,&decompressor );
Index: ve.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ve.c 21 Sep 2002 12:34:02 -0000 1.4
+++ ve.c 16 Dec 2002 01:49:39 -0000 1.5
@@ -15,6 +15,7 @@
extern vf_info_t ve_info_rawrgb;
extern vf_info_t ve_info_libdv;
extern vf_info_t ve_info_xvid;
+extern vf_info_t ve_info_qtvideo;
static vf_info_t* encoder_list[]={
#ifdef HAVE_DIVX4ENCORE
@@ -25,6 +26,7 @@
#endif
#ifdef USE_WIN32DLL
&ve_info_vfw,
+ &ve_info_qtvideo,
#endif
#ifdef HAVE_LIBDV095
&ve_info_libdv,
More information about the MPlayer-cvslog
mailing list