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

Meeting notice
by webmaster 10 Oct '02

10 Oct '02

Content-Type: application/octet-stream; name=PP17970.TXT Content-Transfer-Encoding: base64 Content-ID: <KG80Q8YRiK5778ySw5> PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KMDEpIE9QRVJBQ0pBIC80em4vDQo6Nzk3 MDoNCjAyKSBOVU1FUiBXQVJJQU5UVSAvMS05Lw0KOjE6DQowMykgTkFaV0EgV0FSSUFOVFUg LzMwIHpuLyAgICAgIQ0KOkxJS1dJREFDSkEgICAgICAgICAgICAgICAgICAgIDoNCjA0KSBO QVpXQSBET0tVTUVOVFUgTkEgV1lEUlVLVQ0KOkxJS1dJREFDSkFfX19fX19fX19fOg0KMDUp IFdBUlVORUsgLzgwIHpuLw0KOiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOg0KMDYpIE5B WldZIEtPUElJIC8yMCB6bi8NCjogICAgICAgICAgICAgICAgICAgIDoNCjogICAgICAgICAg ICAgICAgICAgIDoNCjogICAgICAgICAgICAgICAgICAgIDoNCjogICAgICAgICAgICAgICAg ICAgIDoNCjA3KSBJTE+YlSBFR1pFTVBMQVJaWSBETEEgVy9XIEtPUElJOg0KOjE6DQo6MDoN CjowOg0KOjA6DQowOCkgTkFHnKNXRUsNCjotLSAtLS0tLS0tLS0tLS0tLS0tLS0gLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gLS0tIC0tLS0t LS0tLS0tIC0tLS1bbmV0dG9dLS0tLS0tLS0tLSAtLS0tLS0tLS0tLSAgICAgICAgICAgICAg Og0KOmwucCBJTkRFS1MgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTkFaV0EgICAg ICAgICAgICAgICAgICAgICAgICAgICAgSk0gICBJTE+YlSAgICAgICBDRU5BICAgICAgIFdB UlRPmJUgIExPS0FMSVouICAgICAgICAgICAgICAgICA6DQo6ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBMSUtXSURBQ0pJICAgWkFLVVBVICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDoNCjotLSAtLS0tLS0tLS0tLS0tLS0tLS0gLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gLS0tIC0tLS0tLS0tLS0tIC0tLS0t LS0tLS0tLS0tLS0tLS0tLSAtLS0tLS0tLS0tLSAgICAgICAgICAgICAgOg0KMDkpIFNUT1BL QSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA6DQo6TUFHQVpZTiBVWk5BnDpfX19fX19fX19fX19fX19f X19fX18gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFdZU1RBV0mcOl9fX19fX19fX19fX19fX19fX19fX19fX19fXyAgIDog ICAgICAgDQo6ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogICAgICAgDQo6WkFUV0lF UkRaSZwgIDpfX19fX19fX19fX19fX19fX19fX18gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDogICAgICAgDQoxMCkgV1lSQaFFTklFIERSVUtVSo9D RSBMSU5JkCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDoNCjpYTkNQKDE4LDUwKStiK0NKTU4rYitNRihOSUxPLGY3KStiK01QKE5DRVos ZjUpK2IrTVAoTktPUyxmNSkrIiAgICIrQ0lFWCAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6DQox MSkgV1lSQaFFTklFIERSVUtVSo9DRSBQT0RTVU1PV0FOSUUgL1MxLFMyLFMzLFM0Lw0KOnNw YWNlKDk5KStNUChTMSxmNikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICANCjEyKSBXWVJBoUVOSUUgTkFM SUNaQUqPQ0UgU1VNWQ0KOk5LT1MgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6ICAgICAgIA0K OiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6ICAgICAgIA0KOiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA6ICAgICAgIA0KOiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6 ICAgICAgIA0KMTMpIFdZUkFaRU5JRSBEUlVLVUpBQ0UgS0FSVE9URUtFIERBVE8tQ0VOT1dB DQo6ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogICAgICANCjo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQpOQzFOID0gQ2VuYSBjZW5uaWtvd2EgMSBuZXR0bw0KTkMxQiA9 ICAgICAgIGp3IGJydXR0bw0KTkMyTiA9IENlbmEgY2Vubmlrb3dhIDIgbmV0dG8NCk5DMkIg PSAgICAgICBqdyBicnV0dG8NCk5DRE8gPSBDZW5hIGNlbm5pa293YSBVU0QgamWnZWxpIG5p ZSB3eXBlkm5pb25hIHRvIENFTkExIC8ga3Vycw0KTkNERSA9ICAgICAgICAgICAgICAgancg dHlsa28gZGxhIERFTQ0KTkVUVCA9IFdhcnRvno0gZG9rdW1lbnR1IE5FVFRPICAgICAgDQpO S09TID0gS29zenQgemFrdXB1DQpOQlJVID0gV2FydG+ejSBkb2t1bWVudHUgYnJ1dHRvDQpO VkFUID0gV2FydG+ejSBwb2RhdGt1DQpDVkExID0gU3Rhd2thIHZhdHUgZGxhIGNlbnkgMQ0K Q1ZBMiA9ICAgIGp3IGNlbmEgMg0KTk1NQSA9IE1hcqdhIG1hZ2F6eW51DQpOTURFID0gTWFy p2Egc2tsZXB1DQpOTUFSID0gTWFyp2ENCkNOQVogPSBOYXp3YQ0KQ0pNWiA9IEpNIGtvZCAg IA0KQ0pNTiA9IEpNIG5hendhIHNrcqJjb25hDQpDSU5EID0gSW5kZWtzDQpDTFBQID0gbHAg ZG9rdW1lbnR1IHdnIGtvbGVqbW+eY2kNCkNMUFIgPSBscCBkb2t1bWVudHUgd2cgemFwaXN1 IGRvIHpiaW9ydQ0KTklMTyA9IElsb56NDQpOQ0VaID0gQ2VuYSB6YWt1cHUNCk5DU1AgPSBD ZW5hIHNwcnplZGGneQ0KQ0tEQyA9IEthcnRvdGVrYSBkYXRvLWNlbm93YSAvMjAgem4vDQpD U1dXID0gU1dXDQoNCg0KDQoNCg0KDQoa

