November 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main dec_video.c,1.62,1.63
by Alex Beregszaszi 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv32767 Modified Files: dec_video.c Log Message: dirty hack to vfm_raw for tv to be more easier ;) Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_video.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- dec_video.c 10 Nov 2001 14:52:05 -0000 1.62 +++ dec_video.c 11 Nov 2001 01:46:07 -0000 1.63 @@ -426,6 +426,10 @@ break; } case VFM_RAW: { + /* dirty hack to work with tvinput */ + extern int tv_param_on; + if ((tv_param_on == 1) && sh_video->format) + sh_video->o_bih.biCompression = sh_video->format; break; } case VFM_RLE: {

1 0

CVS: main Makefile,1.97,1.98 configure,1.232,1.233
by pl 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv32485 Modified Files: Makefile configure Log Message: mplayer does not need -ldivxencore mencoder does Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- Makefile 6 Nov 2001 23:14:35 -0000 1.97 +++ Makefile 11 Nov 2001 01:45:01 -0000 1.98 @@ -129,7 +129,7 @@ $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o $(PRG_MENCODER): $(MENCODER_DEP) - $(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(TERMCAP_LIB) -lm + $(CC) -rdynamic $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(XMM_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(ARCH_LIBS) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIBS) $(ENCORE_LIBS) $(TERMCAP_LIB) -lm # $(PRG_HQ): depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a # $(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- configure 10 Nov 2001 15:01:47 -0000 1.232 +++ configure 11 Nov 2001 01:45:01 -0000 1.233 @@ -2467,7 +2467,8 @@ if test "$_divx4linux" = yes ; then _divx4def='#define NEW_DECORE' - _decorelibs='-ldivxdecore -ldivxencore opendivx/postprocess.o' + _decorelibs='-ldivxdecore opendivx/postprocess.o' + _encorelibs='-ldivxencore' else _divx4def='#undef NEW_DECORE' _decorelibs='-Lopendivx -ldecore' @@ -2523,6 +2524,7 @@ ARCH_LIBS = $_archlibs $_iconvlib STREAMING=$_streaming DECORE_LIBS = $_decorelibs +ENCORE_LIBS = $_encorelibs DIVX4LINUX=$_divx4linux MLIB_INC = $_mlibinc MLIB_LIB = $_mliblib

1 0

CVS: main/libmpdemux tv.c,1.2,1.3 tvi_v4l.c,1.2,1.3
by Alex Beregszaszi 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv32531 Modified Files: tv.c tvi_v4l.c Log Message: tv update Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tv.c 10 Nov 2001 23:31:08 -0000 1.2 +++ tv.c 11 Nov 2001 01:44:54 -0000 1.3 @@ -42,7 +42,7 @@ /* fill demux->video and demux->audio */ int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh) { - int seq = tvh->seq; + int seq = tvh->seq++; demux_stream_t *ds_video = NULL; demux_packet_t *dp_video = NULL; demux_stream_t *ds_audio = NULL; @@ -53,8 +53,8 @@ demux->filepos = -1; - seq++; - tvh->seq++; +// seq++; +// tvh->seq++; /* ================== ADD VIDEO PACKET =================== */ len_video = tvh->functions->get_video_framesize(tvh->priv); @@ -146,7 +146,7 @@ /* get IMGFMT_ */ funcs->control(tvh->priv, TVI_CONTROL_VID_GET_FORMAT, &sh_video->format); - if (IMGFMT_IS_RGB(sh_video->format) || IMGFMT_IS_BGR(sh_video->format)) +// if (IMGFMT_IS_RGB(sh_video->format) || IMGFMT_IS_BGR(sh_video->format)) sh_video->format = 0x0; /* set FPS and FRAMETIME */ Index: tvi_v4l.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tvi_v4l.c 10 Nov 2001 23:31:09 -0000 1.2 +++ tvi_v4l.c 11 Nov 2001 01:44:54 -0000 1.3 @@ -32,13 +32,6 @@ "under development" }; -struct vid_fmt { - int fmtid; - int width; - int height; - int bytesperline; -}; - typedef struct { /* general */ char *video_device; @@ -81,16 +74,43 @@ static int palette2depth(int palette) { - if (palette == VIDEO_PALETTE_YUV420P) - return 12; - return 32; + switch(palette) + { + case VIDEO_PALETTE_RGB555: + return(15); + case VIDEO_PALETTE_RGB565: + return(16); + case VIDEO_PALETTE_RGB24: + return(24); + case VIDEO_PALETTE_RGB32: + return(32); + case VIDEO_PALETTE_YUV420P: + return(12); + case VIDEO_PALETTE_YUV422: + case VIDEO_PALETTE_UYVY: + return(16); + } + return(-1); } static int format2palette(int format) { - if (format == IMGFMT_YV12) - return VIDEO_PALETTE_YUV420P; - return VIDEO_PALETTE_RGB24; + switch(format) + { + case IMGFMT_RGB15: + return(VIDEO_PALETTE_RGB555); + case IMGFMT_RGB16: + return(VIDEO_PALETTE_RGB565); + case IMGFMT_RGB24: + return(VIDEO_PALETTE_RGB24); + case IMGFMT_RGB32: + return(VIDEO_PALETTE_RGB32); + case IMGFMT_YV12: + return(VIDEO_PALETTE_YUV420P); + case IMGFMT_UYVY: + return(VIDEO_PALETTE_YUV422); + } + return(-1); } #if 0 @@ -220,7 +240,7 @@ { int i; - priv->fd = open(priv->video_device, O_RDONLY); + priv->fd = open(priv->video_device, O_RDWR); if (priv->fd == -1) { printf("v4l: unable to open '%s': %s\n", @@ -249,7 +269,7 @@ printf("priv->input: %d\n", priv->input); #endif - printf("Selected device: %s\n", priv->capability.name); + printf("Selected device: %s\n", priv->capability.name); printf(" Capabilites: "); for (i = 0; device_cap[i] != NULL; i++) if (priv->capability.type & (1 << i)) @@ -299,11 +319,6 @@ if (priv->mmap == -1) { printf("Unabel to map memory for buffers: %s\n", strerror(errno)); - priv->mmap = malloc(priv->mbuf.size); /* our buffer */ - } - if (!priv->mmap) - { - printf("Unable to allocate memory for buffers: %s\n", strerror(errno)); goto err; } printf("our buffer: %p\n", priv->mmap); @@ -441,7 +456,7 @@ (int)*(void **)arg = 1; return(TVI_CONTROL_TRUE); case TVI_CONTROL_VID_GET_BITS: - (int)*(void **)arg = 12; + (int)*(void **)arg = palette2depth(format2palette(priv->format)); return(TVI_CONTROL_TRUE); case TVI_CONTROL_VID_GET_WIDTH: (int)*(void **)arg = priv->width; @@ -451,8 +466,8 @@ int req_width = (int)*(void **)arg; printf("Requested width: %d\n", req_width); - if ((req_width > priv->capability.minwidth) && - (req_width < priv->capability.maxwidth)) + if ((req_width >= priv->capability.minwidth) && + (req_width <= priv->capability.maxwidth)) return(TVI_CONTROL_TRUE); return(TVI_CONTROL_FALSE); } @@ -467,8 +482,8 @@ int req_height = (int)*(void **)arg; printf("Requested height: %d\n", req_height); - if ((req_height > priv->capability.minheight) && - (req_height < priv->capability.maxheight)) + if ((req_height >= priv->capability.minheight) && + (req_height <= priv->capability.maxheight)) return(TVI_CONTROL_TRUE); return(TVI_CONTROL_FALSE); } @@ -654,7 +669,8 @@ return(0); } - ioctl(priv->fd, VIDIOCSYNC, &priv->buf[frame]); + if (ioctl(priv->fd, VIDIOCSYNC, &priv->buf[frame]) == -1) + printf("ioctl sync failed: %s\n", strerror(errno)); priv->queue++; printf("mmap: %p + offset: %d => %p\n",

1 0

CVS: main/libmpdemux demux_viv.c,1.7,1.8
by pl 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv31441/libmpdemux Modified Files: demux_viv.c Log Message: small fix Index: demux_viv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- demux_viv.c 11 Nov 2001 00:31:34 -0000 1.7 +++ demux_viv.c 11 Nov 2001 01:35:43 -0000 1.8 @@ -539,17 +539,17 @@ void demux_close_vivo(demuxer_t *demuxer) { vivo_priv_t* priv=demuxer->priv; - - if (priv->title) - free(priv->title); - if (priv->author) - free(priv->author); - if (priv->copyright) - free(priv->copyright); - if (priv->producer) - free(priv->producer); - if (priv) + + if (priv) { + if (priv->title) + free(priv->title); + if (priv->author) + free(priv->author); + if (priv->copyright) + free(priv->copyright); + if (priv->producer) + free(priv->producer); free(priv); - + } return; }

1 0

CVS: main/postproc postprocess.c,1.37,1.38
by Michael Niedermayer 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv29218 Modified Files: postprocess.c Log Message: QP_store==null bugfix and no opendivx bugfix Index: postprocess.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- postprocess.c 9 Nov 2001 02:17:02 -0000 1.37 +++ postprocess.c 11 Nov 2001 01:18:40 -0000 1.38 @@ -2750,12 +2750,14 @@ ppMode.error += numOfUnknownOptions; } +#ifdef HAVE_ODIVX_POSTPROCESS if(ppMode.lumMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_H; if(ppMode.lumMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_V; if(ppMode.chromMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_H; if(ppMode.chromMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_V; if(ppMode.lumMode & DERING) ppMode.oldMode |= PP_DERING_Y; if(ppMode.chromMode & DERING) ppMode.oldMode |= PP_DERING_C; +#endif return ppMode; } @@ -2781,6 +2783,12 @@ return; */ + static QP_STORE_T zeroArray[2048/8]; + if(QP_store==NULL) + { + QP_store= zeroArray; + QP_stride= 0; + } #ifdef HAVE_ODIVX_POSTPROCESS // Note: I could make this shit outside of this file, but it would mean one @@ -2822,6 +2830,13 @@ QP_STORE_T *QP_store, int QP_stride, struct PPMode *mode) { + + static QP_STORE_T zeroArray[2048/8]; + if(QP_store==NULL) + { + QP_store= zeroArray; + QP_stride= 0; + } #ifdef HAVE_ODIVX_POSTPROCESS // Note: I could make this shit outside of this file, but it would mean one

1 0

CVS: main/libvo osd.c,1.6,1.7
by Michael Niedermayer 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv28293/libvo Modified Files: osd.c Log Message: bugfix nick why did u remove the #if 0 around that code without testing it? Index: osd.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/osd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- osd.c 10 Nov 2001 20:39:23 -0000 1.6 +++ osd.c 11 Nov 2001 01:14:09 -0000 1.7 @@ -126,20 +126,20 @@ "movb (%1, %%eax), %%bl \n\t" "cmpb $0, %%bl \n\t" " jz 2f \n\t" - "movzxb (%2, %%eax), %%edx \n\t" + "movzbl (%2, %%eax), %%edx \n\t" "shll $8, %%edx \n\t" "decb %%bl \n\t" - "movzxb (%0, %%eax, 4), %%ecx \n\t" + "movzbl (%0, %%eax, 4), %%ecx \n\t" "imull %%ebx, %%ecx \n\t" "addl %%edx, %%ecx \n\t" "movb %%ch, (%0, %%eax, 4) \n\t" - "movzxb 1(%0, %%eax, 4), %%ecx \n\t" + "movzbl 1(%0, %%eax, 4), %%ecx \n\t" "imull %%ebx, %%ecx \n\t" "addl %%edx, %%ecx \n\t" "movb %%ch, 1(%0, %%eax, 4) \n\t" - "movzxb 2(%0, %%eax, 4), %%ecx \n\t" + "movzbl 2(%0, %%eax, 4), %%ecx \n\t" "imull %%ebx, %%ecx \n\t" "addl %%edx, %%ecx \n\t" "movb %%ch, 2(%0, %%eax, 4) \n\t"

1 0

CVS: main/postproc rgb2rgb.c,1.38,1.39
by Michael Niedermayer 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv24304 Modified Files: rgb2rgb.c Log Message: yuy2toyv12 bugfix Index: rgb2rgb.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- rgb2rgb.c 10 Nov 2001 23:28:10 -0000 1.38 +++ rgb2rgb.c 11 Nov 2001 00:50:40 -0000 1.39 @@ -758,6 +758,9 @@ : "memory", "%eax" ); + ydst += lumStride; + src += srcStride; + asm volatile( "xorl %%eax, %%eax \n\t" ".balign 16 \n\t" @@ -781,7 +784,7 @@ "cmpl %4, %%eax \n\t" " jb 1b \n\t" - ::"r"(src+srcStride), "r"(ydst+lumStride), "r"(udst), "r"(vdst), "r" (chromWidth) + ::"r"(src), "r"(ydst), "r"(udst), "r"(vdst), "r" (chromWidth) : "memory", "%eax" ); #else

