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

CVS: main/DOCS bugreports.html,1.11,1.12
by Arpi of Ize 02 Dec '01

02 Dec '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv29045 Modified Files: bugreports.html Log Message: secret :) Index: bugreports.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/bugreports.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bugreports.html 19 Nov 2001 21:09:53 -0000 1.11 +++ bugreports.html 30 Nov 2001 19:56:08 -0000 1.12 @@ -152,5 +152,19 @@ If something is big (logs etc) then it's better to upload to the ftp (gzipped), and include only path/filename in the bugreport! +I know what am I doing... + +If you created a proper bugreport following the above steps, and you are +sure it's mplayer bug, not compiler's problem or broken file, you've already +readed through docs and you didn't find the solution, your sound drivers are ok, +then you may want to subscribe to the mplayer-advusers list and send your +bugreport there to get better and faster answer. But BE WARNED: if you post +newbie or rtfm-type questions there, you'll be immediatelly banned, instead or +getting answered!!! So don't flame us, subscribe -advusers only if you really +know what are you doing and you feel you as advanced mplayer user or developer. +(and about how to subscribe: find it out! if you're really an advanced user, +it shouldn't be a problem for you...) + + </BODY> </HTML>

2 2

CVS: main/DOCS video.html,1.44,1.45
by Winner of tha face compo 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv4244 Modified Files: video.html Log Message: msg to Nick: where is the rage128_vid stuff ?? Index: video.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/video.html,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- video.html 26 Nov 2001 18:53:26 -0000 1.44 +++ video.html 30 Nov 2001 17:53:15 -0000 1.45 @@ -782,9 +782,9 @@ SDL driver's software output+scaler, it has worse image quality ! -<A NAME=2.3.1.14>2.3.1.14. Radeon video overlay (radeon_vid)</A> +<A NAME=2.3.1.14>2.3.1.14. Rage128 (Pro) / Radeon video overlay (radeon_vid)</A> -radeon_vid provides support for the BackEnd Scaler on ATI Radeon chipsets. +radeon_vid provides support for the BackEnd Scaler on ATI Radeon and Rage128 (Pro) chipsets. It was designed and introduced as analog of <a href="video.html#2.3.1.7">mga_vid</a> driver, so you can use it in the same way! But main goal of this driver usage is <a href="video.html#2.3.1.12">VESA</a> driver. Simply because VESA enables TV-out on ATI's card but Backend scaler is used after @@ -803,7 +803,7 @@ <UL> <LI> - <CODE>cd drivers/radeon/radeon + <CODE>cd drivers/radeon make</CODE> </LI> <LI>install the <CODE>radeon_vid.o</CODE> module to your kernelmodules</LI> <LI>execute the following : <CODE>mknod /dev/radeon_vid c 178 0</CODE></LI> @@ -821,8 +821,7 @@ NOTE: don't use any framebuffers when you plan to use this driver ! Use it only from textmode console. -Limitations: Currently it works only with YUY2 format, so use the DirectShow codec -family with it. + Conclusion: I know there are lot of lacks and bugs. So if you are able to improve something then simply send me your patches.

2 1

CVS: main subreader.c,1.38,1.39
by Arpi of Ize 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv2990 Modified Files: subreader.c Log Message: patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj(a)echo.ru> Index: subreader.c =================================================================== RCS file: /cvsroot/mplayer/main/subreader.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- subreader.c 15 Nov 2001 16:46:52 -0000 1.38 +++ subreader.c 30 Nov 2001 23:45:48 -0000 1.39 @@ -34,6 +34,7 @@ int sub_uses_time=0; int sub_errs=0; int sub_num=0; // number of subtitle structs +int sub_slacktime=2000; // 20 seconds /* Use the SUB_* constant defined in the header file */ int sub_format=SUB_INVALID; @@ -52,7 +53,7 @@ subtitle *sub_read_line_sami(FILE *fd, subtitle *current) { static char line[LINE_LEN+1]; - static char *s = NULL; + static char *s = NULL, *slacktime_s; char text[LINE_LEN+1], *p, *q; int state; @@ -66,7 +67,10 @@ do { switch (state) { - case 0: /* find "START=" */ + case 0: /* find "START=" or "Slacktime:" */ + slacktime_s = strstr (s, "Slacktime:"); + if (slacktime_s) sub_slacktime = strtol (slacktime_s + 10, NULL, 0) / 10; + s = strstr (s, "Start="); if (s) { current->start = strtol (s + 6, &s, 0) / 10; @@ -83,7 +87,7 @@ break; case 3: /* get all text until '<' appears */ - if (*s == '\0') { break; } + if (*s == '\0') break; else if (!strncasecmp (s, " ", 4)) { *p = '\0'; p = text; trail_space (text); if (text[0] != '\0') @@ -117,10 +121,20 @@ } /* read next line */ - if (state != 99 && !(s = fgets (line, LINE_LEN, fd))) return 0; - + if (state != 99 && !(s = fgets (line, LINE_LEN, fd))) + if (current->start > 0) break; // if it is the last subtitle + else return 0; + } while (state != 99); + // For the last subtitle + if (current->end <= 0) { + current->end = current->start + sub_slacktime; + *p = '\0'; trail_space (text); + if (text[0] != '\0') + current->text[current->lines++] = strdup (text); + } + return current; }