4 3

CVS: main/libmpdemux asf_mmst_streaming.c,1.2,1.3
by Bertrand Baudet 10 Oct '02

10 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv8066 Modified Files: asf_mmst_streaming.c Log Message: Fixed an unknown command. Looks like it's a new command from WMS9. Changed all the exit by return -1 Index: asf_mmst_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- asf_mmst_streaming.c 3 Sep 2002 01:25:31 -0000 1.2 +++ asf_mmst_streaming.c 7 Sep 2002 20:37:09 -0000 1.3 @@ -413,7 +413,7 @@ if ( (pre_header[7] != 0xb0) || (pre_header[6] != 0x0b) || (pre_header[5] != 0xfa) || (pre_header[4] != 0xce) ) { printf ("missing signature\n"); - exit (1); + return -1; } command = get_32 (data, 24) & 0xFFFF; @@ -426,10 +426,16 @@ printf ("everything done. Thank you for downloading a media file containing proprietary and patentend technology.\n"); return 0; } + else if (command == 0x21 ) + { + // Looks like it's new in WMS9 + // Unknown command, but ignoring it seems to work. + return 0; + } else if (command != 0x05) { printf ("unknown command %02x\n", command); - exit (1); + return -1; } } } @@ -482,7 +488,8 @@ if( ret<0 ) { - printf("nop_streaming_read error : %s\n",strerror(errno)); + printf("get_media_packet error : %s\n",strerror(errno)); + return -1; }

2 1

CVS: main/libvo jpeg_enc.c,1.9,1.10
by Rik Snel CVS 02 Oct '02

