March 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main mencoder.c,1.99,1.100 cfg-mencoder.h,1.29,1.30
by Fredrik Kuivinen CVS 07 Apr '02

07 Apr '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv31880 Modified Files: mencoder.c cfg-mencoder.h Log Message: Support for cropping in mencoder. New options: -x0, -y0: upper-left corner of rectangle to be cut out -xsize, -ysize: Size of rectangle to cut out Cropping is done before scaling. Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- mencoder.c 20 Mar 2002 15:38:13 -0000 1.99 +++ mencoder.c 23 Mar 2002 13:13:12 -0000 1.100 @@ -97,7 +97,7 @@ #endif #include <inttypes.h> -#include "../postproc/swscale.h" +#include "postproc/swscale.h" #include "fastmemcpy.h" @@ -208,9 +208,11 @@ int lame_param_ratio=-1; // unset #endif -static int scale_srcW=0; -static int scale_srcH=0; static int vo_w=0, vo_h=0; +static int crop_width, crop_height, crop_x0 = 0, crop_y0 = 0; +static int input_pitch, input_bpp; +static SwsContext* swsContext = NULL; + //-------------------------- config stuff: m_config_t* mconfig; @@ -226,6 +228,7 @@ static int parse_end_at(struct config *conf, const char* param); static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); +static int bits_per_pixel(uint32_t fmt); #include "get_path.c" @@ -269,34 +272,71 @@ static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h, int x0,int y0){ int y; // printf("draw_slice %dx%d %d;%d\n",w,h,x0,y0); - if(scale_srcW || scale_srcH) + + if(y0 + h < crop_y0) + return 0; + + if(y0 > crop_height + crop_y0) + return 0; + + if(x0 + w < crop_x0) + return 0; + + if(x0 > crop_width + crop_x0) + return 0; + + if(y0 < crop_y0) { + src[0] += stride[0]*(crop_y0 - y0); + src[1] += stride[1]*(crop_y0 - y0)/2; + src[2] += stride[2]*(crop_y0 - y0)/2; + h -= crop_y0 - y0; + y0 = crop_y0; + } + + if(x0 < crop_x0) { + src[0] += crop_x0 - x0; + src[1] += (crop_x0 - x0)/2; + src[2] += (crop_x0 - x0)/2; + w -= crop_x0 - x0; + x0 = crop_x0; + } + + if(y0 + h > crop_y0 + crop_height) + h = crop_y0 + crop_height - y0; + + if(x0 + w > crop_x0 + crop_width) + w = crop_x0 + crop_width - x0; + + if(swsContext) { uint8_t* dstPtr[3]= { - vo_image, - vo_image + vo_w*vo_h*5/4, - vo_image + vo_w*vo_h}; - SwScale_YV12slice(src, stride, y0, h, dstPtr, vo_w, 12, scale_srcW, scale_srcH, vo_w, vo_h); + vo_image, + vo_image + vo_w*vo_h*5/4, + vo_image + vo_w*vo_h}; + int dstStride[3] = {vo_w, vo_w/2, vo_w/2}; + + swsContext->swScale(swsContext, src, stride, y0 - crop_y0, h, dstPtr, dstStride); } else { // copy Y: - for(y=0;y<h;y++){ - unsigned char* s=src[0]+stride[0]*y; - unsigned char* d=vo_image+vo_w*(y0+y)+x0; + for(y = 0; y < h; y++){ + unsigned char* s = src[0] + stride[0]*y; + unsigned char* d = vo_image + vo_w*(y0 - crop_y0 + y); memcpy(d,s,w); } x0>>=1;y0>>=1; w>>=1;h>>=1; // copy U: - for(y=0;y<h;y++){ - unsigned char* s=src[2]+stride[2]*y; - unsigned char* d=vo_image+vo_w*vo_h+(vo_w>>1)*(y0+y)+x0; + for(y = 0; y < h; y++){ + unsigned char* s = src[2] + stride[2]*y; + unsigned char* d = vo_image + vo_w*vo_h + (vo_w>>1)*(y0 - crop_y0/2 + y); memcpy(d,s,w); } // copy V: - for(y=0;y<h;y++){ - unsigned char* s=src[1]+stride[1]*y; - unsigned char* d=vo_image+vo_w*vo_h+vo_w*vo_h/4+(vo_w>>1)*(y0+y)+x0; + for(y = 0; y < h; y++){ + unsigned char* s = src[1] + stride[1]*y; + unsigned char* d = vo_image + vo_w*vo_h + vo_w*vo_h/4 + (vo_w>>1)*(y0 - crop_y0/2 + y); memcpy(d,s,w); } } // !swscaler @@ -304,10 +344,25 @@ } static uint32_t draw_frame(uint8_t *src[]){ + int y; // printf("This function shouldn't be called - report bug!\n"); // later: add YUY2->YV12 conversion here! - vo_image_ptr=src[0]; - return(0); + + if(swsContext) { + uint8_t* src_img = *src + crop_y0*input_pitch + crop_x0*input_bpp/8; + int dstStride = vo_w * input_bpp/8; + + swsContext->swScale(swsContext, &src_img, &input_pitch, 0, crop_height, + &vo_image_ptr, &dstStride); + } + else { + for(y = crop_y0; y < crop_height + crop_y0; y++) + memcpy(&vo_image_ptr[(y - crop_y0)*crop_width*input_bpp/8], + src[0] + y*input_pitch + crop_x0*input_bpp/8, + crop_width*input_bpp/8); + } + + return(0); } static int query_format(unsigned int out_fmt){ @@ -633,30 +688,41 @@ //sh_video->outfmtidx=i; // FIXME!!!!!!!!!!!!!!!!!!! -if((out_fmt==IMGFMT_YV12 || out_fmt==IMGFMT_IYUV || out_fmt==IMGFMT_I420) && - (vo_w!=0 || vo_h!=0)) -{ - scale_srcW= sh_video->disp_w; - scale_srcH= sh_video->disp_h; - if(!vo_w) vo_w=sh_video->disp_w; - if(!vo_h) vo_h=sh_video->disp_h; -} -else -{ - vo_w=sh_video->disp_w; - vo_h=sh_video->disp_h; -} + if(!crop_width) + crop_width = sh_video->disp_w - crop_x0; + if(!crop_height) + crop_height = sh_video->disp_h - crop_y0; + + if(crop_width + crop_x0 > sh_video->disp_w || + crop_height + crop_y0 > sh_video->disp_h) { + printf("Fatal error: x0 + xsize (or y0 + ysize) is larger than the movie.\n"); + return 1; + } -if(out_fmt==IMGFMT_YV12 || out_fmt==IMGFMT_I420 || out_fmt==IMGFMT_IYUV){ - vo_image=malloc(vo_w*vo_h*3/2); - vo_image_ptr=vo_image; -} + if(crop_x0 >= sh_video->disp_w || + crop_y0 >= sh_video->disp_h) { + printf("Fatal error: You tried to crop away more than the entire movie!\n"); + return 1; + } + + printf("x0: %d y0: %d crop_width: %d crop_height: %d\n", crop_x0, crop_y0, crop_width, crop_height); + + if(!vo_w) vo_w = crop_width; + if(!vo_h) vo_h = crop_height; -if (IMGFMT_IS_BGR(out_fmt)) - vo_image_ptr = vo_image = malloc(vo_w*vo_h*IMGFMT_BGR_DEPTH(out_fmt)/8); + if(vo_w != crop_width || vo_h != crop_height) + { + swsContext = getSwsContextFromCmdLine(crop_width, crop_height, out_fmt, vo_w, vo_h, out_fmt); -if (IMGFMT_IS_RGB(out_fmt)) - vo_image_ptr = vo_image = malloc(vo_w*vo_h*IMGFMT_RGB_DEPTH(out_fmt)/8); + if(!swsContext) { + printf("Fatal error: Initialization of software scaler faild.\n"); + return 1; + } + } + + input_bpp = bits_per_pixel(out_fmt); + vo_image_ptr = vo_image = malloc(vo_w*vo_h*input_bpp/8); + input_pitch = sh_video->disp_w*input_bpp/8; } // if(out_video_codec) @@ -700,7 +766,6 @@ // set up video encoder: -SwScale_Init(); #ifdef USE_DVDREAD vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, @@ -772,8 +837,8 @@ case VCODEC_RAWRGB: mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); - mux_v->bih->biWidth=sh_video->disp_w; - mux_v->bih->biHeight=sh_video->disp_h; + mux_v->bih->biWidth=vo_w; + mux_v->bih->biHeight=vo_h; mux_v->bih->biCompression=0; mux_v->bih->biPlanes=1; @@ -1484,8 +1549,8 @@ vo_w*3, vo_h); } else { - yuv2rgb(raw_rgb_buffer, vo_image_ptr, vo_image_ptr + vo_w*vo_h*5/4, - vo_image_ptr + vo_w*vo_h, vo_w, vo_h, vo_w*24/8, vo_w, vo_w/2); + yuv2rgb(raw_rgb_buffer, vo_image_ptr, vo_image_ptr + vo_w*vo_h, + vo_image_ptr + vo_w*vo_h*5/4, vo_w, vo_h, vo_w*24/8, vo_w, vo_w/2); mux_v->buffer = flip_upside_down(raw_rgb_buffer, raw_rgb_buffer, vo_w*3, vo_h); } @@ -1795,4 +1860,29 @@ free(tmp); return dst; +} + +/* Bits per pixel for format fmt. Not depth */ +static int bits_per_pixel(uint32_t fmt) +{ + if(IMGFMT_IS_RGB(fmt)) { + if(IMGFMT_RGB_DEPTH(fmt) == 15) + return 16; + else + return IMGFMT_RGB_DEPTH(fmt); + } + else if(IMGFMT_IS_BGR(fmt)) { + if(IMGFMT_BGR_DEPTH(fmt) == 15) + return 16; + else + return IMGFMT_BGR_DEPTH(fmt); + } + else if(fmt==IMGFMT_YV12 || fmt==IMGFMT_I420 || fmt==IMGFMT_IYUV) + return 12; + else if(fmt == IMGFMT_YUY2 || fmt == IMGFMT_UYVY) + return 16; + else { + fprintf(stderr, "Error: bits_per_pixel: Unknown imgfmt: %s\n", vo_format_name(fmt)); + return 0; + } } Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- cfg-mencoder.h 22 Mar 2002 04:14:43 -0000 1.29 +++ cfg-mencoder.h 23 Mar 2002 13:13:12 -0000 1.30 @@ -112,6 +112,12 @@ {"x", &vo_w, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"y", &vo_h, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + {"x0", &crop_x0, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + {"y0", &crop_y0, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + + {"xsize", &crop_width, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + {"ysize", &crop_height, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + {"mp3file", &mp3_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ac3file", &ac3_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},

