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

CVS: main/libmpdemux tv.c,1.35,1.36
by Alex Beregszaszi 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv31898 Modified Files: tv.c Log Message: removed the mess Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tv.c 19 Oct 2002 20:55:06 -0000 1.35 +++ tv.c 19 Oct 2002 20:56:28 -0000 1.36 @@ -459,71 +459,15 @@ switch(opt) { case TV_COLOR_BRIGHTNESS: - if (value == 50) - value = 32768; - if (value > 50) - { - value *= 100; - value += 32768; - } - if (value < 50) - { - int i; - value *= 100; - i = value; - value = 32768 - i; - } funcs->control(tvh->priv, TVI_CONTROL_VID_SET_BRIGHTNESS, &value); break; case TV_COLOR_HUE: - if (value == 50) - value = 32768; - if (value > 50) - { - value *= 100; - value += 32768; - } - if (value < 50) - { - int i; - value *= 100; - i = value; - value = 32768 - i; - } funcs->control(tvh->priv, TVI_CONTROL_VID_SET_HUE, &value); break; case TV_COLOR_SATURATION: - if (value == 50) - value = 32512; - if (value > 50) - { - value *= 100; - value += 32512; - } - if (value < 50) - { - int i; - value *= 100; - i = value; - value = 32512 - i; - } funcs->control(tvh->priv, TVI_CONTROL_VID_SET_SATURATION, &value); break; case TV_COLOR_CONTRAST: - if (value == 50) - value = 27648; - if (value > 50) - { - value *= 100; - value += 27648; - } - if (value < 50) - { - int i; - value *= 100; - i = value; - value = 27648 - i; - } funcs->control(tvh->priv, TVI_CONTROL_VID_SET_CONTRAST, &value); break; default:

1 0

CVS: main/libmpdemux tv.c,1.34,1.35
by Alex Beregszaszi 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv28379 Modified Files: tv.c Log Message: set position in channel list on startup. note: hope one day we will get cleaned the int->float->int sutff ;) Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- tv.c 22 Sep 2002 02:33:26 -0000 1.34 +++ tv.c 19 Oct 2002 20:55:06 -0000 1.35 @@ -244,6 +244,25 @@ } } } + + /* grep frequency in chanlist */ + { + unsigned long i2; + int freq; + + tv_get_freq(tvh, &i2); + + freq = (int) (((float)(i2/16))*1000)+250; + + for (i = 0; i < chanlists[tvh->chanlist].count; i++) + { + if (tvh->chanlist_s[i].freq == freq) + { + tvh->channel = i+1; + break; + } + } + } done: /* also start device! */ @@ -388,13 +407,11 @@ return 1; } -#if defined(USE_TV) && defined(HAVE_TV_V4L) int demux_close_tv(demuxer_t *demuxer) { tvi_handle_t *tvh=(tvi_handle_t*)(demuxer->priv); return(tvh->functions->uninit(tvh->priv)); } -#endif /* ================== STREAM_TV ===================== */ tvi_handle_t *tvi_init_dummy(char *device); @@ -513,6 +530,17 @@ mp_msg(MSGT_TV, MSGL_WARN, "Unknown color option (%d) specified!\n", opt); } + return(1); +} + +int tv_get_freq(tvi_handle_t *tvh, unsigned long *freq) +{ + if (tvh->functions->control(tvh->priv, TVI_CONTROL_IS_TUNER, 0) == TVI_CONTROL_TRUE) + { + tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, freq); + mp_msg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n", + *freq, (float)*freq/16); + } return(1); }

1 0

CVS: main/libmpcodecs vf_1bpp.c,NONE,1.1 vf.c,1.51,1.52 Makefile,1.64,1.65
by Arpi of Ize 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv11794 Modified Files: vf.c Makefile Added Files: vf_1bpp.c Log Message: new filter: 1bpp - converts 1bpp image to yuv/rgb 8/16/32 bpp --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> #include "../config.h" #include "../mp_msg.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "../postproc/rgb2rgb.h" //===========================================================================// static unsigned int bgr_list[]={ IMGFMT_Y800, IMGFMT_Y8, IMGFMT_BGR8, IMGFMT_RGB8, IMGFMT_YVU9, IMGFMT_411P, IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, IMGFMT_422P, IMGFMT_444P, IMGFMT_YUY2, IMGFMT_BGR15, IMGFMT_RGB15, IMGFMT_BGR16, IMGFMT_RGB16, IMGFMT_BGR32, IMGFMT_RGB32, // IMGFMT_BGR24, // IMGFMT_RGB24, 0 }; static unsigned int find_best(struct vf_instance_s* vf){ unsigned int best=0; int ret; unsigned int* p=bgr_list; while(*p){ ret=vf->next->query_format(vf->next,*p); mp_msg(MSGT_VFILTER,MSGL_V,"[%s] query(%s) -> %d\n",vf->info->name,vo_format_name(*p),ret&3); if(ret&VFCAP_CSP_SUPPORTED_BY_HW){ best=*p; break;} // no conversion -> bingo! if(ret&VFCAP_CSP_SUPPORTED && !best) best=*p; // best with conversion ++p; } return best; } //===========================================================================// struct vf_priv_s { unsigned int fmt; }; static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if (!vf->priv->fmt) vf->priv->fmt=find_best(vf); if(!vf->priv->fmt){ // no matching fmt, so force one... if(outfmt==IMGFMT_RGB8) vf->priv->fmt=IMGFMT_RGB32; else if(outfmt==IMGFMT_BGR8) vf->priv->fmt=IMGFMT_BGR32; else return 0; } return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } static int bittab[8]={128,64,32,16,8,4,2,1}; static void convert(mp_image_t *mpi, mp_image_t *dmpi, int value0, int value1,int bpp){ int y; for(y=0;y<mpi->h;y++){ unsigned char* src=mpi->planes[0]+mpi->stride[0]*y; switch(bpp){ case 1: { unsigned char* dst=dmpi->planes[0]+dmpi->stride[0]*y; int x; for(x=0;x<mpi->w;x++) dst[x]=(src[x>>3]&bittab[x&7]) ? value1 : value0; break; } case 2: { uint16_t* dst=(uint16_t*)(dmpi->planes[0]+dmpi->stride[0]*y); int x; for(x=0;x<mpi->w;x++) dst[x]=(src[x>>3]&bittab[x&7]) ? value1 : value0; break; } case 4: { uint32_t* dst=(uint32_t*)(dmpi->planes[0]+dmpi->stride[0]*y); int x; for(x=0;x<mpi->w;x++) dst[x]=(src[x>>3]&bittab[x&7]) ? value1 : value0; break; } } } } static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ mp_image_t *dmpi; // hope we'll get DR buffer: dmpi=vf_get_image(vf->next,vf->priv->fmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); switch(dmpi->imgfmt){ case IMGFMT_Y800: case IMGFMT_Y8: case IMGFMT_BGR8: case IMGFMT_RGB8: convert(mpi,dmpi,0,255,1); break; case IMGFMT_YVU9: case IMGFMT_411P: case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_422P: case IMGFMT_444P: convert(mpi,dmpi,0,255,1); memset(dmpi->planes[1],128,dmpi->stride[1]*dmpi->chroma_height); memset(dmpi->planes[2],128,dmpi->stride[2]*dmpi->chroma_height); break; case IMGFMT_YUY2: convert(mpi,dmpi,0x8000,0x80ff,2); break; case IMGFMT_BGR15: case IMGFMT_RGB15: convert(mpi,dmpi,0,0x7fff,2); break; case IMGFMT_BGR16: case IMGFMT_RGB16: convert(mpi,dmpi,0,0xffff,2); break; case IMGFMT_BGR32: case IMGFMT_RGB32: convert(mpi,dmpi,0,0x00ffffff,4); break; default: mp_msg(MSGT_VFILTER,MSGL_ERR,"Unhandled format: 0x%X\n",dmpi->imgfmt); return NULL; } return vf_next_put_image(vf,dmpi); } //===========================================================================// static int query_format(struct vf_instance_s* vf, unsigned int fmt){ int best; if(fmt!=IMGFMT_RGB1 && fmt!=IMGFMT_BGR1) return 0; best=find_best(vf); if(!best) return 0; // no match return vf->next->query_format(vf->next,best); } static int open(vf_instance_t *vf, char* args){ unsigned int i; vf->config=config; vf->put_image=put_image; vf->query_format=query_format; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); return 1; } vf_info_t vf_info_1bpp = { "1bpp bitmap -> YUV/BGR 8/15/16/32 conversion", "1bpp", "A'rpi", "", open }; //===========================================================================// Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- vf.c 10 Oct 2002 01:09:23 -0000 1.51 +++ vf.c 16 Oct 2002 18:40:03 -0000 1.52 @@ -42,6 +42,7 @@ extern vf_info_t vf_info_eq2; extern vf_info_t vf_info_halfpack; extern vf_info_t vf_info_dint; +extern vf_info_t vf_info_1bpp; char** vo_plugin_args=(char**) NULL; @@ -77,6 +78,7 @@ &vf_info_eq2, &vf_info_halfpack, &vf_info_dint, + &vf_info_1bpp, NULL }; Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- Makefile 13 Oct 2002 21:40:10 -0000 1.64 +++ Makefile 16 Oct 2002 18:40:03 -0000 1.65 @@ -6,7 +6,7 @@ AUDIO_SRCS=dec_audio.c ad.c ad_liba52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3lib.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_realvid.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_xvid.c vd_libdv.c vd_lcl.c vd_mtga.c -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 +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 ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.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