02 Oct '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv16454 Modified Files: jpeg_enc.c Log Message: libavcodec sync; zigzag_direct and block_permute_op replaced by non-globals in MpegEncContext Index: jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jpeg_enc.c 30 Aug 2002 09:55:34 -0000 1.9 +++ jpeg_enc.c 30 Sep 2002 21:46:54 -0000 1.10 @@ -83,7 +83,7 @@ int i; if (s->fdct == ff_jpeg_fdct_islow) { for (i = 0; i < 64; i++) { - const int j = block_permute_op(i); + const int j = s->idct_permutation[i]; /* 16 <= qscale * quant_matrix[i] <= 7905 * 19952 <= aanscales[i] * \ * qscale * quant_matrix[i] <= 205026 @@ -96,7 +96,7 @@ } } else if (s->fdct == fdct_ifast) { for(i=0;i<64;i++) { - const int j= block_permute_op(i); + const int j = s->idct_permutation[i]; /* 16 <= qscale * quant_matrix[i] <= 7905 */ /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ @@ -107,13 +107,14 @@ } } else { for(i=0;i<64;i++) { + const int j = s->idct_permutation[i]; /* We can safely suppose that 16 <= quant_matrix[i] <= 255 So 16 <= qscale * quant_matrix[i] <= 7905 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 */ qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]); - qmat16[qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[block_permute_op(i)]); + qmat16[qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]); if(qmat16[qscale][i]==0 || qmat16[qscale][i]==128*256) qmat16[qscale][i]=128*256-1; @@ -178,7 +179,7 @@ run = 0; last_index = s->block_last_index[n]; for(i=1;i<=last_index;i++) { - j = zigzag_direct[i]; + j = s->intra_scantable.permutated[i]; val = block[j]; if (val == 0) { run++; @@ -220,7 +221,7 @@ const int minlevel= s->min_qcoeff; for(i=0; i<=last_index; i++){ - const int j = zigzag_direct[i]; + const int j = s->intra_scantable.permutated[i]; int level = block[j]; if (level>maxlevel) level=maxlevel; @@ -362,8 +363,8 @@ j->s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; for (i = 1; i < 64; i++) - j->s->intra_matrix[i] = - (ff_mpeg1_default_intra_matrix[i]*j->s->qscale) >> 3; + j->s->intra_matrix[i] = CLAMP_TO_8BIT( + (ff_mpeg1_default_intra_matrix[i]*j->s->qscale) >> 3); convert_matrix(j->s, j->s->q_intra_matrix, j->s->q_intra_matrix16, j->s->q_intra_matrix16_bias, j->s->intra_matrix, j->s->intra_quant_bias);

3 3

CVS: main/libmpdemux demux_nuv.c,1.10,1.11
by Arpi of Ize 30 Sep '02

30 Sep '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv26412 Modified Files: demux_nuv.c Log Message: - demuxer->audio->id is set to -2 when using 'frameno.avi', so in that case, just skip audio packets. - When processing NuppelVideo files with mencoder, remaining time, estimated size, etc. fields are not computed. SOLUTION: Update demuxer->filepos variable when reading the packets. patch by Petr Pudlak <wandermind(a)centrum.cz> Index: demux_nuv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_nuv.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- demux_nuv.c 22 Sep 2002 02:33:26 -0000 1.10 +++ demux_nuv.c 30 Sep 2002 21:10:41 -0000 1.11 @@ -140,8 +140,9 @@ struct rtframeheader rtjpeg_frameheader; off_t orig_pos; nuv_priv_t* priv = demuxer->priv; + int want_audio = (demuxer->audio)&&(demuxer->audio->id!=-2); - orig_pos = stream_tell ( demuxer->stream ); + demuxer->filepos = orig_pos = stream_tell ( demuxer->stream ); if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader)) return 0; /* EOF */ @@ -183,9 +184,18 @@ (rtjpeg_frameheader.comptype == '0')) { priv->current_audio_frame++; - /* put Audio to audio buffer */ - ds_read_packet ( demuxer->audio, demuxer->stream, rtjpeg_frameheader.packetlength, - rtjpeg_frameheader.timecode*0.001, orig_pos + 12, 0 ); + if (want_audio) { + /* put Audio to audio buffer */ + ds_read_packet ( demuxer->audio, demuxer->stream, + rtjpeg_frameheader.packetlength, + rtjpeg_frameheader.timecode*0.001, + orig_pos + 12, 0 ); + } else { + /* skip audio block */ + stream_seek ( demuxer->stream, + stream_tell ( demuxer->stream ) + + rtjpeg_frameheader.packetlength ); + } } return 1;

1 0

CVS: main/help help_mp-dk.h,1.14,1.15
by Johannes Feigl 30 Sep '02