1 0

CVS: main/libmpdemux demux_viv.c,1.6,1.7
by Alex Beregszaszi 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv21667 Modified Files: demux_viv.c Log Message: disabled vivo2 scaling (decodes some vivo2 files) Index: demux_viv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- demux_viv.c 10 Nov 2001 12:36:03 -0000 1.6 +++ demux_viv.c 11 Nov 2001 00:31:34 -0000 1.7 @@ -187,7 +187,7 @@ buf[len]=0; // printf("VIVO header: '%s'\n",buf); -#if 1 +#if 0 vivo_parse_text_header(demuxer, len); if (priv->supported == 0) return 0; @@ -472,6 +472,11 @@ else sh->fps=15.0f; sh->frametime=1.0f/sh->fps; + +#warning "FIXME! we can't scale" + priv->disp_width = priv->width; + priv->disp_height = priv->height; + if (priv->disp_width) sh->disp_w = priv->disp_width; else

1 0

CVS: main/etc codecs.conf,1.80,1.81
by Alex Beregszaszi 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main/etc In directory mplayer:/var/tmp.root/cvs-serv19167 Modified Files: codecs.conf Log Message: raw added for tv Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- codecs.conf 5 Nov 2001 14:56:18 -0000 1.80 +++ codecs.conf 11 Nov 2001 00:14:46 -0000 1.81 @@ -553,6 +553,12 @@ dll "vid_cyuv.xa" out YV12,IYUV,I420 +videocodec raw + info "RAW codec (only copying)" + status untested + driver raw + fourcc YV12 + out YV12 videocodec null info "NULL codec (no decoding!)"