3 2

CVS: main/help help_mp-bg.h,1.6,1.7 help_mp-cz.h,1.25,1.26 help_mp-de.h,1.54,1.55 help_mp-dk.h,1.15,1.16 help_mp-en.h,1.63,1.64 help_mp-es.h,1.13,1.14 help_mp-fr.h,1.20,1.21 help_mp-gr.h,1.4,1.5 help_mp-hu.h,1.52,1.53 help_mp-it.h,1.11,1.12 help_mp-ko.h,1.8,1.9 help_mp-nl.h,1.19,1.20 help_mp-no.h,1.10,1.11 help_mp-pl.h,1.54,1.55 help_mp-pt_BR.h,1.5,1.6 help_mp-ro.h,1.7,1.8 help_mp-ru.h,1.14,1.15 help_mp-sk.h,1.7,1.8 help_mp-uk.h,1.4,1.5 help_mp-zh.h,1.8,1.9
by Diego Biurrun CVS 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv9961/help Modified Files: help_mp-bg.h help_mp-cz.h help_mp-de.h help_mp-dk.h help_mp-en.h help_mp-es.h help_mp-fr.h help_mp-gr.h help_mp-hu.h help_mp-it.h help_mp-ko.h help_mp-nl.h help_mp-no.h help_mp-pl.h help_mp-pt_BR.h help_mp-ro.h help_mp-ru.h help_mp-sk.h help_mp-uk.h help_mp-zh.h Log Message: Fixed two typos noticed by Sycotic Smith (I think). Index: help_mp-bg.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-bg.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- help_mp-bg.h 22 Sep 2002 14:28:29 -0000 1.6 +++ help_mp-bg.h 19 Oct 2002 20:26:04 -0000 1.7 @@ -81,7 +81,7 @@ #define MSGTR_ErrorDVDkey "Ãðåøêà ïðè îáðàáîòêà íà DVD KEY (êëþ÷úò íåâàëèäåí).\n" #define MSGTR_CmdlineDVDkey "DVD command line requested key is stored for descrambling.\n" #define MSGTR_DVDauthOk "DVD auth sequence seems to be OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: ÔÀÒÀËÍÎ: èçáðàíèÿò ïîòîê ëèïñâà!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: ÔÀÒÀËÍÎ: èçáðàíèÿò ïîòîê ëèïñâà!\n" #define MSGTR_CantOpenDumpfile "dump: Íå ìîãà äà ñúçäàì ôàéë çà èçâëè÷àíå!!\n" #define MSGTR_CoreDumped "dump: Äàííèòå èçâëå÷åíè :)\n" #define MSGTR_FPSnotspecified "FPS (Êàäðè Â Ñåêóíäà) å ñ íåèçâåñòíà èëè íåâàëèäíà ñòîéíîñò! Èçïîëçâàéòå îïöèÿ -fps !\n" @@ -130,7 +130,7 @@ #define MSGTR_AvailableAudioFm "\nÍàëè÷íè àóäèî äåêîäåðè - ôàìèëèè/äðàéâåðè:\n" #define MSGTR_AvailableVideoFm "\nÍàëè÷íè âèäåî äåêîäåðè - ôàìèëèè/äðàéâåðè:\n" #define MSGTR_UsingRTCTiming "Èçïîëâçâàì Linux's hardware RTC òàéìåð (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Âèäåî: íå ìîãà äà ïðî÷åòà ïàðàìåòðèòå íà âèäåî ïîòîêà\n" +#define MSGTR_CannotReadVideoProperties "Âèäåî: íå ìîãà äà ïðî÷åòà ïàðàìåòðèòå íà âèäåî ïîòîêà\n" #define MSGTR_NoStreamFound "Ïîòîêúò íå å íàìåðåí\n" #define MSGTR_InitializingAudioCodec "Ïóñêàì àóäèî äåêîäåð...\n" #define MSGTR_ErrorInitializingVODevice "Ãðåøêà ïðè îòâàðÿíå/ïóñêàíå íà âèäåî äðàéâåðà (-vo) !\n" Index: help_mp-cz.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-cz.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- help_mp-cz.h 29 Sep 2002 16:15:19 -0000 1.25 +++ help_mp-cz.h 19 Oct 2002 20:26:04 -0000 1.26 @@ -73,7 +73,7 @@ #define MSGTR_ErrorDVDkey "Chyba pøi zpracování klíèe DVD.\n" #define MSGTR_CmdlineDVDkey "DVD klíè poŸadovaný na pøíkazové øádce je uschován pro rozkódování.\n" #define MSGTR_DVDauthOk "DVD autentikaèní sekvence vypadá vpoøádku.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: Kritická chyba: poŸadovaný proud chybí!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: Kritická chyba: poŸadovaný proud chybí!\n" #define MSGTR_CantOpenDumpfile "Nelze otevøít soubor pro dump!!!\n" #define MSGTR_CoreDumped "jádro vypsáno :)\n" #define MSGTR_FPSnotspecified "V hlavièce souboru není udáno (nebo je ¹patné) FPS! PouŸijte volbu -fps !\n" @@ -120,7 +120,7 @@ #define MSGTR_AvailableAudioFm "\nDostupné (pøikompilované) rodiny audio kodekù/ovladaèe:\n" #define MSGTR_AvailableVideoFm "\nDostupné (pøikompilované) rodiny video kodekù/ovladaèe:\n" #define MSGTR_UsingRTCTiming "PouŸito èasování pomocí Linux hardware RTC (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: nelze pøeèíst vlastnosti\n" +#define MSGTR_CannotReadVideoProperties "Video: nelze pøeèíst vlastnosti\n" #define MSGTR_NoStreamFound "Nenalezen Ÿádný proud\n" #define MSGTR_InitializingAudioCodec "Inicializuji audio kodek...\n" #define MSGTR_ErrorInitializingVODevice "Chyba pøí otvírání/inicializaci vybraného video_out (-vo) zaøízení!\n" Index: help_mp-de.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-de.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- help_mp-de.h 19 Oct 2002 17:48:53 -0000 1.54 +++ help_mp-de.h 19 Oct 2002 20:26:04 -0000 1.55 @@ -72,7 +72,7 @@ #define MSGTR_ErrorDVDkey "Fehler beim Bearbeiten des DVD-Schlüssels..\n" #define MSGTR_CmdlineDVDkey "Der DVD-Schlüssel der Kommandozeile wurde für das Descrambeln gespeichert.\n" #define MSGTR_DVDauthOk "DVD Authentifizierungssequenz scheint OK zu sein.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: Ausgewählter Stream fehlt!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: Ausgewählter Stream fehlt!\n" #define MSGTR_CantOpenDumpfile "Kann dump-Datei nicht öffnen!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "FPS ist im Header nicht angegeben (oder ungültig)! Benutze -fps Option!\n" @@ -119,7 +119,7 @@ #define MSGTR_AvailableAudioFm "\nVerfügbare (in die Binary kompilierte) Audio Codec Familien:\n" #define MSGTR_AvailableVideoFm "\nVerfügbare (in die Binary kompilierte) Video Codec Familien:\n" #define MSGTR_UsingRTCTiming "Verwende Linux Hardware RTC-Timing (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: Kann Eigenschaften nicht lesen\n" +#define MSGTR_CannotReadVideoProperties "Video: Kann Eigenschaften nicht lesen\n" #define MSGTR_NoStreamFound "Kein Streams gefunden\n" #define MSGTR_InitializingAudioCodec "Initialisiere Audiocodec...\n" #define MSGTR_ErrorInitializingVODevice "Fehler beim Öffenen/Initialisieren des ausgewählten Videoausgabe (-vo) Treibers!\n" Index: help_mp-dk.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-dk.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- help_mp-dk.h 30 Sep 2002 08:04:20 -0000 1.15 +++ help_mp-dk.h 19 Oct 2002 20:26:04 -0000 1.16 @@ -71,7 +71,7 @@ #define MSGTR_ErrorDVDkey "Fejl under afvikling af DVDNØGLE.\n" #define MSGTR_CmdlineDVDkey "DVD kommandolinjenøgle er gemt til dekryptering.\n" #define MSGTR_DVDauthOk "DVD auth sekvens synes af være OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: kan ikke finde den valge fil eller adresse!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: kan ikke finde den valge fil eller adresse!\n" #define MSGTR_CantOpenDumpfile "Kan ikke åbne dump filen!!!\n" #define MSGTR_CoreDumped "kernen dumped :)\n" #define MSGTR_FPSnotspecified "FPS ikke specificeret (eller ugyldig) i headeren! Brug -fps !\n" @@ -115,7 +115,7 @@ #define MSGTR_AvailableAudioFm "\nTilgængelige (prækompilerede) lyd-codec familier/drivere:\n" #define MSGTR_AvailableVideoFm "\nTilgængelige (prækompilerede) video-codec familier/drivere:\n" #define MSGTR_UsingRTCTiming "Benytter Linux's hardware RTC timing (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: kan ikke læse egenskaber\n" +#define MSGTR_CannotReadVideoProperties "Video: kan ikke læse egenskaber\n" #define MSGTR_NoStreamFound "Ingen stream fundet\n" #define MSGTR_InitializingAudioCodec "Initialiserer lydcodec...\n" #define MSGTR_ErrorInitializingVODevice "Fejl under initialisering/åbning af den valgte video (-vo) enhed!\n" Index: help_mp-en.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-en.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- help_mp-en.h 6 Oct 2002 18:43:01 -0000 1.63 +++ help_mp-en.h 19 Oct 2002 20:26:04 -0000 1.64 @@ -75,7 +75,7 @@ #define MSGTR_ErrorDVDkey "Error processing DVD KEY.\n" #define MSGTR_CmdlineDVDkey "The requested DVD key is used for descrambling.\n" #define MSGTR_DVDauthOk "DVD auth sequence seems to be OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: selected stream missing!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: selected stream missing!\n" #define MSGTR_CantOpenDumpfile "Can't open dump file!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "FPS not specified (or invalid) in the header! Use the -fps option!\n" @@ -122,7 +122,7 @@ #define MSGTR_AvailableAudioFm "\nAvailable (compiled-in) audio codec families/drivers:\n" #define MSGTR_AvailableVideoFm "\nAvailable (compiled-in) video codec families/drivers:\n" #define MSGTR_UsingRTCTiming "Using Linux hardware RTC timing (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: can't read properties\n" +#define MSGTR_CannotReadVideoProperties "Video: can't read properties\n" #define MSGTR_NoStreamFound "No stream found\n" #define MSGTR_InitializingAudioCodec "Initializing audio codec...\n" #define MSGTR_ErrorInitializingVODevice "Error opening/initializing the selected video_out (-vo) device!\n" Index: help_mp-es.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-es.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- help_mp-es.h 29 Sep 2002 16:15:19 -0000 1.13 +++ help_mp-es.h 19 Oct 2002 20:26:04 -0000 1.14 @@ -75,7 +75,7 @@ #define MSGTR_ErrorDVDkey "Error procesando la clave del DVD.\n" #define MSGTR_CmdlineDVDkey "Se usará la clave DVD solicitada para la descodificación.\n" #define MSGTR_DVDauthOk "La secuencia de autorización del DVD parece estar bien.\n" -#define MSGTR_DumpSelectedSteramMissing "Dump: no se encuentra el stream seleccionado.\n" +#define MSGTR_DumpSelectedStreamMissing "Dump: no se encuentra el stream seleccionado.\n" #define MSGTR_CantOpenDumpfile "No se puede abrir el archivo de dump.\n" #define MSGTR_CoreDumped "Core dumped.\n" #define MSGTR_FPSnotspecified "FPS no especificado o inválido en la cabecera. Usa la opción -fps.\n" @@ -123,7 +123,7 @@ #define MSGTR_AvailableAudioFm "\nFamilias/drivers de codecs de audio (compilados dentro de MPlayer) disponibles:\n" #define MSGTR_AvailableVideoFm "\nFamilias/drivers de codecs de vídeo (compilados dentro de MPlayer) disponibles:\n" #define MSGTR_UsingRTCTiming "Usando el RTC timing por hardware de Linux (%ldHz).\n" -#define MSGTR_CannotReadVideoPropertiers "Vídeo: no se puede leer las propiedades.\n" +#define MSGTR_CannotReadVideoProperties "Vídeo: no se puede leer las propiedades.\n" #define MSGTR_NoStreamFound "No se ha encontrado stream.\n" #define MSGTR_InitializingAudioCodec "Inicializando codec de audio...\n" #define MSGTR_ErrorInitializingVODevice "Error abriendo/inicializando el dispositivo de la salida de vídeo (-vo).\n" Index: help_mp-fr.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-fr.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- help_mp-fr.h 12 Oct 2002 00:13:22 -0000 1.20 +++ help_mp-fr.h 19 Oct 2002 20:26:04 -0000 1.21 @@ -75,7 +75,7 @@ #define MSGTR_ErrorDVDkey "Erreur avec la clé du DVD.\n" #define MSGTR_CmdlineDVDkey "La clé DVD demandée sera utilisée pour le décryptage.\n" #define MSGTR_DVDauthOk "La séquence d'authentification DVD semble OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: le flux sélectionné est manquant\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: le flux sélectionné est manquant\n" #define MSGTR_CantOpenDumpfile "Ne peut ouvrir un fichier dump!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "FPS non spécifié (ou invalide) dans l'entête! Utiliser l'option -fps!\n" @@ -120,7 +120,7 @@ #define MSGTR_AvailableAudioFm "\n(Familles de) Codecs audio disponibles (inclus à la compilation):\n" #define MSGTR_AvailableVideoFm "\n(Familles de) Codecs vidéo disponibles (inclus à la compilation):\n" #define MSGTR_UsingRTCTiming "Utilisation de la synchronisation matérielle par RTC (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Vidéo: ne pas pas lire les propriétés\n" +#define MSGTR_CannotReadVideoProperties "Vidéo: ne pas pas lire les propriétés\n" #define MSGTR_NoStreamFound "Pas de flux trouvé\n" #define MSGTR_InitializingAudioCodec "Initialisation des codecs audio...\n" #define MSGTR_ErrorInitializingVODevice "Erreur à l'ouverture/l'initialisation de la sortie vidéo choisie (-vo)!\n" Index: help_mp-gr.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-gr.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- help_mp-gr.h 22 Sep 2002 14:28:29 -0000 1.4 +++ help_mp-gr.h 19 Oct 2002 20:26:04 -0000 1.5 @@ -79,7 +79,7 @@ #define MSGTR_ErrorDVDkey "ÓöÜëìá êáôÜ ôçí åðåîåñãáóßá ôïõ DVD KEY.\n" #define MSGTR_CmdlineDVDkey "Ôï æçôïýìåíï êëåéäß ãéá ôï DVD áðïèõêåýôçêå ãéá descrambling.\n" #define MSGTR_DVDauthOk "Ç áêïëïõèßá ðéóôïðïßçóçò ôïõ DVD öáßíåôáé åíôÜîåé.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: ÊÑÉÓÉÌÏ: ëïßðåé ôï åðéëåãìÝíï êáíÜëé!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: ÊÑÉÓÉÌÏ: ëïßðåé ôï åðéëåãìÝíï êáíÜëé!\n" #define MSGTR_CantOpenDumpfile "Áäýíáôï ôï Üíïéãìá ôïõ dump áñ÷åßïõ!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "Ìç ïñéóìÝíá FPS (Þ ëÜèïò) óôï header! ×ñçóéìïðïéÞóôå ôçí åðéëïãÞ -fps!\n" @@ -124,7 +124,7 @@ #define MSGTR_AvailableAudioFm "\nÄéáèÝóéìïé (compiled-in) ïäçãïß/ïéêïãÝíåéåò codec Þ÷ïõ:\n" #define MSGTR_AvailableVideoFm "\nÄéáèÝóéìïé (compiled-in) ïäçãïß/ïéêïãÝíåéåò codec âßíôåï:\n" #define MSGTR_UsingRTCTiming "×ñÞóç ôïõ hardware RTC ôïõ linux óôá (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Âßíôåï: áäýíáôç ç áíÜãíùóç éäéïôÞôùí\n" +#define MSGTR_CannotReadVideoProperties "Âßíôåï: áäýíáôç ç áíÜãíùóç éäéïôÞôùí\n" #define MSGTR_NoStreamFound "Äåí âñÝèçêå êáíÜëé\n" #define MSGTR_InitializingAudioCodec "Áñ÷éêïðïßçóç ôïõ codec Þ÷ïõ...\n" #define MSGTR_ErrorInitializingVODevice "ÓöÜëìá êáôÜ ôï Üíïéãìá/áñ÷éêïðïßçóç ôçò åðéëåãìÝíçò video_out (-vo) óõóêåõÞ!\n" Index: help_mp-hu.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-hu.h,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- help_mp-hu.h 29 Sep 2002 21:19:16 -0000 1.52 +++ help_mp-hu.h 19 Oct 2002 20:26:04 -0000 1.53 @@ -73,7 +73,7 @@ #define MSGTR_ErrorDVDkey "Hiba a DVD-KULCS feldolgozása közben.\n" #define MSGTR_CmdlineDVDkey "A parancssorban megadott DVD-kulcs további dekódolás céljából eltárolásra került.\n" #define MSGTR_DVDauthOk "DVD-autentikációs folyamat, úgy tünik, sikerrel végzõdött.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: VÉGZETES HIBA: a kért stream nem található!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: VÉGZETES HIBA: a kért stream nem található!\n" #define MSGTR_CantOpenDumpfile "Nem tudom megnyitni a dump file-t!\n" #define MSGTR_CoreDumped "Kinyomattam a cuccost, jól.\n" #define MSGTR_FPSnotspecified "Az FPS (képkocka/mp) érték nincs megadva, vagy hibás! Használd az -fps opciót!\n" @@ -120,7 +120,7 @@ #define MSGTR_AvailableAudioFm "\nRendelkezésre álló (befordított) audio codec családok/meghajtók:\n" #define MSGTR_AvailableVideoFm "\nRendelkezésre álló (befordított) video codec családok/meghajtók:\n" #define MSGTR_UsingRTCTiming "Linux hardveres RTC idõzítés használata (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: tulajdonságok beolvasása nem lehetséges\n" +#define MSGTR_CannotReadVideoProperties "Video: tulajdonságok beolvasása nem lehetséges\n" #define MSGTR_NoStreamFound "Nem található stream\n" #define MSGTR_InitializingAudioCodec "Audio codec inicializálása...\n" #define MSGTR_ErrorInitializingVODevice "Hiba a kiválasztott video_out (-vo) egység inicializásakor!\n" Index: help_mp-it.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-it.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- help_mp-it.h 6 Oct 2002 19:54:37 -0000 1.11 +++ help_mp-it.h 19 Oct 2002 20:26:04 -0000 1.12 @@ -78,7 +78,7 @@ #define MSGTR_ErrorDVDkey "Errore di elaborazione della chiave del DVD.\n" #define MSGTR_CmdlineDVDkey "La chiave del DVD richiesta nella riga di comando è immagazzinata per il descrambling.\n" #define MSGTR_DVDauthOk "La sequenza di autorizzazione del DVD sembra essere corretta.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: manca il flusso selezionato!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: manca il flusso selezionato!\n" #define MSGTR_CantOpenDumpfile "Impossibile aprire il file di dump!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "FPS non specificato (o non valido) nell\'intestazione! Usa l\'opzione -fps !\n" @@ -125,7 +125,7 @@ #define MSGTR_AvailableAudioFm "\nFamiglie/driver di codec audio disponibili (compilati):\n" #define MSGTR_AvailableVideoFm "\nFamiglie/driver di codec video disponibili (compilati):\n" #define MSGTR_UsingRTCTiming "Sto utilizzando la temporizzazione hardware RTC di Linux (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: impossibile leggere le proprietà\n" +#define MSGTR_CannotReadVideoProperties "Video: impossibile leggere le proprietà\n" #define MSGTR_NoStreamFound "Nessun flusso trovato\n" #define MSGTR_InitializingAudioCodec "Inizializzazione codec audio...\n" #define MSGTR_ErrorInitializingVODevice "Errore aprendo/inizializzando il dispositivo di output video (-vo) selezionato!\n" Index: help_mp-ko.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-ko.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- help_mp-ko.h 22 Sep 2002 14:28:29 -0000 1.8 +++ help_mp-ko.h 19 Oct 2002 20:26:04 -0000 1.9 @@ -77,7 +77,7 @@ #define MSGTR_ErrorDVDkey "DVD Å°žŠ Ã³ž®ÇÏŽÂ µµÁß ¿À·ù°¡ ¹ß»ýÇßœÀŽÏŽÙ.\n" #define MSGTR_CmdlineDVDkey "¿äÃ»ÇÑ DVD ží·ÉÁÙ Å°žŠ ÇØµ¶À» À§ÇØ ÀúÀåÇßœÀŽÏŽÙ.\n" #define MSGTR_DVDauthOk "DVD ÀÎÁõ °á°ú°¡ Á€»óÀûÀÎµí ÇÕŽÏŽÙ.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: Ä¡žíÀû: Œ±ÅÃµÈ œºÆ®ž²ÀÌ ŸøœÀŽÏŽÙ!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: Ä¡žíÀû: Œ±ÅÃµÈ œºÆ®ž²ÀÌ ŸøœÀŽÏŽÙ!\n" #define MSGTR_CantOpenDumpfile "dumpÆÄÀÏÀ» ¿ Œö ŸøœÀŽÏŽÙ!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "ÇìŽõ¿¡ FPS°¡ ÁöÁ€µÇÁöŸÊŸÒ°Å³ª ÀßžøµÇŸúœÀŽÏŽÙ! -fps ¿ÉŒÇÀ» »ç¿ëÇÏŒŒ¿ä!\n" Index: help_mp-nl.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-nl.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- help_mp-nl.h 29 Sep 2002 16:15:19 -0000 1.19 +++ help_mp-nl.h 19 Oct 2002 20:26:04 -0000 1.20 @@ -70,7 +70,7 @@ #define MSGTR_ErrorDVDkey "Fout bij het verwerken van DVD KEY.\n" #define MSGTR_CmdlineDVDkey "DVD command line aangevraagde sleutel is opgeslaan voor descrambling.\n" #define MSGTR_DVDauthOk "DVD auth sequence lijkt OK te zijn.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: geselecteerde stream ontbreekt!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: geselecteerde stream ontbreekt!\n" #define MSGTR_CantOpenDumpfile "Kan dump bestand niet openen!!!\n" #define MSGTR_CoreDumped "Debuginformatie weggeschreven naar bestand core\n" #define MSGTR_FPSnotspecified "FPS niet gespecificeerd (of foutief) in de header! Gebruik de optie -fps!\n" @@ -115,7 +115,7 @@ #define MSGTR_AvailableAudioFm "\nBeschikbare (ingecompileerde) audio codec families/drivers:\n" #define MSGTR_AvailableVideoFm "\nBeschikbare (ingecompileerde) video codec families/drivers:\n" #define MSGTR_UsingRTCTiming "Er wordt gebruik gemaakt van Linux's hardware RTC timing (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: kan eigenschappen niet lezen\n" +#define MSGTR_CannotReadVideoProperties "Video: kan eigenschappen niet lezen\n" #define MSGTR_NoStreamFound "Geen stream gevonden\n" #define MSGTR_InitializingAudioCodec "Bezig met het initializeren van de audio codec...\n" #define MSGTR_ErrorInitializingVODevice "Fout bij het openen/initialiseren van het gekozen video_out (-vo) apparaat!\n" Index: help_mp-no.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-no.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- help_mp-no.h 22 Sep 2002 14:28:29 -0000 1.10 +++ help_mp-no.h 19 Oct 2002 20:26:04 -0000 1.11 @@ -73,7 +73,7 @@ #define MSGTR_ErrorDVDkey "Feil under bearbeiding av DVD KEY.\n" #define MSGTR_CmdlineDVDkey "Etter spurte DVD kommandolinje nøkkel er lagret for descrambling.\n" #define MSGTR_DVDauthOk "DVD auth sekvense ser ut til å være OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATALT: valgte stream mangler!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATALT: valgte stream mangler!\n" #define MSGTR_CantOpenDumpfile "Kan ikke åpne dump fil!!!\n" #define MSGTR_CoreDumped "core dumpet :)\n" #define MSGTR_FPSnotspecified "FPS ikke spesifisert (eller ugyldig) i headeren! Bruk -fps valget!\n" Index: help_mp-pl.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-pl.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- help_mp-pl.h 10 Oct 2002 09:14:53 -0000 1.54 +++ help_mp-pl.h 19 Oct 2002 20:26:04 -0000 1.55 @@ -72,7 +72,7 @@ #define MSGTR_ErrorDVDkey "B³±d w przetwarzaniu DVD KEY.\n" #define MSGTR_CmdlineDVDkey "¯±dany klucz DVD u¿ywany jest do dekodowania.\n" #define MSGTR_DVDauthOk "Sekwencja autoryzacji DVD wygl±da OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: nie ma wybranego strumienia!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: nie ma wybranego strumienia!\n" #define MSGTR_CantOpenDumpfile "Nie mogê otworzyæ pliku dump!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "FPS nie podane (lub b³êdne) w nag³ówku! U¿yj opcji -fps!\n" @@ -122,7 +122,7 @@ #define MSGTR_AvailableAudioFm "\nDostêpne (wkompilowane) rodziny kodeków audio/sterowniki:\n" #define MSGTR_AvailableVideoFm "\nDostêpne (wkompilowane) rodziny kodeków video/sterowniki:\n" #define MSGTR_UsingRTCTiming "U¿ywam Linux's hardware RTC timing (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: nie mogê odczytaæ w³a¶ciwo¶ci\n" +#define MSGTR_CannotReadVideoProperties "Video: nie mogê odczytaæ w³a¶ciwo¶ci\n" #define MSGTR_NoStreamFound "Nie znaleziono strumienia\n" #define MSGTR_InitializingAudioCodec "Inicjalizuje kodek audio...\n" #define MSGTR_ErrorInitializingVODevice "B³±d otwierania/inicjalizacji wybranego video_out (-vo) urzadzenia!\n" Index: help_mp-pt_BR.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-pt_BR.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- help_mp-pt_BR.h 22 Sep 2002 14:28:29 -0000 1.5 +++ help_mp-pt_BR.h 19 Oct 2002 20:26:04 -0000 1.6 @@ -75,7 +75,7 @@ #define MSGTR_ErrorDVDkey "Erro processado a cahve do DVD.\n" #define MSGTR_CmdlineDVDkey "Linha de comando requisitada do DVD está armazenada para \"descrambling\".\n" #define MSGTR_DVDauthOk "Sequência de autenticação do DVD parece estar OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: fluxo (stream) selecionado faltando!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: fluxo (stream) selecionado faltando!\n" #define MSGTR_CantOpenDumpfile "Nào pode-se abrir o arquivo dump!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "Quadros por segundo (FPS) não especificado (ou inválido) no cabeçalho! User a opção -fps!\n" Index: help_mp-ro.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-ro.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- help_mp-ro.h 22 Sep 2002 14:28:29 -0000 1.7 +++ help_mp-ro.h 19 Oct 2002 20:26:04 -0000 1.8 @@ -69,7 +69,7 @@ #define MSGTR_ErrorDVDkey "Eroare la procesarea cheii DVD.\n" #define MSGTR_CmdlineDVDkey "Cheia DVD specificatã în linia de comandã este pãstratã pentru decodificare.\n" #define MSGTR_DVDauthOk "Secvenþa de autentificare DVD pare sã fie OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATALA: pista selectatã lipseºte!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATALA: pista selectatã lipseºte!\n" #define MSGTR_CantOpenDumpfile "Nu pot deschide fiºierul (dump)!!!\n" #define MSGTR_CoreDumped "core aruncat :)\n" #define MSGTR_FPSnotspecified "FPS nespecificat (sau invalid) în antet! Folosiþi opþiunea -fps!\n" Index: help_mp-ru.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-ru.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- help_mp-ru.h 22 Sep 2002 14:28:29 -0000 1.14 +++ help_mp-ru.h 19 Oct 2002 20:26:04 -0000 1.15 @@ -73,7 +73,7 @@ #define MSGTR_ErrorDVDkey "ïÛÉÂËÁ ÏÂÒÁÂÏÔËÉ DVD ëìàþá.\n" #define MSGTR_CmdlineDVDkey "ëÏÍÍÁÎÄÎÁÑ ÓÔÒÏËÁ DVD ÔÒÅÂÕÅÔ ÚÁÐÉÓÁÎÎÙÊ ËÌÀÞ ÄÌÑ ÄÅÛÉÆÒÏ×ÁÎÉÑ.\n" #define MSGTR_DVDauthOk "á×ÔÏÒÉÚÁÃÉÑ DVD ×ÙÇÌÑÄÉÔ OK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: ×ÙÂÒÁÎÎÙÊ ÐÏÔÏË ÐÏÔÅÒÑÎ!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: ×ÙÂÒÁÎÎÙÊ ÐÏÔÏË ÐÏÔÅÒÑÎ!\n" #define MSGTR_CantOpenDumpfile "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ ÄÁÍÐÁ!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "ëÁÄÒ/ÓÅË ÎÅ ÕËÁÚÁÎÙ (ÉÌÉ ÎÅÄÏÐÕÓÔÉÍÙÅ) × ÚÁÇÏÌÏ×ËÅ! éÓÐÏÌØÚÕÊÔÅ -fps ÏÐÃÉÀ!\n" Index: help_mp-sk.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-sk.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- help_mp-sk.h 22 Sep 2002 14:28:29 -0000 1.7 +++ help_mp-sk.h 19 Oct 2002 20:26:04 -0000 1.8 @@ -71,7 +71,7 @@ #define MSGTR_ErrorDVDkey "Chyba pri spracovaní kµúèa DVD.\n" #define MSGTR_CmdlineDVDkey "DVD kµúè poŸadovaný na príkazovom riadku je uschovaný pre rozkódovanie.\n" #define MSGTR_DVDauthOk "DVD sekvencia overenia autenticity vypadá v poriadku.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: poŸadovaný prúd chýba!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: poŸadovaný prúd chýba!\n" #define MSGTR_CantOpenDumpfile "Nejde otvori» súbor pre dump!!!\n" #define MSGTR_CoreDumped "jadro vypísané :)\n" #define MSGTR_FPSnotspecified "V hlavièke súboru nie je udané (alebo je zlé) FPS! PouŸite voµbu -fps !\n" @@ -116,7 +116,7 @@ #define MSGTR_AvailableAudioFm "\nDostupné (vkompilované) audio rodiny kodekov/ovládaèe:\n" #define MSGTR_AvailableVideoFm "\nDostupné (vkompilované) video rodiny kodekov/ovládaèe:\n" #define MSGTR_UsingRTCTiming "PouŸívam Linuxové hardvérové RTC èasovanie (%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "Video: nemôŸem èíta» vlastnosti\n" +#define MSGTR_CannotReadVideoProperties "Video: nemôŸem èíta» vlastnosti\n" #define MSGTR_NoStreamFound "Nenájdený prúd\n" #define MSGTR_InitializingAudioCodec "Initializujem audio kodek...\n" #define MSGTR_ErrorInitializingVODevice "Chyba pri otváraní/inicializácii vybraných video_out (-vo) zariadení!\n" Index: help_mp-uk.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-uk.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- help_mp-uk.h 22 Sep 2002 14:28:29 -0000 1.4 +++ help_mp-uk.h 19 Oct 2002 20:26:04 -0000 1.5 @@ -73,7 +73,7 @@ #define MSGTR_ErrorDVDkey "ðÏÍÉÌËÁ ÏÂÒÏÂËÉ DVD ëìàþá.\n" #define MSGTR_CmdlineDVDkey "ëÏÍÁÎÄÎÉÊ ÒÑÄÏË DVD ×ÉÍÁÇÁ€ ÚÁÐÉÓÁÎÉÊ ËÌÀÞ ÄÌÑ ÄÅÛÉÆÒÕ×ÁÎÎÑ.\n" #define MSGTR_DVDauthOk "á×ÔÏÒÉÚÁÃŠÑ DVD - ×ÓÅ ÇÁÒÁÚÄ.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: ÏÂÒÁÎÉÊ ÐÏÔŠË ÚÁÇÕÂÌÅÎÉÊ!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: FATAL: ÏÂÒÁÎÉÊ ÐÏÔŠË ÚÁÇÕÂÌÅÎÉÊ!\n" #define MSGTR_CantOpenDumpfile "îÅ ÍÏÖÕ ×ŠÄËÒÉÔÉ ÆÁÊÌ ÄÁÍÐÕ!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "ëŠÌØËŠÓÔØ ËÁÄÒŠ× ÎÁ ÓÅËÕÎÄÕ ÎÅ ×ËÁÚÁÎÏ (ÁÂÏ ÎÅÐÒÉÐÕÓÔÉÍÅ ÚÎÁÞÅÎÎÑ) Õ ÚÁÇÏÌÏ×ËÕ! ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ËÌÀÞ -fps!\n" Index: help_mp-zh.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-zh.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- help_mp-zh.h 19 Oct 2002 03:53:06 -0000 1.8 +++ help_mp-zh.h 19 Oct 2002 20:26:04 -0000 1.9 @@ -70,7 +70,7 @@ #define MSGTR_ErrorDVDkey "DVD KEYŽŠÀí³öŽí.\n" #define MSGTR_CmdlineDVDkey "DVDÃüÁîÐÐÒªÇóµÄkey±»Ž¢ŽæÒÔÓÃÀŽœâÈÅ.\n" #define MSGTR_DVDauthOk "DVDÊÚÈšÐòÁÐËÆºõOK.\n" -#define MSGTR_DumpSelectedSteramMissing "dump: ÖÂÃüŽíÎó: Öž¶šµÄÁ÷²»ŽæÔÚ!\n" +#define MSGTR_DumpSelectedStreamMissing "dump: ÖÂÃüŽíÎó: Öž¶šµÄÁ÷²»ŽæÔÚ!\n" #define MSGTR_CantOpenDumpfile "ÎÞ·šŽò¿ªdumpÎÄŒþ!!!\n" #define MSGTR_CoreDumped "core dumped :)\n" #define MSGTR_FPSnotspecified "FPSÔÚÎÄŒþÍ·ÖÐÃ»ÓÐÖž¶š(»òÕßÊÇÎÞÐ§ÊýŸÝ)! ÓÃ-fpsÑ¡Ïî!\n" @@ -115,7 +115,7 @@ #define MSGTR_AvailableAudioFm "\n¿ÉÓÃµÄ(±àÒëÁËµÄ)ÒôÆµœâÂëÆ÷×å/Çý¶¯:\n" #define MSGTR_AvailableVideoFm "\n¿ÉÓÃµÄ(±àÒëÁËµÄ)ÊÓÆµœâÂëÆ÷×å/Çý¶¯:\n" #define MSGTR_UsingRTCTiming "Ê¹ÓÃLinuxµÄÓ²ŒþRTCŒÆÊ±(%ldHz)\n" -#define MSGTR_CannotReadVideoPropertiers "ÊÓÆµ: ÎÞ·š¶ÁÈ¡ÊôÐÔ\n" +#define MSGTR_CannotReadVideoProperties "ÊÓÆµ: ÎÞ·š¶ÁÈ¡ÊôÐÔ\n" #define MSGTR_NoStreamFound "ÕÒ²»µœÁ÷ÃœÌå\n" #define MSGTR_InitializingAudioCodec "³õÊŒ»¯ÒôÆµœâÂëÆ÷...\n" #define MSGTR_ErrorInitializingVODevice "Žò¿ª/³õÊŒ»¯ËùÑ¡µÄÊÓÆµÊä³ö(-vo)Éè±žÊÇ³öŽí!\n"