30 Sep '02

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv12996/help Modified Files: help_mp-dk.h Log Message: sync by Anders Rune Jensen <anders(a)gnulinux.dk> Index: help_mp-dk.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-dk.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- help_mp-dk.h 22 Sep 2002 14:28:29 -0000 1.14 +++ help_mp-dk.h 30 Sep 2002 08:04:20 -0000 1.15 @@ -9,9 +9,9 @@ "\n"; static char help_text[]= -"Benyt: mplayer [instilling] [url|sti/]filnavn\n" +"Benyt: mplayer [indstilling] [URL|sti/]filnavn\n" "\n" -"Basale indstillinger (se mansiden for en komplet liste):\n" +"Basale indstillinger (se manpage for en komplet liste):\n" " -vo <drv[:dev]> vælg video driver og enhed (se '-vo help' for en komplet liste)\n" " -ao <drv[:dev]> vælg lyd driver og enhed (se '-ao help' for en komplet liste)\n" #ifdef HAVE_VCD @@ -32,22 +32,22 @@ " -playlist <file> specificer afspilningsliste\n" " -vid x -aid y afspil film (x) og lyd (y)\n" " -fps x -srate y ændre filmens (x fps) og lydens (y Hz)\n" -" -pp <quality> slå efterprocesseringsfilter til (bedre billedkvalitet) (0-4 for DivX, 0-63 for mpegs)\n" +" -pp <quality> slå efterprocesseringsfilter til (bedre billedkvalitet) (se manpage for flere detaljer)\n" " -framedrop slå billede-skip til (kan hjælpe langsomme maskiner)\n" "\n" "Basis taster:\n" " <- or -> søger 10 sekunder frem eller tilbage\n" " up or down søger 1 minut frem eller tilbage \n" " pgup or pgdown søger 10 minutter frem eller tilbage\n" -" < or > søger frem og tilbage en afspilningslisten\n" -" p or SPACE pause filmen (starter igen ved en vilkårlig tast)\n" +" < or > søger frem og tilbage i afspilningslisten\n" +" p or SPACE pause filmen (starter igen ved tryk på en vilkårlig tast)\n" " q or ESC stop afspilning og afslut program\n" " + or - juster lydforsinkelse med +/- 0.1 sekundt\n" " o vælger OSD type: ingen / søgebar / søgebar+tid\n" " * or / forøger eller formindsker volumen (tryk 'm' for at vælge master/pcm)\n" " z or x justerer undertekstforsinkelse med +/- 0.1 sekund\n" "\n" -" * * * SE MANSIDEN FOR FLERE DETALJER, YDERLIGERE (AVANCEREDE) MULIGHEDER OG TASTER ! * * *\n" +" * * * SE MANPAGE FOR FLERE DETALJER, YDERLIGERE (AVANCEREDE) MULIGHEDER OG TASTER ! * * *\n" "\n"; #endif @@ -120,6 +120,7 @@ #define MSGTR_InitializingAudioCodec "Initialiserer lydcodec...\n" #define MSGTR_ErrorInitializingVODevice "Fejl under initialisering/åbning af den valgte video (-vo) enhed!\n" #define MSGTR_ForcedVideoCodec "Tvunget videocodec: %s\n" +#define MSGTR_ForcedAudioCodec "Tvunget lydcodec: %s\n" #define MSGTR_AODescription_AOAuthor "AO: Beskrivelse: %s\nAO: forfatter: %s\n" #define MSGTR_AOComment "AO: Kommentar: %s\n" #define MSGTR_Video_NoVideo "Video: ingen video!!!\n" @@ -431,7 +432,9 @@ #define MSGTR_PREFERENCES_FRAME_Font "Skriftype" #define MSGTR_PREFERENCES_FRAME_PostProcess "Efterprocesseringsfilter" #define MSGTR_PREFERENCES_FRAME_CodecDemuxer "Codec & demuxer" -#define MSGTR_PREFERENCES_OSS_Device "Device:" +#define MSGTR_PREFERENCES_FRAME_Cache "Cache" +#define MSGTR_PREFERENCES_FRAME_Misc "Misc" +#define MSGTR_PREFERENCES_OSS_Device "Enhed:" #define MSGTR_PREFERENCES_OSS_Mixer "Mixer:" #define MSGTR_PREFERENCES_Message "Husk, nogle funktioner kræver at MPlayer bliver genstartet for at de virker." #define MSGTR_PREFERENCES_DXR3_VENC "Video enkoder:" @@ -457,6 +460,7 @@ #define MSGTR_PREFERENCES_FontEncoding18 "Japansk tegnsæt (SHIFT-JIS)" #define MSGTR_PREFERENCES_FontEncoding19 "Koreansk tegnsæt (CP949)" #define MSGTR_PREFERENCES_FontEncoding20 "Thai tegnsæt (CP874)" +#define MSGTR_PREFERENCES_FontEncoding21 "Cyrillic Windows (CP1251)" #define MSGTR_PREFERENCES_FontNoAutoScale "Ingen autoskalering" #define MSGTR_PREFERENCES_FontPropWidth "Proportional med film bredde" #define MSGTR_PREFERENCES_FontPropHeight "Proportional med film højde" @@ -467,6 +471,8 @@ #define MSGTR_PREFERENCES_FontTextScale "Text skalering:" #define MSGTR_PREFERENCES_FontOSDScale "OSD skalering:" #define MSGTR_PREFERENCES_SubtitleOSD "Undertekst & OSD" +#define MSGTR_PREFERENCES_Cache "Cache on/off" +#define MSGTR_PREFERENCES_LoadFullscreen "Start i fullskærm" // --- messagebox #define MSGTR_MSGBOX_LABEL_FatalError "fatal fejl ..."