1 0

CVS: main mplayer.c,1.330,1.331
by Arpi of Ize 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv2796 Modified Files: mplayer.c Log Message: dusplay sub_delay patch by Evgeny Chukreev <codedj(a)echo.ru> Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- mplayer.c 29 Nov 2001 17:31:57 -0000 1.330 +++ mplayer.c 30 Nov 2001 23:44:04 -0000 1.331 @@ -419,6 +419,7 @@ int osd_visible=100; int osd_function=OSD_PLAY; int osd_last_pts=-303; +int osd_show_sub_delay = 0; int v_bright=50; int v_cont=50; @@ -1757,9 +1758,11 @@ break; case 'z': sub_delay -= 0.1; + osd_show_sub_delay = 9; // show the subdelay in OSD break; case 'x': sub_delay += 0.1; + osd_show_sub_delay = 9; // show the subdelay in OSD break; case '9': case '0': @@ -2026,7 +2029,11 @@ int pts=d_video->pts; if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts; vo_osd_text=osd_text_buffer; - sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60); + if (osd_show_sub_delay) { + sprintf(vo_osd_text, "Sub delay: %d ms",(int)(sub_delay*1000)); + osd_show_sub_delay--; + } else + sprintf(vo_osd_text,"%c %02d:%02d:%02d",osd_function,pts/3600,(pts/60)%60,pts%60); } else { vo_osd_text=NULL; }

1 0