1 0

CVS: main mplayer.c,1.597,1.598 mencoder.c,1.176,1.177
by Diego Biurrun CVS 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv9961 Modified Files: mplayer.c mencoder.c Log Message: Fixed two typos noticed by Sycotic Smith (I think). Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.597 retrieving revision 1.598 diff -u -r1.597 -r1.598 --- mplayer.c 19 Oct 2002 01:58:34 -0000 1.597 +++ mplayer.c 19 Oct 2002 20:26:02 -0000 1.598 @@ -1010,7 +1010,7 @@ case 3: ds=d_dvdsub;break; } if(!ds){ - mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedSteramMissing); + mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedStreamMissing); exit_player(MSGTR_Exit_error); } // disable other streams: @@ -1042,7 +1042,7 @@ current_module="video_read_properties"; if(!video_read_properties(sh_video)) { - mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoPropertiers); + mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties); sh_video=d_video->sh=NULL; } else { mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- mencoder.c 10 Oct 2002 21:04:42 -0000 1.176 +++ mencoder.c 19 Oct 2002 20:26:02 -0000 1.177 @@ -467,7 +467,7 @@ sh_video=d_video->sh; if(!video_read_properties(sh_video)){ - printf(MSGTR_CannotReadVideoPropertiers); + printf(MSGTR_CannotReadVideoProperties); mencoder_exit(1,NULL); }