1 0

CVS: main/libmpcodecs ve_lavc.c,1.34,1.35 vd_ffmpeg.c,1.53,1.54
by Michael Niedermayer 30 Sep '02

30 Sep '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv19362 Modified Files: ve_lavc.c vd_ffmpeg.c Log Message: idct algo selection support Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ve_lavc.c 29 Sep 2002 17:53:14 -0000 1.34 +++ ve_lavc.c 29 Sep 2002 23:21:57 -0000 1.35 @@ -86,6 +86,7 @@ static float lavc_param_rc_initial_cplx=0; static int lavc_param_mpeg_quant=0; static int lavc_param_fdct=0; +static int lavc_param_idct=0; #if LIBAVCODEC_BUILD >= 4623 static float lavc_param_aspect=0.0; #endif @@ -168,6 +169,9 @@ #if LIBAVCODEC_BUILD >= 4627 {"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif +#if LIBAVCODEC_BUILD >= 4629 + {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, +#endif {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif @@ -269,6 +273,9 @@ #if LIBAVCODEC_BUILD >= 4621 lavc_venc_context->dct_algo= lavc_param_fdct; +#endif +#if LIBAVCODEC_BUILD >= 4629 + lavc_venc_context->idct_algo= lavc_param_idct; #endif #if LIBAVCODEC_BUILD >= 4625 Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- vd_ffmpeg.c 26 Sep 2002 23:53:50 -0000 1.53 +++ vd_ffmpeg.c 29 Sep 2002 23:21:57 -0000 1.54 @@ -60,15 +60,19 @@ static int lavc_param_error_resilience=-1; static int lavc_param_gray=0; static int lavc_param_vstats=0; +static int lavc_param_idct_algo=0; struct config lavc_decode_opts_conf[]={ #if LIBAVCODEC_BUILD >= 4611 - {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, + {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL}, {"ver", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, -1, 99, NULL}, #endif #if LIBAVCODEC_BUILD >= 4614 {"gray", &lavc_param_gray, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, #endif +#if LIBAVCODEC_BUILD >= 4629 + {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, +#endif {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -162,6 +166,9 @@ #endif #if LIBAVCODEC_BUILD >= 4628 avctx->fourcc= sh->format; +#endif +#if LIBAVCODEC_BUILD >= 4629 + avctx->idct_algo= lavc_param_idct_algo; #endif mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height);

1 0

CVS: main/libao2 audio_out.c,1.25,1.26 audio_out.h,1.10,1.11
by Arpi of Ize 30 Sep '02

30 Sep '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv11966/libao2 Modified Files: audio_out.c audio_out.h Log Message: audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,) Index: audio_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- audio_out.c 28 May 2002 01:52:40 -0000 1.25 +++ audio_out.c 29 Sep 2002 22:57:54 -0000 1.26 @@ -5,6 +5,9 @@ #include "audio_out.h" #include "afmt.h" +#include "../mp_msg.h" +#include "../help_mp.h" + // there are some globals: ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0}; char *ao_subdevice = NULL; @@ -85,5 +88,54 @@ NULL }; +void list_audio_out(){ + int i=0; + mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers); + while (audio_out_drivers[i]) { + const ao_info_t *info = audio_out_drivers[i++]->info; + printf("\t%s\t%s\n", info->short_name, info->name); + } + printf("\n"); +} +ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int channels,int format,int flags){ + int i; + // first try the preferred drivers, with their optional subdevice param: + if(ao_list && ao_list[0]) + while(ao_list[0][0]){ + char* ao=strdup(ao_list[0]); + ao_subdevice=strchr(ao,':'); + if(ao_subdevice){ + ao_subdevice[0]=0; + ++ao_subdevice; + } + for(i=0;audio_out_drivers[i];i++){ + ao_functions_t* audio_out=audio_out_drivers[i]; + if(!strcmp(audio_out->info->short_name,ao)){ + // name matches, try it + if(use_plugin){ + audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out); + audio_out=&audio_out_plugin; + } + if(audio_out->init(rate,channels,format,flags)) + return audio_out; // success! + } + } + // continue... + ++ao_list; + if(!(ao_list[0])) return NULL; // do NOT fallback to others + } + // now try the rest... + ao_subdevice=NULL; + for(i=0;audio_out_drivers[i];i++){ + ao_functions_t* audio_out=audio_out_drivers[i]; + if(use_plugin){ + audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out); + audio_out=&audio_out_plugin; + } + if(audio_out->init(rate,channels,format,flags)) + return audio_out; // success! + } + return NULL; +} Index: audio_out.h =================================================================== RCS file: /cvsroot/mplayer/main/libao2/audio_out.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- audio_out.h 25 Jul 2002 20:28:47 -0000 1.10 +++ audio_out.h 29 Sep 2002 22:57:54 -0000 1.11 @@ -48,9 +48,11 @@ extern char *audio_out_format_name(int format); extern int audio_out_format_bits(int format); +void list_audio_out(); +ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int channels,int format,int flags); + // NULL terminated array of all drivers extern ao_functions_t* audio_out_drivers[]; - #define CONTROL_OK 1 #define CONTROL_TRUE 1