6 8

CVS: main/libmpdemux mpeg_hdr.c,1.2,1.3
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv6700 Modified Files: mpeg_hdr.c Log Message: after some STFW i've found some info about fps codes Index: mpeg_hdr.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/mpeg_hdr.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mpeg_hdr.c 31 Mar 2002 23:30:55 -0000 1.2 +++ mpeg_hdr.c 31 Mar 2002 23:46:00 -0000 1.3 @@ -9,10 +9,16 @@ static int frameratecode2framerate[16] = { 0, - // Official mpeg1/2 framerates: - 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001, 60*10000, - // libmpeg3's "Unofficial economy rates": - 299700,5*10000,10*10000,12*10000,15*10000,0,0 + // Official mpeg1/2 framerates: (1-8) + 24000*10000/1001, 24*10000,25*10000, + 30000*10000/1001, 30*10000,50*10000, + 60000*10000/1001, 60*10000, + // Xing's 15fps: (9) + 15*10000, + // libmpeg3's "Unofficial economy rates": (10-13) + 5*10000,10*10000,12*10000,15*10000, + // some invalid ones: (14-15) + 0,0 };

1 0

CVS: main/libmpdemux mpeg_hdr.c,1.1,1.2
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv3077 Modified Files: mpeg_hdr.c Log Message: mtvp says its' 29.97 not 1 fps Index: mpeg_hdr.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/mpeg_hdr.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mpeg_hdr.c 30 Oct 2001 18:45:54 -0000 1.1 +++ mpeg_hdr.c 31 Mar 2002 23:30:55 -0000 1.2 @@ -12,7 +12,7 @@ // Official mpeg1/2 framerates: 24000*10000/1001, 24*10000,25*10000, 30000*10000/1001, 30*10000,50*10000,60000*10000/1001, 60*10000, // libmpeg3's "Unofficial economy rates": - 1*10000,5*10000,10*10000,12*10000,15*10000,0,0 + 299700,5*10000,10*10000,12*10000,15*10000,0,0 };

