August 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpdemux asf_mmst_streaming.c, 1.32, 1.33
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by The Wanderer CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv31980/libmpdemux Modified Files: asf_mmst_streaming.c Log Message: fix longstanding typo - "patentend" Index: asf_mmst_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- asf_mmst_streaming.c 3 Jun 2005 15:59:24 -0000 1.32 +++ asf_mmst_streaming.c 31 Aug 2005 21:13:05 -0000 1.33 @@ -441,7 +441,7 @@ if (command == 0x1b) send_command (s, 0x1b, 0, 0, 0, data); else if (command == 0x1e) { - mp_msg(MSGT_NETWORK,MSGL_INFO,"everything done. Thank you for downloading a media file containing proprietary and patentend technology.\n"); + mp_msg(MSGT_NETWORK,MSGL_INFO,"everything done. Thank you for downloading a media file containing proprietary and patented technology.\n"); return 0; } else if (command == 0x21 ) {

1 0

CVS: main/etc codecs.conf,1.429,1.430
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/etc In directory mail:/var2/tmp/cvs-serv30241/etc Modified Files: codecs.conf Log Message: x264 fourcc Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- codecs.conf 31 Aug 2005 15:47:16 -0000 1.429 +++ codecs.conf 31 Aug 2005 17:33:38 -0000 1.430 @@ -498,6 +498,7 @@ info "FFmpeg H.264" status working fourcc H264,h264 + fourcc X264,x264 fourcc avc1 format 0x10000005 driver ffmpeg

1 0

CVS: main/etc codecs.conf,1.428,1.429
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/etc In directory mail:/var2/tmp/cvs-serv5264 Modified Files: codecs.conf Log Message: support Pinnacle VideoXL Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.428 retrieving revision 1.429 diff -u -r1.428 -r1.429 --- codecs.conf 25 Aug 2005 15:54:44 -0000 1.428 +++ codecs.conf 31 Aug 2005 15:47:16 -0000 1.429 @@ -405,9 +405,10 @@ out BGR16 videocodec ffvixl - info "Miro VideoXL codec" + info "Miro/Pinnacle VideoXL codec" status working fourcc VIXL + fourcc PIXL ; this is Pinnacle one driver ffmpeg dll xl out 411P

1 0

CVS: main/libmpcodecs dec_video.c,1.162,1.163
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Attila Kinali CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv23001 Modified Files: dec_video.c Log Message: 10l variables have to be declared before any command. Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- dec_video.c 30 Aug 2005 23:56:23 -0000 1.162 +++ dec_video.c 31 Aug 2005 09:24:44 -0000 1.163 @@ -163,10 +163,10 @@ } int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){ + int force = 0; unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0; sh_video->codec=NULL; sh_video->vf_inited=0; - int force = 0; if (codecname && codecname[0] == '+') { codecname = &codecname[1]; force = 1;

5 4

CVS: main/libmpdemux demux_mov.c, 1.127, 1.128 demuxer.c, 1.200, 1.201
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv21247 Modified Files: demux_mov.c demuxer.c Log Message: Fix move playlists (control must be returned to mplayer.c, with the demuxer returning the real URL as a packet). Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- demux_mov.c 30 Aug 2005 23:24:47 -0000 1.127 +++ demux_mov.c 31 Aug 2005 13:04:22 -0000 1.128 @@ -506,7 +506,7 @@ free(priv); if ((flags==5) || (flags==7)) // reference & header sent - return DEMUXER_TYPE_MOV; + return DEMUXER_TYPE_PLAYLIST; if(flags==1) mp_msg(MSGT_DEMUX,MSGL_WARN,"MOV: missing data (mdat) chunk! Maybe broken file...\n"); Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- demuxer.c 30 Aug 2005 23:56:23 -0000 1.200 +++ demuxer.c 31 Aug 2005 13:04:22 -0000 1.201 @@ -629,6 +629,8 @@ file_format = fformat; break; } else { + if (fformat == DEMUXER_TYPE_PLAYLIST) + return demuxer; // handled in mplayer.c // Format changed after check, recurse free_demuxer(demuxer); demuxer=demux_open_stream(stream, fformat, force, @@ -672,6 +674,8 @@ file_format = fformat; break; } else { + if (fformat == DEMUXER_TYPE_PLAYLIST) + return demuxer; // handled in mplayer.c // Format changed after check, recurse free_demuxer(demuxer); demuxer=demux_open_stream(stream, fformat, force,

1 0

[MPlayer-cvslog] CVS: main/input input.c, 1.120, 1.121 input.h, 1.57, 1.58
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv20938/input Modified Files: input.c input.h Log Message: add key_down_eventto slave mode, used to inject key down event with mplayer_put_key Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- input.c 15 Aug 2005 08:30:42 -0000 1.120 +++ input.c 31 Aug 2005 02:15:02 -0000 1.121 @@ -141,6 +141,7 @@ { MP_CMD_GET_VO_FULLSCREEN, "get_vo_fullscreen", 0, { {-1,{0}} } }, { MP_CMD_GET_SUB_VISIBILITY, "get_sub_visibility", 0, { {-1,{0}} } }, + { MP_CMD_KEYDOWN_EVENTS, "key_down_event", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { 0, NULL, 0, {} } }; Index: input.h =================================================================== RCS file: /cvsroot/mplayer/main/input/input.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- input.h 27 Jun 2005 08:16:23 -0000 1.57 +++ input.h 31 Aug 2005 02:15:02 -0000 1.58 @@ -67,6 +67,7 @@ #define MP_CMD_GET_TIME_POS 63 #define MP_CMD_SUB_LOAD 64 #define MP_CMD_SUB_REMOVE 65 +#define MP_CMD_KEYDOWN_EVENTS 66 #define MP_CMD_GUI_EVENTS 5000 #define MP_CMD_GUI_LOADFILE 5001

2 1

CVS: main mplayer.c,1.862,1.863
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv20938 Modified Files: mplayer.c Log Message: add key_down_eventto slave mode, used to inject key down event with mplayer_put_key Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.862 retrieving revision 1.863 diff -u -r1.862 -r1.863 --- mplayer.c 27 Aug 2005 19:45:11 -0000 1.862 +++ mplayer.c 31 Aug 2005 02:15:03 -0000 1.863 @@ -3642,7 +3642,9 @@ } #endif } break; - + case MP_CMD_KEYDOWN_EVENTS : { + mplayer_put_key(cmd->args[0].v.i); + } break; #ifdef USE_DVDNAV case MP_CMD_DVDNAV_EVENT: { dvdnav_priv_t * dvdnav_priv = (dvdnav_priv_t*)(stream->priv);

1 0

CVS: main/libmpdemux demux_realaud.c,1.8,1.9
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv12890/libmpdemux Modified Files: demux_realaud.c Log Message: Sparcs do not like wild pointer typecasting (unaligned access). Fixes bugzilla bug #365. Index: demux_realaud.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_realaud.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- demux_realaud.c 5 Aug 2005 19:57:46 -0000 1.8 +++ demux_realaud.c 30 Aug 2005 23:59:21 -0000 1.9 @@ -145,7 +145,10 @@ mp_msg(MSGT_DEMUX,MSGL_V,"[RealAudio] %d channel, %d bit, %dHz\n", sh->channels, sh->samplesize, sh->samplerate); i = stream_read_char(demuxer->stream); - *((unsigned int *)(ra_priv->genr)) = stream_read_dword(demuxer->stream); + ra_priv->genr[0] = stream_read_char(demuxer->stream); + ra_priv->genr[1] = stream_read_char(demuxer->stream); + ra_priv->genr[2] = stream_read_char(demuxer->stream); + ra_priv->genr[3] = stream_read_char(demuxer->stream); if (i != 4) { mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] Genr size is not 4 (%d), please report to " "MPlayer developers\n", i);

1 0

CVS: main/libmpdemux demuxer.c, 1.199, 1.200 demuxer.h, 1.80, 1.81
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv23706/libmpdemux Modified Files: demuxer.c demuxer.h Log Message: Allow forcing of demuxers and codecs by prepending '+' Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- demuxer.c 26 Aug 2005 17:40:01 -0000 1.199 +++ demuxer.c 30 Aug 2005 23:56:23 -0000 1.200 @@ -528,14 +528,21 @@ * Get demuxer type for a given demuxer name * * @param demuxer_name string with demuxer name of demuxer number + * @param force will be set if demuxer should be forced. + * May be NULL. * @return DEMUXER_TYPE_xxx, -1 if error or not found */ -int get_demuxer_type_from_name(char *demuxer_name) +int get_demuxer_type_from_name(char *demuxer_name, int *force) { int i; long type_int; char *endptr; + if (!demuxer_name || !demuxer_name[0]) + return DEMUXER_TYPE_UNKNOWN; + if (force) *force = demuxer_name[0] == '+'; + if (demuxer_name[0] == '+') + demuxer_name = &demuxer_name[1]; for (i = 0; demuxer_list[i]; i++) { if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Can't select special demuxers from commandline continue; @@ -568,7 +575,9 @@ (ex: tv,mf). */ -static demuxer_t* demux_open_stream(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ +static demuxer_t* demux_open_stream(stream_t *stream, int file_format, + int force, int audio_id, int video_id, int dvdsub_id, + char* filename) { //int file_format=(*file_format_ptr); @@ -586,7 +595,7 @@ if (file_format) { if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) { demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename); - if (demuxer_desc->check_file) { + if (!force && demuxer_desc->check_file) { if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { if (fformat == demuxer_desc->type) { // Move messages to demuxer detection code? @@ -595,7 +604,8 @@ } else { // Format changed after check, recurse free_demuxer(demuxer); - return demux_open_stream(stream,fformat,audio_id,video_id,dvdsub_id,filename); + return demux_open_stream(stream, fformat, force, + audio_id, video_id, dvdsub_id, filename); } } else { // Check failed for forced demuxer, quit @@ -621,7 +631,8 @@ } else { // Format changed after check, recurse free_demuxer(demuxer); - demuxer=demux_open_stream(stream,fformat,audio_id,video_id,dvdsub_id,filename); + demuxer=demux_open_stream(stream, fformat, force, + audio_id, video_id, dvdsub_id, filename); if(demuxer) return demuxer; // done! file_format = DEMUXER_TYPE_UNKNOWN; } @@ -643,7 +654,8 @@ file_format=demuxer_type_by_filename(filename); if(file_format!=DEMUXER_TYPE_UNKNOWN){ // we like recursion :) - demuxer=demux_open_stream(stream,file_format,audio_id,video_id,dvdsub_id,filename); + demuxer=demux_open_stream(stream, file_format, force, + audio_id, video_id, dvdsub_id, filename); if(demuxer) return demuxer; // done! file_format=DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing... mp_msg(MSGT_DEMUXER,MSGL_V,"demuxer: continue fuzzy content-based format guessing...\n"); @@ -662,7 +674,8 @@ } else { // Format changed after check, recurse free_demuxer(demuxer); - demuxer=demux_open_stream(stream,fformat,audio_id,video_id,dvdsub_id,filename); + demuxer=demux_open_stream(stream, fformat, force, + audio_id, video_id, dvdsub_id, filename); if(demuxer) return demuxer; // done! file_format = DEMUXER_TYPE_UNKNOWN; } @@ -718,16 +731,18 @@ demuxer_t *vd,*ad = NULL,*sd = NULL; int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ; int audio_demuxer_type = 0, sub_demuxer_type = 0; + int demuxer_force = 0, audio_demuxer_force = 0, + sub_demuxer_force = 0; demux_aid_vid_mismatch = 0; - if (demuxer_name && ((demuxer_type = get_demuxer_type_from_name(demuxer_name)) < 0)) { + if ((demuxer_type = get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) { mp_msg(MSGT_DEMUXER,MSGL_ERR,"-demuxer %s does not exist.\n",demuxer_name); } - if (audio_demuxer_name && ((audio_demuxer_type = get_demuxer_type_from_name(audio_demuxer_name)) < 0)) { + if ((audio_demuxer_type = get_demuxer_type_from_name(audio_demuxer_name, &audio_demuxer_force)) < 0) { mp_msg(MSGT_DEMUXER,MSGL_ERR,"-audio-demuxer %s does not exist.\n",audio_demuxer_name); } - if (sub_demuxer_name && ((sub_demuxer_type = get_demuxer_type_from_name(sub_demuxer_name)) < 0)) { + if ((sub_demuxer_type = get_demuxer_type_from_name(sub_demuxer_name, &sub_demuxer_force)) < 0) { mp_msg(MSGT_DEMUXER,MSGL_ERR,"-sub-demuxer %s does not exist.\n",sub_demuxer_name); } @@ -754,14 +769,17 @@ } } - vd = demux_open_stream(vs,demuxer_type ? demuxer_type : file_format,audio_stream ? -2 : audio_id,video_id, sub_stream ? -2 : dvdsub_id, filename); + vd = demux_open_stream(vs, demuxer_type ? demuxer_type : file_format, + demuxer_force, audio_stream ? -2 : audio_id, video_id, + sub_stream ? -2 : dvdsub_id, filename); if(!vd) { if(as) free_stream(as); if(ss) free_stream(ss); return NULL; } if(as) { - ad = demux_open_stream(as,audio_demuxer_type ? audio_demuxer_type : afmt,audio_id,-2,-2, audio_stream); + ad = demux_open_stream(as, audio_demuxer_type ? audio_demuxer_type : afmt, + audio_demuxer_force, audio_id, -2, -2, audio_stream); if(!ad) { mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningAudioDemuxerFailed,audio_stream); free_stream(as); @@ -770,7 +788,8 @@ hr_mp3_seek=1; // Enable high res seeking } if(ss) { - sd = demux_open_stream(ss,sub_demuxer_type ? sub_demuxer_type : sfmt,-2,-2,dvdsub_id, sub_stream); + sd = demux_open_stream(ss, sub_demuxer_type ? sub_demuxer_type : sfmt, + sub_demuxer_force, -2, -2, dvdsub_id, sub_stream); if(!sd) { mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningSubtitlesDemuxerFailed,sub_stream); free_stream(ss); Index: demuxer.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- demuxer.h 26 Aug 2005 17:40:02 -0000 1.80 +++ demuxer.h 30 Aug 2005 23:56:24 -0000 1.81 @@ -327,4 +327,4 @@ extern int demuxer_type_by_filename(char* filename); extern void demuxer_help(void); -extern int get_demuxer_type_from_name(char *demuxer_name); +extern int get_demuxer_type_from_name(char *demuxer_name, int *force);

1 0

CVS: main/libmpcodecs dec_audio.c, 1.43, 1.44 dec_video.c, 1.161, 1.162
by syncmail＠mplayerhq.hu 31 Aug '05

31 Aug '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv23706/libmpcodecs Modified Files: dec_audio.c dec_video.c Log Message: Allow forcing of demuxers and codecs by prepending '+' Index: dec_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- dec_audio.c 25 Aug 2005 18:22:12 -0000 1.43 +++ dec_audio.c 30 Aug 2005 23:56:23 -0000 1.44 @@ -119,6 +119,11 @@ int init_audio(sh_audio_t *sh_audio,char* codecname,char* afm,int status){ unsigned int orig_fourcc=sh_audio->wf?sh_audio->wf->wFormatTag:0; + int force = 0; + if (codecname && codecname[0] == '+') { + codecname = &codecname[1]; + force = 1; + } sh_audio->codec=NULL; while(1){ ad_functions_t* mpadec; @@ -126,14 +131,14 @@ sh_audio->ad_driver = 0; // restore original fourcc: if(sh_audio->wf) sh_audio->wf->wFormatTag=i=orig_fourcc; - if(!(sh_audio->codec=find_codec(sh_audio->format, - sh_audio->wf?(&i):NULL, sh_audio->codec,1) )) break; + if(!(sh_audio->codec=find_audio_codec(sh_audio->format, + sh_audio->wf?(&i):NULL, sh_audio->codec, force) )) break; if(sh_audio->wf) sh_audio->wf->wFormatTag=i; // ok we found one codec if(sh_audio->codec->flags&CODECS_FLAG_SELECTED) continue; // already tried & failed if(codecname && strcmp(sh_audio->codec->name,codecname)) continue; // -ac if(afm && strcmp(sh_audio->codec->drv,afm)) continue; // afm doesn't match - if(sh_audio->codec->status<status) continue; // too unstable + if(!force && sh_audio->codec->status<status) continue; // too unstable sh_audio->codec->flags|=CODECS_FLAG_SELECTED; // tagging it // ok, it matches all rules, let's find the driver! for (i=0; mpcodecs_ad_drivers[i] != NULL; i++) Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- dec_video.c 20 Jun 2005 23:07:35 -0000 1.161 +++ dec_video.c 30 Aug 2005 23:56:23 -0000 1.162 @@ -166,19 +166,24 @@ unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0; sh_video->codec=NULL; sh_video->vf_inited=0; + int force = 0; + if (codecname && codecname[0] == '+') { + codecname = &codecname[1]; + force = 1; + } while(1){ int i; // restore original fourcc: if(sh_video->bih) sh_video->bih->biCompression=orig_fourcc; - if(!(sh_video->codec=find_codec(sh_video->format, + if(!(sh_video->codec=find_video_codec(sh_video->format, sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL, - sh_video->codec,0) )) break; + sh_video->codec,force) )) break; // ok we found one codec if(sh_video->codec->flags&CODECS_FLAG_SELECTED) continue; // already tried & failed if(codecname && strcmp(sh_video->codec->name,codecname)) continue; // -vc if(vfm && strcmp(sh_video->codec->drv,vfm)) continue; // vfm doesn't match - if(sh_video->codec->status<status) continue; // too unstable + if(!force && sh_video->codec->status<status) continue; // too unstable sh_video->codec->flags|=CODECS_FLAG_SELECTED; // tagging it // ok, it matches all rules, let's find the driver! for (i=0; mpcodecs_vd_drivers[i] != NULL; i++)

1 0