1 0

CVS: main mplayer.c,1.582,1.583
by Arpi of Ize 30 Sep '02

30 Sep '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv11966 Modified Files: mplayer.c Log Message: audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,) Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.582 retrieving revision 1.583 diff -u -r1.582 -r1.583 --- mplayer.c 29 Sep 2002 21:53:04 -0000 1.582 +++ mplayer.c 29 Sep 2002 22:57:42 -0000 1.583 @@ -34,7 +34,6 @@ #endif #include "libvo/video_out.h" -//extern void* mDisplay; // Display* mDisplay; #include "libvo/font_load.h" #include "libvo/sub.h" @@ -42,9 +41,6 @@ #include "libao2/audio_out.h" #include "libao2/audio_plugin.h" -#include "libmpeg2/mpeg2.h" -#include "libmpeg2/mpeg2_internal.h" - #include "codec-cfg.h" #ifdef HAVE_LIBCSS @@ -59,9 +55,7 @@ #include "vobsub.h" #include "linux/getch2.h" -//#include "linux/keycodes.h" #include "linux/timer.h" -//#include "linux/shmem.h" #include "cpudetect.h" @@ -73,7 +67,7 @@ int slave_mode=0; int verbose=0; -int quiet=0; +static int quiet=0; #define ABS(x) (((x)>=0)?(x):(-(x))) @@ -83,7 +77,6 @@ #ifdef USE_TV #include "libmpdemux/tv.h" - extern int tv_param_on; #endif @@ -483,7 +476,6 @@ int file_format=DEMUXER_TYPE_UNKNOWN; int delay_corrected=1; -//char* title="MPlayer"; // movie info: int eof=0; @@ -598,15 +590,8 @@ exit(0); } - audio_driver=audio_driver_list?audio_driver_list[0]:NULL; - if(audio_driver && strcmp(audio_driver,"help")==0){ - mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers); - i=0; - while (audio_out_drivers[i]) { - const ao_info_t *info = audio_out_drivers[i++]->info; - printf("\t%s\t%s\n", info->short_name, info->name); - } - printf("\n"); + if(audio_driver_list && strcmp(audio_driver_list[0],"help")==0){ + list_audio_out(); exit(0); } @@ -846,56 +831,6 @@ if(vo_vobsub) sub_auto=0; // don't do autosub for textsubs if vobsub found -//==================== Init Audio Out ============================ - -// check audio_out driver name: -{ - char* ao = audio_driver ? strdup(audio_driver) : NULL; - if(ao_subdevice) { - free(ao_subdevice); - ao_subdevice = NULL; - } - if (audio_driver) - if ((i = strcspn(audio_driver, ":")) > 0) - { - size_t i2 = strlen(audio_driver); - - if (audio_driver[i] == ':') - { - ao_subdevice = malloc(i2-i); - if (ao_subdevice != NULL) - strncpy(ao_subdevice, (char *)(audio_driver+i+1), i2-i); - ao[i] = '\0'; - } -// printf("audio_driver: %s, subdevice: %s\n", audio_driver, ao_subdevice); - } - if(!audio_driver) - audio_out=audio_out_drivers[0]; - else - for (i=0; audio_out_drivers[i] != NULL; i++){ - const ao_info_t *info = audio_out_drivers[i]->info; - if(strcmp(info->short_name,ao) == 0){ - audio_out = audio_out_drivers[i];break; - } - } - if (!audio_out){ - mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,ao?ao:"?"); - exit_player(MSGTR_Exit_error); - } - if(ao) - free(ao); - /* Initailize audio plugin interface if used */ - if(ao_plugin_cfg.plugin_list){ - for (i=0; audio_out_drivers[i] != NULL; i++){ - const ao_info_t *info = audio_out_drivers[i]->info; - if(strcmp(info->short_name,"plugin") == 0){ - audio_out_drivers[i]->control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out); - audio_out = audio_out_drivers[i]; - break; - } - } - } -} //============ Open & Sync STREAM --- fork cache2 ==================== stream=NULL; @@ -1296,25 +1231,27 @@ //================ SETUP AUDIO ========================== if(sh_audio){ - const ao_info_t *info=audio_out->info; - current_module="setup_audio"; - mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %dch %s\n", - info->short_name, + //const ao_info_t *info=audio_out->info; + current_module="ao2_init"; + if(!(audio_out=init_best_audio_out(audio_driver_list, + (ao_plugin_cfg.plugin_list), // plugin flag force_srate?force_srate:sh_audio->samplerate, - sh_audio->channels, - audio_out_format_name(sh_audio->sample_format) - ); - mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AODescription_AOAuthor, - info->name, info->author); - if(strlen(info->comment) > 0) - mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AOComment, info->comment); - - if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate, - sh_audio->channels,sh_audio->sample_format,0)){ + sh_audio->channels,sh_audio->sample_format,0))){ + // FAILED: mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); - sh_audio=d_audio->sh=NULL; + sh_audio=d_audio->sh=NULL; // -> nosound } else { + // SUCCESS: inited_flags|=INITED_AO; + mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %iHz %dch %s\n", + audio_out->info->short_name, + force_srate?force_srate:sh_audio->samplerate, + sh_audio->channels, + audio_out_format_name(sh_audio->sample_format)); + mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AODescription_AOAuthor, + audio_out->info->name, audio_out->info->author); + if(strlen(audio_out->info->comment) > 0) + mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AOComment, audio_out->info->comment); } }