1 0

CVS: main/libmpdemux demux_film.c,1.9,1.10
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv24290 Modified Files: demux_film.c Log Message: seeking fixed (variable fps videos needs to reset PTS after seeking) Index: demux_film.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_film.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- demux_film.c 31 Mar 2002 22:44:03 -0000 1.9 +++ demux_film.c 31 Mar 2002 22:52:48 -0000 1.10 @@ -76,6 +76,8 @@ printf (" (flags = %X) actual new chunk = %d (syncinfo1 = %08X)\n", flags, film_data->current_chunk, film_data->chunks[film_data->current_chunk].syncinfo1); + demuxer->video->pts=film_data->chunks[film_data->current_chunk].pts; + } // return value:

1 0

CVS: main/libmpdemux demux_film.c,1.8,1.9
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv22534 Modified Files: demux_film.c Log Message: fixed new_chunk calculation at seeking (seeking not work yet) and added -nosound support Index: demux_film.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_film.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- demux_film.c 31 Mar 2002 02:57:53 -0000 1.8 +++ demux_film.c 31 Mar 2002 22:44:03 -0000 1.9 @@ -49,16 +49,13 @@ void demux_seek_film(demuxer_t *demuxer, float rel_seek_secs, int flags) { film_data_t *film_data = (film_data_t *)demuxer->priv; - int new_current_chunk; + int new_current_chunk=(flags&1)?0:film_data->current_chunk; - // bit 2 of the flags apparently means that the seek is relative to - // the beginning of the file - if (flags & 1) - new_current_chunk = - rel_seek_secs * film_data->chunks_per_second; + if(flags&2) + new_current_chunk += rel_seek_secs * film_data->total_chunks; // 0..1 else - new_current_chunk = film_data->current_chunk + - rel_seek_secs * film_data->chunks_per_second; + new_current_chunk += rel_seek_secs * film_data->chunks_per_second; // secs + printf ("current, total chunks = %d, %d; seek %5.3f sec, new chunk guess = %d\n", film_data->current_chunk, film_data->total_chunks, @@ -110,6 +107,7 @@ // (all ones in syncinfo1 indicates an audio chunk) if (film_chunk.syncinfo1 == 0xFFFFFFFF) { + if(demuxer->audio->id>=-1){ // audio not disabled dp = new_demux_packet(film_chunk.chunk_size); if (stream_read(demuxer->stream, dp->buffer, film_chunk.chunk_size) != film_chunk.chunk_size) @@ -134,7 +132,7 @@ // append packet to DS stream ds_add_packet(demuxer->audio, dp); - film_data->current_chunk++; + } } else { @@ -171,16 +169,15 @@ // append packet to DS stream ds_add_packet(demuxer->video, dp); - film_data->current_chunk++; } else { ds_read_packet(demuxer->video, demuxer->stream, film_chunk.chunk_size, film_chunk.pts, film_chunk.chunk_offset, (film_chunk.syncinfo1 & 0x80000000) ? 1 : 0); - film_data->current_chunk++; } } + film_data->current_chunk++; return 1; } @@ -266,6 +263,12 @@ // skip height and width if no video stream_skip(demuxer->stream, 8); + if(demuxer->audio->id<-1){ + printf("chunk size = 0x%X \n",chunk_size); + stream_skip(demuxer->stream, chunk_size-12-8); + break; // audio disabled (or no soundcard) + } + // skip over unknown byte, but only if file had non-NULL version if (film_data->film_version) stream_skip(demuxer->stream, 1); @@ -378,6 +381,7 @@ // precalculate PTS if (film_chunk.syncinfo1 == 0xFFFFFFFF) { + if(demuxer->audio->id>=-1) film_chunk.pts = (float)total_audio_bytes / (float)sh_audio->wf->nAvgBytesPerSec; total_audio_bytes += film_chunk.chunk_size;

1 0

CVS: main mencoder.c,1.108,1.109
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv15753 Modified Files: mencoder.c Log Message: 10l Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- mencoder.c 31 Mar 2002 22:01:54 -0000 1.108 +++ mencoder.c 31 Mar 2002 22:12:39 -0000 1.109 @@ -610,10 +610,8 @@ #ifdef USE_DVDREAD if(stream->type==STREAMTYPE_DVD){ - current_module="dvd lang->id"; if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); - current_module=NULL; } #endif

1 0

CVS: main mencoder.c,1.107,1.108 cfg-common.h,1.34,1.35 cfg-mplayer.h,1.141,1.142
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv13234 Modified Files: mencoder.c cfg-common.h cfg-mplayer.h Log Message: -alang/-slang support in mencoder too Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- mencoder.c 29 Mar 2002 15:12:41 -0000 1.107 +++ mencoder.c 31 Mar 2002 22:01:54 -0000 1.108 @@ -124,6 +124,8 @@ int video_id=-1; int dvdsub_id=-1; int vobsub_id=-1; +char* audio_lang=NULL; +char* dvdsub_lang=NULL; static char* spudec_ifo=NULL; static int has_audio=1; @@ -605,6 +607,15 @@ } printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos)); + +#ifdef USE_DVDREAD +if(stream->type==STREAMTYPE_DVD){ + current_module="dvd lang->id"; + if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); + if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); + current_module=NULL; +} +#endif if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0); Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- cfg-common.h 29 Mar 2002 03:17:57 -0000 1.34 +++ cfg-common.h 31 Mar 2002 22:01:54 -0000 1.35 @@ -21,6 +21,8 @@ {"dvd", &dvd_title, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, + {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, #else {"dvd", "MPlayer was compiled WITHOUT libdvdread support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- cfg-mplayer.h 24 Mar 2002 14:15:24 -0000 1.141 +++ cfg-mplayer.h 31 Mar 2002 22:01:54 -0000 1.142 @@ -281,11 +281,6 @@ {"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif -#ifdef USE_DVDREAD - {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#endif - {"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},