1 0

CVS: main tvision.c,1.1.1.1,1.2
by Arpi of Ize 10 Nov '01

10 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv12783 Modified Files: tvision.c Log Message: uyvy->yv12->postprocess->libvo Index: tvision.c =================================================================== RCS file: /cvsroot/mplayer/main/tvision.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- tvision.c 24 Feb 2001 20:28:40 -0000 1.1.1.1 +++ tvision.c 10 Nov 2001 23:37:25 -0000 1.2 @@ -45,8 +45,14 @@ int fd=-1; char* frame=NULL; int count=0; +unsigned char* tmpframe=NULL; +unsigned char* tmpframe2=NULL; +unsigned char* planes[3]; +unsigned int stride[3]; +unsigned char* planes2[3]; +unsigned int stride2[3]; - if(argc>1) video_driver=argv[1]; +// if(argc>1) video_driver=argv[1]; // check video_out driver name: if(!video_driver) @@ -91,20 +97,37 @@ } /* prepare for grabbing */ - gb1.format = VIDEO_PALETTE_YUV422; + gb1.format = (argc>1) ? atoi(argv[1]) : VIDEO_PALETTE_YUV422; +// gb1.format = VIDEO_PALETTE_YUV420; // gb1.format = VIDEO_PALETTE_RGB24; gb1.frame = 0; - gb1.width = 352;//720;//640;//320; - gb1.height = 288;//576;//480;//240; + gb1.width = 704;//640;//320; + gb1.height = 576;//480;//240; gb2.format = gb1.format; gb2.frame = 1; gb2.width = gb1.width; gb2.height = gb1.height; - video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_YUY2); + video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_YV12); +// video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_UYVY); +// video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_YUY2); // video_out->init(gb1.width,gb1.height,1024,768,0,0,IMGFMT_RGB|24); + tmpframe=malloc(gb1.width*gb1.height*3/2); + stride[0]=(gb1.width+15)&(~15); + stride[1]=stride[2]=stride[0]/2; + planes[0]=tmpframe; + planes[1]=planes[0]+stride[0]*gb1.height; + planes[2]=planes[1]+stride[0]*gb1.height/4; + + tmpframe2=malloc(gb1.width*gb1.height*3/2); + stride2[0]=(gb1.width+15)&(~15); + stride2[1]=stride2[2]=stride2[0]/2; + planes2[0]=tmpframe2; + planes2[1]=planes2[0]+stride2[0]*gb1.height; + planes2[2]=planes2[1]+stride2[0]*gb1.height/4; + if (-1 == ioctl(fd,VIDIOCMCAPTURE,&gb1)) { if (errno == EAGAIN) fprintf(stderr,"grabber chip can't sync (no station tuned in?)\n"); @@ -128,7 +151,23 @@ exit(1); } frame=map + gb_buffers.offsets[(count%2) ? 0 : 1]; +#if 0 video_out->draw_frame((unsigned char**)&frame); +#else + { + uyvytoyv12(frame,planes[0],planes[1],planes[2], + gb1.width,gb1.height, + stride[0],stride[1],gb1.width*2); + + + postprocess(planes,stride[0], + planes2,stride2[0], + gb1.width,gb1.height, + planes[0],0, 0x20000); + + video_out->draw_slice(planes2,stride2,gb1.width,gb1.height,0,0); + } +#endif video_out->flip_page(); count++;

1 0