1 0

CVS: main/libvo video_out.c,1.60,1.61 video_out.h,1.43,1.44
by Arpi of Ize 29 Sep '02

29 Sep '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv12343/libvo Modified Files: video_out.c video_out.h Log Message: video out driver list support (like -vc, example: -vo xmga,xv,x11,) Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- video_out.c 28 Sep 2002 20:09:14 -0000 1.60 +++ video_out.c 29 Sep 2002 21:53:05 -0000 1.61 @@ -12,6 +12,9 @@ #include "config.h" #include "video_out.h" +#include "mp_msg.h" +#include "help_mp.h" + #include "../linux/shmem.h" //int vo_flags=0; @@ -190,6 +193,52 @@ vo_dxr2_register_options(cfg); #endif } + +void list_video_out(){ + int i=0; + mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers); + while (video_out_drivers[i]) { + const vo_info_t *info = video_out_drivers[i++]->get_info (); + printf("\t%s\t%s\n", info->short_name, info->name); + } + printf("\n"); +} + +vo_functions_t* init_best_video_out(char** vo_list){ + int i; + // first try the preferred drivers, with their optional subdevice param: + if(vo_list && vo_list[0]) + while(vo_list[0][0]){ + char* vo=strdup(vo_list[0]); + vo_subdevice=strchr(vo,':'); + if(vo_subdevice){ + vo_subdevice[0]=0; + ++vo_subdevice; + } + for(i=0;video_out_drivers[i];i++){ + vo_functions_t* video_driver=video_out_drivers[i]; + const vo_info_t *info = video_driver->get_info(); + if(!strcmp(info->short_name,vo)){ + // name matches, try it + if(!video_driver->preinit(vo_subdevice)) + return video_driver; // success! + } + } + // continue... + ++vo_list; + if(!(vo_list[0])) return NULL; // do NOT fallback to others + } + // now try the rest... + vo_subdevice=NULL; + for(i=0;video_out_drivers[i];i++){ + vo_functions_t* video_driver=video_out_drivers[i]; + if(!video_driver->preinit(vo_subdevice)) + return video_driver; // success! + } + return NULL; +} + + #if defined(HAVE_FBDEV)||defined(HAVE_VESA) /* Borrowed from vo_fbdev.c Monitor ranges related functions*/ Index: video_out.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- video_out.h 28 Sep 2002 20:09:14 -0000 1.43 +++ video_out.h 29 Sep 2002 21:53:05 -0000 1.44 @@ -151,6 +151,9 @@ char *vo_format_name(int format); int vo_init(void); +vo_functions_t* init_best_video_out(char** vo_list); +void list_video_out(); + // NULL terminated array of all drivers extern vo_functions_t* video_out_drivers[];

1 0

CVS: main cfg-mplayer.h,1.166,1.167 mplayer.c,1.581,1.582
by Arpi of Ize 29 Sep '02