CVS: main/TOOLS vivodump.c,1.4,1.5
by Arpi of Ize 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main/TOOLS In directory mplayer:/var/tmp.root/cvs-serv30001 Modified Files: vivodump.c Log Message: 0x82 support Index: vivodump.c =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/vivodump.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vivodump.c 4 Nov 2001 19:47:19 -0000 1.4 +++ vivodump.c 30 Nov 2001 23:13:05 -0000 1.5 @@ -147,7 +147,7 @@ unsigned int head=-1; int pos=0; int frames=0; -FILE *f=fopen("GB1.viv","rb"); +FILE *f=fopen("paulvandykforanangel.viv","rb"); FILE *f2=fopen("GB1.avi","wb"); aviwrite_t* avi=aviwrite_new_muxer(); aviwrite_stream_t* mux=aviwrite_new_stream(avi,AVIWRITE_TYPE_VIDEO); @@ -156,6 +156,7 @@ int v_id=0; int flag=0; int flag2=0; +int prefix=0; mux->buffer_size=0x200000; mux->buffer=malloc(mux->buffer_size); @@ -181,7 +182,15 @@ while((c=fgetc(f))>=0){ -// printf("%02X\n",c); + printf("%08X %02X\n",ftell(f),c); + + prefix=0; + if(c==0x82){ + prefix=1; + //continue; + c=fgetc(f); + printf("%08X %02X\n",ftell(f),c); + } if(c==0x00){ // header @@ -195,14 +204,18 @@ if((c&0xF0)==0x40){ // audio - printf("audio: %02X (24)\n",c); - for(i=0;i<24;i++) fgetc(f); + len=24; + if(prefix) len=fgetc(f); + printf("audio: %02X (%d)\n",c,len); + for(i=0;i<len;i++) fgetc(f); continue; } if((c&0xF0)==0x30){ // audio - printf("audio: %02X (40)\n",c); - for(i=0;i<40;i++) fgetc(f); + len=40; + if(prefix) len=fgetc(f); + printf("audio: %02X (%d)\n",c,len); + for(i=0;i<len;i++) fgetc(f); continue; } if(flag2 || (((c&0xF0)==0x10 || (c&0xF0)==0x20) && (c&0x0F)!=(v_id&0xF))){ @@ -214,13 +227,15 @@ if((v_id&0xF0)==0x10) fprintf(stderr,"hmm. last video packet %02X\n",v_id); } - v_id=c; flag2=0; if((c&0xF0)==0x10){ // 128 byte - printf("video: %02X (128)\n",c); - fread(mux->buffer+mux->buffer_len,128,1,f); - mux->buffer_len+=128; + len=128; + if(prefix) len=fgetc(f); + printf("video: %02X (%d)\n",c,len); + fread(mux->buffer+mux->buffer_len,len,1,f); + mux->buffer_len+=len; + v_id=c; continue; } if((c&0xF0)==0x20){ @@ -229,9 +244,11 @@ fread(mux->buffer+mux->buffer_len,len,1,f); mux->buffer_len+=len; flag2=1; + v_id=c; continue; } printf("error: %02X!\n",c); + exit(1); } if(!width) width=320;

1 0

CVS: main/libvo vo_dxr3.c,1.10,1.11
by David Holm 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv21002/libvo Modified Files: vo_dxr3.c Log Message: Added support for codecs that supports BGR24 (some opensource codecs and vivo) Added the over-requested underrated black-border around scaled movies that everyone's been nagging me about lately =). Fixed the following Bugs: YV12 video getting cropped at the bottom Lockups on exit (if these problems surface again, contact me please) Invalid stride in YUY2 playback Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vo_dxr3.c 30 Nov 2001 16:11:43 -0000 1.10 +++ vo_dxr3.c 30 Nov 2001 22:24:40 -0000 1.11 @@ -1,4 +1,3 @@ -#define PES_MAX_SIZE 2048 /* * vo_dxr3.c - DXR3/H+ video out * @@ -46,7 +45,6 @@ static unsigned char *picture_data[3]; static unsigned int picture_linesize[3]; -static unsigned char *spubuf=NULL; static int v_width,v_height; static int s_width,s_height; static int c_width,c_height; @@ -54,7 +52,25 @@ static int d_pos_x,d_pos_y; static int osd_w,osd_h; static int img_format = 0; -static int palette[] = { 0x000000, 0x494949, 0xb5b5b5, 0xffffff }; +static uint32_t palette[] = + { + 0x00505050, + 0x00000000, + 0x00808080, + 0xffffffff, + 0x00005555, + 0x0000ff00, + 0x00cc2255, + 0x00cc0055, + 0x00404040, + 0x00202020, + 0x00b0b0b0, + 0x00d0d0d0, + 0x60606000, + 0x70707000, + 0x80808000, + 0x60606000, + }; static int fd_control = -1; static int fd_video = -1; static int fd_spu = -1; @@ -72,7 +88,7 @@ void write_dxr3( rte_context* context, void* data, size_t size, void* user_data ) { if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS\n" ); + printf( "VO: [dxr3] Unable to set video PTS\n" ); write( fd_video, data, size ); } #endif @@ -125,9 +141,8 @@ v_height = height; s_width = scr_width; s_height = scr_height; - spubuf = malloc(53220); /* 53220 bytes is the standardized max size of a subpic */ - if( format == IMGFMT_YV12 || format == IMGFMT_YUY2 ) + if( format == IMGFMT_YV12 || format == IMGFMT_YUY2 || format == IMGFMT_BGR24 ) { #ifdef USE_MP1E int size; @@ -162,6 +177,8 @@ mp1e_context = rte_context_new( c_width, c_height, "mp1e", (void*)0xdeadbeef ); rte_set_verbosity( mp1e_context, 0 ); + printf( "VO: [dxr3] %dx%d => %dx%d\n", v_width, v_height, c_width, c_height ); + if( !mp1e_context ) { printf( "VO: [dxr3] Unable to create context!\n" ); @@ -281,7 +298,7 @@ vo_mpegpes_t *p=(vo_mpegpes_t *)src[0]; if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS\n" ); + printf( "VO: [dxr3] Unable to set video PTS\n" ); data_left = p->size; while( data_left ) @@ -289,6 +306,7 @@ return 0; } +#ifdef USE_MP1E else if( img_format == IMGFMT_YUY2 ) { int w=v_width,h=v_height; @@ -310,8 +328,57 @@ rte_push_video_buffer( mp1e_context, &mp1e_buffer ); return 0; } - - printf( "VO: [dxr3] Error in draw_frame(...)\n" ); + else if( img_format == IMGFMT_BGR24 ) + { + int x,y,w=v_width,h=v_height; + unsigned char *s,*dY,*dU,*dV; + + if(d_pos_x+w>picture_linesize[0]) w=picture_linesize[0]-d_pos_x; + if(d_pos_y+h>c_height) h=c_height-d_pos_y; + + s = src[0]+s_pos_y*(w*3); + + dY = picture_data[0]+d_pos_y*picture_linesize[0]; + dU = picture_data[1]+(d_pos_y/2)*picture_linesize[1]; + dV = picture_data[2]+(d_pos_y/2)*picture_linesize[2]; + + for(y=0;y<h;y++) + { + dY+=d_pos_x; + dU+=d_pos_x/4; + dV+=d_pos_x/4; + s+=s_pos_x; + for(x=0;x<w;x+=4) + { + RGBTOYUV(s[2],s[1],s[0]); + s+=3; + *dY = YUV_s.Y;dY++; +// The chrominance is shifted, ppl will have to settle with b&w for now ;) +// *dU = YUV_s.U;dU++; +// *dV = YUV_s.V;dV++; + + *dY = RGBTOY(s[2],s[1],s[0]);dY++; + s+=3; + *dY = RGBTOY(s[2],s[1],s[0]);dY++; + s+=3; + *dY = RGBTOY(s[2],s[1],s[0]);dY++; + s+=3; + } + dY+=d_pos_x; + dU+=d_pos_x/4; + dV+=d_pos_x/4; + s+=s_pos_x; + } + + mp1e_buffer.data = picture_data[0]; + mp1e_buffer.time = vo_pts/90000.0; + mp1e_buffer.user_data = NULL; + rte_push_video_buffer( mp1e_context, &mp1e_buffer ); + + return 0; + } +#endif + return -1; } @@ -328,36 +395,44 @@ static uint32_t draw_slice( uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0 ) { - unsigned char* s; - unsigned char* d; - if( img_format == IMGFMT_YV12 ) { #ifdef USE_MP1E + int y; + unsigned char *s,*s1; + unsigned char *d,*d1; + x0+=d_pos_x; - y0+=d_pos_y; + y0+=d_pos_y; if(x0+w>picture_linesize[0]) w=picture_linesize[0]-x0; if(y0+h>c_height) h=c_height-y0; s=srcimg[0]+s_pos_x+s_pos_y*stride[0]; d=picture_data[0]+x0+y0*picture_linesize[0]; - memcpy(d,s,(w*h)); + for(y=0;y<h;y++) + { + memcpy(d,s,w); + s+=stride[0]; + d+=picture_linesize[0]; + } w/=2;h/=2;x0/=2;y0/=2; s=srcimg[1]+s_pos_x+s_pos_y*stride[1]; d=picture_data[1]+x0+y0*picture_linesize[1]; - memcpy(d,s,(w*h)); + s1=srcimg[2]+s_pos_x+s_pos_y*stride[2]; + d1=picture_data[2]+x0+y0*picture_linesize[2]; + for(y=0;y<h;y++) + { + memcpy(d,s,w); + memcpy(d1,s1,w); + s+=stride[1];s1+=stride[2]; + d+=picture_linesize[1];d1+=picture_linesize[2]; + } - s=srcimg[2]+s_pos_x+s_pos_y*stride[2]; - d=picture_data[2]+x0+y0*picture_linesize[2]; - memcpy(d,s,(w*h)); - return 0; #endif - printf( "VO: [dxr3] You need to install mp1e rte, read DOCS/DXR3\n" ); - return -1; } return -1; @@ -371,9 +446,11 @@ #ifdef USE_MP1E if(format==IMGFMT_YV12) return 1; if(format==IMGFMT_YUY2) return 1; + if(format==IMGFMT_BGR24) { printf( "VO: [dxr3] WARNING\tExperimental output, black&white only and very slow\n\t(will be inproved later, this format is rarely used)\n" ); return 1; } #else if(format==IMGFMT_YV12) {printf("VO: [dxr3] You need to compile with mp1e rte to play this file! Read DOCS/DXR3\n" ); return 0;} if(format==IMGFMT_YUY2) {printf("VO: [dxr3] You need to compile with mp1e rte to play this file! Read DOCS/DXR3\n" ); return 0;} + if(format==IMGFMT_BGR24) {printf("VO: [dxr3] You need to compile with mp1e rte to play this file! Read DOCS/DXR3\n" ); return 0;} #endif else printf( "VO: [dxr3] Format unsupported, mail dholm(a)iname.com\n" ); return 0; @@ -382,12 +459,7 @@ static void uninit(void) { printf( "VO: [dxr3] Uninitializing\n" ); -#ifdef USE_MP1E - if( mp1e_context ) rte_stop( mp1e_context ); - if( mp1e_context ) rte_context_delete( mp1e_context ); if( picture_data[0] ) free(picture_data[0]); -#endif - if( spubuf ) free(spubuf); if( fd_video ) close(fd_video); if( fd_spu ) close(fd_spu); }

1 0

CVS: main/libao2 ao_dxr3.c,1.7,1.8
by David Holm 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main/libao2 In directory mplayer:/var/tmp.root/cvs-serv20216/libao2 Modified Files: ao_dxr3.c Log Message: Added support for upsampling since dxr3/h+ only supports 44100Hz and 48000Hz, currently it only works on 44100/(2*ratio) Reverted get_delay to return a properly calculated value instead of 0.0 Index: ao_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_dxr3.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ao_dxr3.c 30 Nov 2001 16:11:36 -0000 1.7 +++ ao_dxr3.c 30 Nov 2001 22:18:51 -0000 1.8 @@ -86,12 +86,26 @@ if( ioctl (fd_audio, SNDCTL_DSP_STEREO, &ao_data.channels) < 0 ) printf( "AO: [dxr3] Unable to set number of channels\n" ); - // set rate ao_data.bps = (channels+1)*rate; ao_data.samplerate=rate; if( ioctl (fd_audio, SNDCTL_DSP_SPEED, &ao_data.samplerate) < 0 ) + { printf( "AO: [dxr3] Unable to set samplerate\n" ); - printf("AO: [dxr3] Using %d Hz samplerate (requested: %d)\n",ao_data.samplerate,rate); + return 0; + } + if( rate < ao_data.samplerate ) + { + ao_data.samplerate = 44100; + ioctl(fd_audio, SNDCTL_DSP_SPEED, &ao_data.samplerate); + if( ao_data.samplerate != 44100 ) + { + printf( "AO: [dxr3] Unable to set samplerate\n" ); + return 0; + } + printf("AO: [dxr3] Using %d Hz samplerate (requested: %d) (Upsampling)\n",ao_data.samplerate,rate); + ao_data.samplerate = rate; + } + else printf("AO: [dxr3] Using %d Hz samplerate (requested: %d)\n",ao_data.samplerate,rate); } else ao_data.bps *= 2; @@ -190,23 +204,68 @@ return space; } +// playes 'len' bytes of 'data' +// upsamples if samplerate < 44100 +// return: number of bytes played static int play(void* data,int len,int flags) { if( ioctl( fd_audio, EM8300_IOCTL_AUDIO_SETPTS, &ao_data.pts ) < 0 ) printf( "AO: [dxr3] Unable to set PTS\n" ); + if( ao_data.samplerate < 44100 ) + { + int i,j,ratio,len2; + unsigned char *data2,*s,*d; + + ratio = 44100/ao_data.samplerate;ratio/=2;ratio*=2; + len2 = len * ratio; + data2 = malloc(len2); + + s = data; + d = data2; + + //Upsampler + if( ao_data.format == AFMT_U8 ) + { + for(i=0;i<ratio/2;i++) + for(j=0;j<len;j++) + { + *d = *s; + d++; + *d = *s; + d++;s++; + } + } + else + { + for(i=0;i<ratio/2;i++) + for(j=0;j<len/2;j++) + { + *d = *s; + d++;s++; + *d = *s; + d++;s--; + *d = *s; + d++;s++; + *d = *s; + d++;s++; + } + } + if( len2 < 0 ) return 0; + write(fd_audio,data2,len2); + return len; + } return write(fd_audio,data,len); } -// return: how many unplayed bytes are in the buffer +// return: delay in seconds between first and last sample in buffer static float get_delay() { -/* int r=0; + int r=0; if( ioctl(fd_audio, SNDCTL_DSP_GETODELAY, &r) < 0 ) { printf( "AO: [dxr3] Unable to get unplayed bytes in buffer\n" ); return ((float)ao_data.buffersize)/(float)ao_data.bps; } - return (((float)r)/(float)ao_data.bps);*/ - return 0.0; + return (((float)r)/(float)ao_data.bps); }

1 0

CVS: main/DOCS/Hungarian cd-dvd.html,1.14,1.15 documentation.html,1.64,1.65 encoding.html,1.2,1.3
by Winner of tha face compo 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mplayer:/var/tmp.root/cvs-serv20722 Modified Files: cd-dvd.html documentation.html encoding.html Log Message: typo fixes Index: cd-dvd.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/cd-dvd.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cd-dvd.html 6 Nov 2001 23:53:43 -0000 1.14 +++ cd-dvd.html 30 Nov 2001 22:18:34 -0000 1.15 @@ -137,7 +137,7 @@ <TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%> Nincs hang / rossz (spanyol hang, vagy ilyesmi). </TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD> -Az MPlayer egyenlõre nem használ fel minden IFO információt. +Az MPlayer egyelõre nem használ fel minden IFO információt. Manuálisan kiválaszthatsz egy DVD audio stream-et pl az '-aid 128' kapcsolóval, ahol 128 az audio stream száma. Próbáld a 128,129,stb számokat... Természetesen ezt hamarosan megoldjuk. Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/documentation.html,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- documentation.html 27 Nov 2001 18:09:45 -0000 1.64 +++ documentation.html 30 Nov 2001 22:18:34 -0000 1.65 @@ -800,7 +800,7 @@ Ha az MPlayer azt mondja hogy "CD-ROM Device '/dev/cdrom' not found!", csinálj egy linket : <CODE>ln -s /dev/(meghajtó) /dev/cdrom</CODE> -Egyenlõre nincs DVD támogatás FreeBSD-hez. +Egyelõre nincs DVD támogatás FreeBSD-hez. <A NAME=6.3>6.3. Solaris</A> Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/encoding.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- encoding.html 29 Nov 2001 20:52:13 -0000 1.2 +++ encoding.html 30 Nov 2001 22:18:34 -0000 1.3 @@ -55,7 +55,7 @@ <LI>1 vagy 2 menetes DivX4 video</LI> <LI>VBR MP3 audio</LI> <LI>PCM audio</LI> - <LI>stream másolás (csak AVI/ASF-bõl egyenlõre, és csak CBR audiot)</LI> + <LI>stream másolás (csak AVI/ASF-bõl egyelõre, és csak CBR audiot)</LI> <LI>bemeneti file A/V szinkronizálása (PTS-alapú, az -mc 0 opcióval kikapcsolható)</LI> <LI>FPS javítás az <CODE>-ofps</CODE> opcióval (hasznos ha 29.97fps-es @@ -76,7 +76,7 @@ Az elnevezés onnan jön, hogy ezzel a módszerrel a file kétszer lesz enkódolva. Az elsõ menet néhány pár Mb-os ideiglenes file-t hoz létre, amiket -egyenlõre nem ajánlatos törölni. A második menetben tényleges kimeneti file +egyelõre nem ajánlatos törölni. A második menetben tényleges kimeneti file képzõdik, az ideiglenes file-ok adataibõl. A keletkezõ file az egymenetesekhez képest sokkal jobb minõséggel és kisebb mérettel bír. Ha most hallassz errõl elõször, jobb ha keresel a neten egy útmutatót.

1 0

CVS: main/libmpdemux demux_fli.c,1.4,1.5
by Alex Beregszaszi 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv6203 Modified Files: demux_fli.c Log Message: magic_number checking added Index: demux_fli.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_fli.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demux_fli.c 30 Nov 2001 17:11:30 -0000 1.4 +++ demux_fli.c 30 Nov 2001 20:50:08 -0000 1.5 @@ -65,8 +65,19 @@ demuxer->movi_start = 128; demuxer->movi_end = stream_read_dword_le(demuxer->stream); +#if 0 // skip the magic number stream_skip(demuxer->stream, 2); +#else + magic_number = stream_read_word_le(demuxer->stream); + + if ((magic_number != 0xAF11) && (magic_number != 0xAF12)) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "Bad/unknown magic number (%04x)\n", + magic_number); + return(NULL); + } +#endif // fetch the number of frames frames->num_frames = stream_read_word_le(demuxer->stream); @@ -101,6 +112,10 @@ speed = stream_read_word_le(demuxer->stream); if (speed == 0) speed = 1; +#if 0 + if (magic_number == 0xAF11) + speed *= 1000/70; +#endif sh_video->fps = 1000 / speed; sh_video->frametime = 1/sh_video->fps;

1 0

CVS: main/libvo vo_dxr3.c,1.10,1.11
by David Holm 30 Nov '01

30 Nov '01

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv28253/libvo Modified Files: vo_dxr3.c Log Message: ao_dxr3.c: Decided to go with a calculated rate instead of retun 0.0 in get_delay Added upsampling since the DXR3 only supports 44100Hz and 48000Hz vo_dxr3.c: Fixed stride bug when playing back YUY2 streams Removed some code which could cause mplayer to lock up on exit Added BGR24 support for codecs that don't support YUY2 (xanim codecs?) Fixed another bug in the YV12 playback that caused the last few lines being cropped Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vo_dxr3.c 30 Nov 2001 16:11:43 -0000 1.10 +++ vo_dxr3.c 30 Nov 2001 20:00:59 -0000 1.11 @@ -1,4 +1,3 @@ -#define PES_MAX_SIZE 2048 /* * vo_dxr3.c - DXR3/H+ video out * @@ -35,10 +34,10 @@ rte_context* mp1e_context = NULL; rte_codec* mp1e_codec = NULL; rte_buffer mp1e_buffer; -struct { uint16_t Y,U,V; } YUV_s; -#define RGBTOY(R,G,B) (uint16_t)( (0.257 * R) + (0.504 * G) + (0.098 * B) + 16 ) -#define RGBTOU(R,G,B) (uint16_t)( -(0.148 * R) - (0.291 * G) + (0.439 * B) + 128 ) -#define RGBTOV(R,G,B) (uint16_t)( (0.439 * R) - (0.368 * G) - (0.071 * B) + 128 ) +struct { uint8_t Y,U,V; } YUV_s; +#define RGBTOY(R,G,B) (uint8_t)( (0.257 * R) + (0.504 * G) + (0.098 * B) + 16 ) +#define RGBTOU(R,G,B) (uint8_t)( -(0.148 * R) - (0.291 * G) + (0.439 * B) + 128 ) +#define RGBTOV(R,G,B) (uint8_t)( (0.439 * R) - (0.368 * G) - (0.071 * B) + 128 ) #define RGBTOYUV(R,G,B) YUV_s.Y = RGBTOY(R,G,B); \ YUV_s.U = RGBTOU(R,G,B); \ YUV_s.V = RGBTOV(R,G,B); @@ -46,7 +45,6 @@ static unsigned char *picture_data[3]; static unsigned int picture_linesize[3]; -static unsigned char *spubuf=NULL; static int v_width,v_height; static int s_width,s_height; static int c_width,c_height; @@ -54,7 +52,25 @@ static int d_pos_x,d_pos_y; static int osd_w,osd_h; static int img_format = 0; -static int palette[] = { 0x000000, 0x494949, 0xb5b5b5, 0xffffff }; +static uint32_t palette[] = + { + 0x00505050, + 0x00000000, + 0x00808080, + 0xffffffff, + 0x00005555, + 0x0000ff00, + 0x00cc2255, + 0x00cc0055, + 0x00404040, + 0x00202020, + 0x00b0b0b0, + 0x00d0d0d0, + 0x60606000, + 0x70707000, + 0x80808000, + 0x60606000, + }; static int fd_control = -1; static int fd_video = -1; static int fd_spu = -1; @@ -72,7 +88,7 @@ void write_dxr3( rte_context* context, void* data, size_t size, void* user_data ) { if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS\n" ); + printf( "VO: [dxr3] Unable to set video PTS\n" ); write( fd_video, data, size ); } #endif @@ -107,7 +123,6 @@ printf( "VO: [dxr3] Unable to set subpicture mode!\n" ); return -1; } - if( ioctl( fd_spu, EM8300_IOCTL_SPU_SETPALETTE, palette ) < 0 ) { printf( "VO: [dxr3] Unable to set subpicture palette!\n" ); @@ -125,9 +140,9 @@ v_height = height; s_width = scr_width; s_height = scr_height; - spubuf = malloc(53220); /* 53220 bytes is the standardized max size of a subpic */ + - if( format == IMGFMT_YV12 || format == IMGFMT_YUY2 ) + if( format == IMGFMT_YV12 || format == IMGFMT_YUY2 || format == IMGFMT_BGR24 ) { #ifdef USE_MP1E int size; @@ -161,7 +176,9 @@ mp1e_context = rte_context_new( c_width, c_height, "mp1e", (void*)0xdeadbeef ); rte_set_verbosity( mp1e_context, 0 ); - + + printf( "VO: [dxr3] %dx%d => %dx%d\n", v_width, v_height, c_width, c_height ); + if( !mp1e_context ) { printf( "VO: [dxr3] Unable to create context!\n" ); @@ -281,7 +298,7 @@ vo_mpegpes_t *p=(vo_mpegpes_t *)src[0]; if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS\n" ); + printf( "VO: [dxr3] Unable to set video PTS\n" ); data_left = p->size; while( data_left ) @@ -310,6 +327,54 @@ rte_push_video_buffer( mp1e_context, &mp1e_buffer ); return 0; } + else if( img_format == IMGFMT_BGR24 ) + { + int x,y,w=v_width,h=v_height; + unsigned char *s,*dY,*dU,*dV; + + if(d_pos_x+w>picture_linesize[0]) w=picture_linesize[0]-d_pos_x; + if(d_pos_y+h>c_height) h=c_height-d_pos_y; + + s = src[0]+s_pos_y*(w*3); + + dY = picture_data[0]+d_pos_y*picture_linesize[0]; + dU = picture_data[1]+(d_pos_y/2)*picture_linesize[1]; + dV = picture_data[2]+(d_pos_y/2)*picture_linesize[2]; + + for(y=0;y<h;y++) + { + dY+=d_pos_x; + dU+=d_pos_x/4; + dV+=d_pos_x/4; + s+=s_pos_x; + for(x=0;x<w;x+=4) + { + RGBTOYUV(s[2],s[1],s[0]); + s+=3; + *dY = YUV_s.Y;dY++; +// *dU = YUV_s.U;dU++; +// *dV = YUV_s.V;dV++; + + *dY = RGBTOY(s[2],s[1],s[0]);dY++; + s+=3; + *dY = RGBTOY(s[2],s[1],s[0]);dY++; + s+=3; + *dY = RGBTOY(s[2],s[1],s[0]);dY++; + s+=3; + } + dY+=d_pos_x; + dU+=d_pos_x/4; + dV+=d_pos_x/4; + s+=s_pos_x; + } + + mp1e_buffer.data = picture_data[0]; + mp1e_buffer.time = vo_pts/90000.0; + mp1e_buffer.user_data = NULL; + rte_push_video_buffer( mp1e_context, &mp1e_buffer ); + + return 0; + } printf( "VO: [dxr3] Error in draw_frame(...)\n" ); return -1; @@ -328,31 +393,42 @@ static uint32_t draw_slice( uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0 ) { - unsigned char* s; - unsigned char* d; if( img_format == IMGFMT_YV12 ) { #ifdef USE_MP1E + int y; + unsigned char *s,*s1; + unsigned char *d,*d1; + x0+=d_pos_x; y0+=d_pos_y; - + if(x0+w>picture_linesize[0]) w=picture_linesize[0]-x0; if(y0+h>c_height) h=c_height-y0; - + s=srcimg[0]+s_pos_x+s_pos_y*stride[0]; d=picture_data[0]+x0+y0*picture_linesize[0]; - memcpy(d,s,(w*h)); - + for(y=0;y<h;y++) + { + memcpy(d,s,w); + s+=stride[0]; + d+=picture_linesize[0]; + } + w/=2;h/=2;x0/=2;y0/=2; s=srcimg[1]+s_pos_x+s_pos_y*stride[1]; d=picture_data[1]+x0+y0*picture_linesize[1]; - memcpy(d,s,(w*h)); - - s=srcimg[2]+s_pos_x+s_pos_y*stride[2]; - d=picture_data[2]+x0+y0*picture_linesize[2]; - memcpy(d,s,(w*h)); + s1=srcimg[2]+s_pos_x+s_pos_y*stride[2]; + d1=picture_data[2]+x0+y0*picture_linesize[2]; + for(y=0;y<h;y++) + { + memcpy(d,s,w); + memcpy(d1,s1,w); + s+=stride[1];s1+=stride[2]; + d+=picture_linesize[1];d1+=picture_linesize[2]; + } return 0; #endif @@ -371,6 +447,7 @@ #ifdef USE_MP1E if(format==IMGFMT_YV12) return 1; if(format==IMGFMT_YUY2) return 1; + if(format==IMGFMT_BGR24) { printf( "VO: [dxr3] WARNING\tExperimental output, black&white only and very slow\n\t(will be inproved later, this format is rarely used)\n" ); return 1; } #else if(format==IMGFMT_YV12) {printf("VO: [dxr3] You need to compile with mp1e rte to play this file! Read DOCS/DXR3\n" ); return 0;} if(format==IMGFMT_YUY2) {printf("VO: [dxr3] You need to compile with mp1e rte to play this file! Read DOCS/DXR3\n" ); return 0;} @@ -383,11 +460,8 @@ { printf( "VO: [dxr3] Uninitializing\n" ); #ifdef USE_MP1E - if( mp1e_context ) rte_stop( mp1e_context ); - if( mp1e_context ) rte_context_delete( mp1e_context ); if( picture_data[0] ) free(picture_data[0]); #endif - if( spubuf ) free(spubuf); if( fd_video ) close(fd_video); if( fd_spu ) close(fd_spu); }

1 0