1 0

CVS: main/libmpdemux demux_nuv.c,1.5,1.6
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv31429 Modified Files: demux_nuv.c Log Message: 10l... int/1000 will be int while we want float, so let's do int*0.001 Index: demux_nuv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_nuv.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- demux_nuv.c 9 Jan 2002 17:09:21 -0000 1.5 +++ demux_nuv.c 31 Mar 2002 21:08:15 -0000 1.6 @@ -174,7 +174,7 @@ /* put RTjpeg tables, Video info to video buffer */ stream_seek ( demuxer->stream, orig_pos ); ds_read_packet ( demuxer->video, demuxer->stream, rtjpeg_frameheader.packetlength + 12, - rtjpeg_frameheader.timecode / 1000, orig_pos, 0 ); + rtjpeg_frameheader.timecode*0.001, orig_pos, 0 ); } else @@ -185,7 +185,7 @@ priv->current_audio_frame++; /* put Audio to audio buffer */ ds_read_packet ( demuxer->audio, demuxer->stream, rtjpeg_frameheader.packetlength, - rtjpeg_frameheader.timecode / 1000, orig_pos + 12, 0 ); + rtjpeg_frameheader.timecode*0.001, orig_pos + 12, 0 ); } return 1;

2 1

CVS: main mplayer.c,1.453,1.454
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv24163 Modified Files: mplayer.c Log Message: better message when vo->preinit fails Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.453 retrieving revision 1.454 diff -u -r1.453 -r1.454 --- mplayer.c 31 Mar 2002 19:20:01 -0000 1.453 +++ mplayer.c 31 Mar 2002 20:47:28 -0000 1.454 @@ -1192,8 +1192,8 @@ current_module="preinit_libvo"; -if((i=video_out->preinit(vo_subdevice))!=0){ - mp_msg(MSGT_CPLAYER,MSGL_FATAL,"error on vo preinit = %u\n",i); +if((video_out->preinit(vo_subdevice))!=0){ + mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error opening/initializing the selected video_out (-vo) device!\n"); goto goto_next_file; // exit_player(MSGTR_Exit_error); } sh_video->video_out=video_out;

1 0

CVS: main/libvo mga_common.c,1.28,1.29 vo_mga.c,1.29,1.30 vo_xmga.c,1.55,1.56
by Arpi of Ize 31 Mar '02

31 Mar '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv23447 Modified Files: mga_common.c vo_mga.c vo_xmga.c Log Message: open(/dev/mga_vid) moved to preinit Index: mga_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mga_common.c 31 Mar 2002 20:39:38 -0000 1.28 +++ mga_common.c 31 Mar 2002 20:45:31 -0000 1.29 @@ -292,6 +292,15 @@ static uint32_t preinit(const char *arg) { + char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid"; + + f = open(devname,O_RDWR); + if(f == -1) + { + perror("open"); + printf("Couldn't open %s\n",devname); + return(-1); + } return 0; } Index: vo_mga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vo_mga.c 29 Mar 2002 05:03:25 -0000 1.29 +++ vo_mga.c 31 Mar 2002 20:45:31 -0000 1.30 @@ -60,9 +60,8 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info) { -char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid"; - if (f >= 0) mga_uninit(); +// if (f >= 0) mga_uninit(); if(!vo_screenwidth || !vo_screenheight) { int fd; struct fb_var_screeninfo fbinfo; @@ -92,13 +91,6 @@ printf("vo_mga aspect(): resized to %dx%d\n",d_width,d_height); } - - f = open(devname,O_RDWR); - if(f == -1) - { - printf("Couldn't open %s\n",devname); - return(-1); - } switch(format){ case IMGFMT_YV12: Index: vo_xmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- vo_xmga.c 24 Mar 2002 20:45:30 -0000 1.55 +++ vo_xmga.c 31 Mar 2002 20:45:31 -0000 1.56 @@ -202,16 +202,6 @@ XGCValues xgcv; unsigned long xswamask; - char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid"; - - f = open(devname,O_RDWR); - if(f == -1) - { - perror("open"); - printf("Couldn't open %s\n",devname); - return(-1); - } - width+=width&1; switch(format)

1 0