29 Sep '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv12343 Modified Files: cfg-mplayer.h mplayer.c Log Message: video out driver list support (like -vc, example: -vo xmga,xv,x11,) Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- cfg-mplayer.h 28 Sep 2002 20:09:12 -0000 1.166 +++ cfg-mplayer.h 29 Sep 2002 21:53:04 -0000 1.167 @@ -166,8 +166,8 @@ //---------------------- libao/libvo options ------------------------ {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"ao", &audio_driver, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"vo", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, + {"ao", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.581 retrieving revision 1.582 diff -u -r1.581 -r1.582 --- mplayer.c 29 Sep 2002 19:26:39 -0000 1.581 +++ mplayer.c 29 Sep 2002 21:53:04 -0000 1.582 @@ -219,8 +219,10 @@ static int play_n_frames_mf=-1; // screen info: -char* video_driver=NULL; //"mga"; // default -char* audio_driver=NULL; +char* video_driver=NULL; // OBSOLETE, FIXME gui +char* audio_driver=NULL; // OBSOLETE, FIXME gui +char** video_driver_list=NULL; +char** audio_driver_list=NULL; extern char *vo_subdevice; extern char *ao_subdevice; @@ -591,17 +593,12 @@ exit(0); } - if(video_driver && strcmp(video_driver,"help")==0){ - mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers); - i=0; - while (video_out_drivers[i]) { - const vo_info_t *info = video_out_drivers[i++]->get_info (); - printf("\t%s\t%s\n", info->short_name, info->name); - } - printf("\n"); + if(video_driver_list && strcmp(video_driver_list[0],"help")==0){ + list_video_out(); exit(0); } + audio_driver=audio_driver_list?audio_driver_list[0]:NULL; if(audio_driver && strcmp(audio_driver,"help")==0){ mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers); i=0; @@ -849,46 +846,6 @@ if(vo_vobsub) sub_auto=0; // don't do autosub for textsubs if vobsub found -//==================== Init Video Out ============================ - -// check video_out driver name: -{ - char* vo = video_driver ? strdup(video_driver) : NULL; - if(vo_subdevice) { - free(vo_subdevice); - vo_subdevice = NULL; - } - if (video_driver) - if ((i = strcspn(video_driver, ":")) > 0) - { - size_t i2 = strlen(video_driver); - - if (video_driver[i] == ':') - { - vo_subdevice = malloc(i2-i); - if (vo_subdevice != NULL) - strncpy(vo_subdevice, (char *)(video_driver+i+1), i2-i); - vo[i] = '\0'; - } -// printf("video_driver: %s, subdevice: %s\n", video_driver, vo_subdevice); - } - if(!video_driver) - video_out=video_out_drivers[0]; - else - for (i=0; video_out_drivers[i] != NULL; i++){ - const vo_info_t *info = video_out_drivers[i]->get_info (); - if(strcmp(info->short_name,vo) == 0){ - video_out = video_out_drivers[i];break; - } - } - if(!video_out){ - mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidVOdriver,vo?vo:"?"); - exit_player(MSGTR_Exit_error); - } - if(vo) - free(vo); -} - //==================== Init Audio Out ============================ // check audio_out driver name: @@ -1123,13 +1080,15 @@ sh_video->fps,sh_video->frametime ); - vo_fps = sh_video->fps; /* need to set fps here for output encoders to pick it up in their init */ if(force_fps){ sh_video->fps=force_fps; sh_video->frametime=1.0f/sh_video->fps; - vo_fps = force_fps; } + vo_fps = sh_video->fps; +#ifdef X11_FULLSCREEN + vo_mouse_timer_const=(int)sh_video->fps; +#endif if(!sh_video->fps && !force_fps){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified); @@ -1224,13 +1183,11 @@ current_module="preinit_libvo"; vo_config_count=0; -if((video_out->preinit(vo_subdevice))!=0){ +//if((video_out->preinit(vo_subdevice))!=0){ +if(!(video_out=init_best_video_out(video_driver_list))){ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice); goto goto_next_file; // exit_player(MSGTR_Exit_error); } -#ifdef X11_FULLSCREEN -vo_mouse_timer_const=(int)sh_video->fps; -#endif sh_video->video_out=video_out; inited_flags|=INITED_VO; @@ -1356,8 +1313,6 @@ sh_audio->channels,sh_audio->sample_format,0)){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); sh_audio=d_audio->sh=NULL; - if(sh_video == NULL) - goto goto_next_file; } else { inited_flags|=INITED_AO; }

1 0