1 0

CVS: main/libmpcodecs TODO,1.5,1.6
by Alex Beregszaszi 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv787 Modified Files: TODO Log Message: task done Index: TODO =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/TODO,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- TODO 13 Apr 2002 18:23:23 -0000 1.5 +++ TODO 19 Oct 2002 20:05:57 -0000 1.6 @@ -1,7 +1,5 @@ TODO: - vo_config callbacks to cinepak -- better mpi support to xanim (now it's EXPORT but could be better) - IP buffering for NUV - finish MPNG (8bpp support) - review authors -

1 0

CVS: main/libmpdemux tvi_v4l.c,1.32,1.33
by Alex Beregszaszi 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv31592 Modified Files: tvi_v4l.c Log Message: Stop grabbing from v4l when paused by Jindrich Makovicka Index: tvi_v4l.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- tvi_v4l.c 2 Oct 2002 16:47:41 -0000 1.32 +++ tvi_v4l.c 19 Oct 2002 20:03:40 -0000 1.33 @@ -1169,10 +1169,7 @@ int fsize = priv->bytesperline * priv->height; int i; int first = 1; - - int dropped = 0; - double dropped_time = 0.0; - double drop_delta = 0.0; + int framecount; /* start the capture process */ if (ioctl(priv->video_fd, VIDIOCMCAPTURE, &priv->buf[0]) == -1) @@ -1186,9 +1183,16 @@ prev_interval = 0.0; prev_skew = 0.0; - for (;!priv->shutdown;) + for (framecount = 0; !priv->shutdown;) { - for (i = 0; i < priv->nbuf && !priv->shutdown; i++) { + for (i = 0; i < priv->nbuf && !priv->shutdown; i++, framecount++) { + + if (priv->immediate_mode) { + while ((priv->video_tail+1) % priv->video_buffer_size == priv->video_head) { + usleep(10000); + } + } + frame = i; nextframe = (i+1)%priv->nbuf; @@ -1215,7 +1219,11 @@ interval = 0.0; first = 0; } else { - interval = curtime.tv_sec + curtime.tv_usec*.000001 - priv->starttime; + if (!priv->immediate_mode) { + interval = curtime.tv_sec + curtime.tv_usec*.000001 - priv->starttime; + } else { + interval = (double)framecount/priv->fps; + } if (!priv->immediate_mode && ( (interval - prev_interval < 1.0/priv->fps*0.85) @@ -1246,29 +1254,16 @@ prev_interval = interval; if ((priv->video_tail+1) % priv->video_buffer_size == priv->video_head) { - if (!priv->immediate_mode) { mp_msg(MSGT_TV, MSGL_ERR, "\nvideo buffer full - dropping frame\n"); - } else { - if (!dropped) { - dropped = 1; - dropped_time = interval - skew; - } } } else { if (priv->immediate_mode) { - if (dropped) { - drop_delta += interval - skew - dropped_time; - dropped = 0; - } + priv->video_timebuffer[priv->video_tail] = interval; + } else { // compensate for audio skew // negative skew => there are more audio samples, increase interval // positive skew => less samples, shorten the interval - - // for TV, we pretend that dropped frames never existed - // without this, mplayer gets confused after pressing pause - priv->video_timebuffer[priv->video_tail] = interval - skew - drop_delta; - } else { priv->video_timebuffer[priv->video_tail] = interval - skew; }

1 0

CVS: main/Gui/wm ws.c,1.56,1.57 ws.h,1.20,1.21
by J�rgen Keil 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/Gui/wm In directory mail:/var/tmp.root/cvs-serv22700 Modified Files: ws.c ws.h Log Message: Choose a good visual from the list of supported visuals on the X11 server, instead of using the attributes from the root window. A framebuffer in a Sun often runs using a default visual of 8-bit pseudocolor, yet a better 24 or 32 bit truecolor visual is available. Index: ws.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ws.c 19 Oct 2002 19:47:16 -0000 1.56 +++ ws.c 19 Oct 2002 19:54:59 -0000 1.57 @@ -262,7 +262,6 @@ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Display name: %s => %s display.\n",dispname,localdisp?"local":"REMOTE"); if (!localdisp) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] Remote display, disabling XMITSHM\n"); } - if ( !XShmQueryExtension( wsDisplay ) ) { mp_msg( MSGT_GPLAYER,MSGL_ERR,"[ws] sorry, your system is not supported X shared memory extension.\n" ); @@ -367,6 +366,8 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,unsigned char D,char * label ) { + int depth; + win->Property=D; if ( D & wsShowFrame ) win->Decorations=1; wsHGC=DefaultGC( wsDisplay,wsScreen ); @@ -399,13 +400,13 @@ win->wsCursorPixmap=XCreateBitmapFromData( wsDisplay,wsRootWin,win->wsCursorData,1,1 ); if ( !(cV & wsShowMouseCursor) ) win->wsCursor=XCreatePixmapCursor( wsDisplay,win->wsCursorPixmap,win->wsCursorPixmap,&win->wsColor,&win->wsColor,0,0 ); - XGetWindowAttributes( wsDisplay,wsRootWin,&win->Attribs ); - if ( win->Attribs.depth < 15 ) + depth = vo_find_depth_from_visuals( wsDisplay,wsScreen,NULL ); + if ( depth < 15 ) { mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] sorry, this color depth is not enough.\n" ); exit( 0 ); } - XMatchVisualInfo( wsDisplay,wsScreen,win->Attribs.depth,TrueColor,&win->VisualInfo ); + XMatchVisualInfo( wsDisplay,wsScreen,depth,TrueColor,&win->VisualInfo ); // --- win->AtomLeaderClient=XInternAtom( wsDisplay,"WM_CLIENT_LEADER",False ); @@ -1139,24 +1140,40 @@ int wsGetDepthOnScreen( void ) { - int bpp,ibpp; - XImage * mXImage; - XWindowAttributes attribs; - - mXImage=XGetImage( wsDisplay,wsRootWin,0,0,1,1,AllPlanes,ZPixmap ); - bpp=mXImage->bits_per_pixel; - - XGetWindowAttributes( wsDisplay,wsRootWin,&attribs ); - ibpp=attribs.depth; - mXImage=XGetImage( wsDisplay,wsRootWin,0,0,1,1,AllPlanes,ZPixmap ); - bpp=mXImage->bits_per_pixel; - if ( ( ibpp + 7 ) / 8 != ( bpp + 7 ) / 8 ) ibpp=bpp; - wsDepthOnScreen=ibpp; - wsRedMask=mXImage->red_mask; - wsGreenMask=mXImage->green_mask; - wsBlueMask=mXImage->blue_mask; - XDestroyImage( mXImage ); - return ibpp; + int depth; + XImage * mXImage; + Visual * visual; + + if( (depth = vo_find_depth_from_visuals( wsDisplay,wsScreen,&visual )) > 0 ) + { + mXImage = XCreateImage( wsDisplay,visual,depth,ZPixmap,0,NULL, + 1,1,32,0 ); + wsDepthOnScreen = mXImage->bits_per_pixel; + wsRedMask=mXImage->red_mask; + wsGreenMask=mXImage->green_mask; + wsBlueMask=mXImage->blue_mask; + XDestroyImage( mXImage ); + } + else + { + int bpp,ibpp; + XWindowAttributes attribs; + + mXImage=XGetImage( wsDisplay,wsRootWin,0,0,1,1,AllPlanes,ZPixmap ); + bpp=mXImage->bits_per_pixel; + + XGetWindowAttributes( wsDisplay,wsRootWin,&attribs ); + ibpp=attribs.depth; + mXImage=XGetImage( wsDisplay,wsRootWin,0,0,1,1,AllPlanes,ZPixmap ); + bpp=mXImage->bits_per_pixel; + if ( ( ibpp + 7 ) / 8 != ( bpp + 7 ) / 8 ) ibpp=bpp; + wsDepthOnScreen=ibpp; + wsRedMask=mXImage->red_mask; + wsGreenMask=mXImage->green_mask; + wsBlueMask=mXImage->blue_mask; + XDestroyImage( mXImage ); + } + return wsDepthOnScreen; } void wsXDone( void ) @@ -1195,7 +1212,7 @@ { CompletionType=XShmGetEventBase( wsDisplay ) + ShmCompletion; win->xImage=XShmCreateImage( wsDisplay,win->VisualInfo.visual, - win->Attribs.depth,ZPixmap,NULL,&win->Shminfo,Width,Height ); + win->VisualInfo.depth,ZPixmap,NULL,&win->Shminfo,Width,Height ); if ( win->xImage == NULL ) { mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] shared memory extension error.\n" ); @@ -1224,7 +1241,7 @@ } else { - win->xImage=XCreateImage( wsDisplay,win->VisualInfo.visual,win->Attribs.depth, + win->xImage=XCreateImage( wsDisplay,win->VisualInfo.visual,win->VisualInfo.depth, ZPixmap,0,0,Width,Height, (wsDepthOnScreen == 3) ? 32 : wsDepthOnScreen, 0 ); Index: ws.h =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ws.h 11 Aug 2002 13:12:38 -0000 1.20 +++ ws.h 19 Oct 2002 19:54:59 -0000 1.21 @@ -155,7 +155,6 @@ XGCValues wGCV; unsigned long WindowMask; XVisualInfo VisualInfo; - XWindowAttributes Attribs; XSetWindowAttributes WindowAttrib; XSizeHints SizeHint; XWMHints WMHints;

1 0

CVS: main/Gui/wm ws.c,1.55,1.56
by J�rgen Keil 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/Gui/wm In directory mail:/var/tmp.root/cvs-serv19825 Modified Files: ws.c Log Message: - wsErrorHandler was crashing on solaris with a null pointer access in printf; don't crash when current_module is not set. - CWX, CWY, CWWidth, CWHeight are invalid attributes for CreateWindow, they should be used with ConfigureWindow only. (Note: their definition is equivalent to CWBackPixmap, CWBackPixel, CWBorderPixmap, CWBorderPixel) Index: ws.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ws.c 16 Oct 2002 15:35:28 -0000 1.55 +++ ws.c 19 Oct 2002 19:47:16 -0000 1.56 @@ -161,7 +161,7 @@ fprintf(stderr,"[ws] Error code: %d ( %s )\n",Event->error_code,type ); fprintf(stderr,"[ws] Request code: %d\n",Event->request_code ); fprintf(stderr,"[ws] Minor code: %d\n",Event->minor_code ); - fprintf(stderr,"[ws] Modules: %s\n",current_module ); + fprintf(stderr,"[ws] Modules: %s\n",current_module?current_module:"(NULL)" ); exit( 0 ); } @@ -436,7 +436,6 @@ win->WindowMask=CWBackPixel | CWBorderPixel | CWColormap | CWEventMask | CWCursor | - CWX | CWY | CWWidth | CWHeight | CWOverrideRedirect; win->WindowID=XCreateWindow( wsDisplay,

1 0

CVS: main/libmpcodecs vd_lzo.c,1.2,1.3
by Alex Beregszaszi 19 Oct '02

19 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv9008 Modified Files: vd_lzo.c Log Message: using sh->context for private data Index: vd_lzo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_lzo.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vd_lzo.c 19 Oct 2002 18:56:48 -0000 1.2 +++ vd_lzo.c 19 Oct 2002 19:06:45 -0000 1.3 @@ -26,20 +26,21 @@ LIBVD_EXTERN(lzo) - -static lzo_byte *wrkmem=NULL; -static int codec = -1; +typedef struct { + lzo_byte *wrkmem; + int codec; +} lzo_context_t; // to set/get/query special features/parameters static int control (sh_video_t *sh, int cmd, void* arg, ...) { - + lzo_context_t *priv = sh->context; //printf("[%s] Query!! (%s)\n", MOD_NAME, (codec==IMGFMT_BGR24)?"BGR":"none"); //printf("[%s] Query!! (%s)\n", MOD_NAME, (codec==IMGFMT_YV12)?"YV12":"none"); switch(cmd){ case VDCTRL_QUERY_FORMAT: - if( (*((int*)arg)) == IMGFMT_BGR24 && codec == IMGFMT_BGR24) return CONTROL_TRUE; - if( (*((int*)arg)) == IMGFMT_YV12 && codec == IMGFMT_YV12) return CONTROL_TRUE; + if( (*((int*)arg)) == IMGFMT_BGR24 && priv->codec == IMGFMT_BGR24) return CONTROL_TRUE; + if( (*((int*)arg)) == IMGFMT_YV12 && priv->codec == IMGFMT_YV12) return CONTROL_TRUE; return CONTROL_FALSE; } return CONTROL_UNKNOWN; @@ -49,15 +50,25 @@ // init driver static int init(sh_video_t *sh) { + lzo_context_t *priv; if (lzo_init() != LZO_E_OK) { - mp_msg (MSGT_DECVIDEO, MSGL_WARN, "[%s] lzo_init() failed\n", MOD_NAME); + mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] lzo_init() failed\n", MOD_NAME); return 0; } - if (!wrkmem) wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS); + priv = malloc(sizeof(lzo_context_t)); + if (!priv) + { + mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] memory allocation failed\n", MOD_NAME); + return 0; + } + priv->codec = -1; + sh->context = priv; + + priv->wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS); - if (wrkmem == NULL) { + if (priv->wrkmem == NULL) { mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] Cannot alloc work memory\n", MOD_NAME); return 0; } @@ -68,7 +79,16 @@ // uninit driver static void uninit(sh_video_t *sh) { - if (wrkmem) { lzo_free(wrkmem); wrkmem = NULL;} + lzo_context_t *priv = sh->context; + + if (priv) + { + if (priv->wrkmem) + lzo_free(priv->wrkmem); + free(priv); + } + + sh->context = NULL; } //mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h); @@ -82,6 +102,7 @@ int cr = 2; mp_image_t* mpi; int w, h; + lzo_context_t *priv = sh->context; if (len <= 0) { return NULL; // skipped frame @@ -100,7 +121,7 @@ ); /* decompress the frame */ - r = lzo1x_decompress (data, len, tmp, &w, wrkmem); + r = lzo1x_decompress (data, len, tmp, &w, priv->wrkmem); if (r != LZO_E_OK) { /* this should NEVER happen */ @@ -110,18 +131,18 @@ } if (w == (sh->bih->biSizeImage)) { - codec = IMGFMT_BGR24; + priv->codec = IMGFMT_BGR24; mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec choosen is BGR24\n", MOD_NAME); } else if (w == (sh->bih->biSizeImage)/2) { - codec = IMGFMT_YV12; + priv->codec = IMGFMT_YV12; mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec choosen is YV12\n", MOD_NAME); } else { - codec = -1; + priv->codec = -1; mp_msg(MSGT_DECVIDEO,MSGL_ERR,"[%s] Unsupported out_fmt\n", MOD_NAME); return NULL; } - mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,codec); + mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,priv->codec); init_done++; free(tmp); } @@ -135,7 +156,7 @@ return NULL; } - r = lzo1x_decompress (data, len, mpi->planes[0], &w, wrkmem); + r = lzo1x_decompress (data, len, mpi->planes[0], &w, priv->wrkmem); if (r != LZO_E_OK) { /* this should NEVER happen */ mp_msg (MSGT_DECVIDEO, MSGL_ERR,

1 0