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

CVS: main mencoder.c,1.316,1.317
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv412 Modified Files: mencoder.c Log Message: comment on -noskip patch Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- mencoder.c 23 Oct 2005 07:37:55 -0000 1.316 +++ mencoder.c 23 Oct 2005 15:05:11 -0000 1.317 @@ -1302,6 +1302,11 @@ // unwanted skipping of a frame, what to do? v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; #if 0 + // Old code apparently made under the assumption that !blit_frame means + // decoding failed due to corruption or something.. but duplication and + // skipping of frames should be entirely disabled when skip_limit==0, + // and must be in order for many filters to work with -noskip. + // Eventually this entire block should probably be removed. if(skip_limit==0){ // skipping not allowed -> write empty frame: if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE)

1 0

CVS: main/DOCS/tech osd.txt,1.3,1.4
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv27281/DOCS/tech Modified Files: osd.txt Log Message: spelling/grammar/wording Index: osd.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/osd.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- osd.txt 4 Oct 2003 17:28:53 -0000 1.3 +++ osd.txt 23 Oct 2005 14:49:32 -0000 1.4 @@ -1,50 +1,50 @@ -some draft of new osd engine: -============================= +draft of new OSD engine: +======================== written by A'rpi -including ideas from maillist from Jiri Svoboda, Tobias Diedrich, Artur Zaprzala -Michael Niedermayer, Felix Buenemann, LGB +including ideas from mailing list from Jiri Svoboda, Tobias Diedrich, +Artur Zaprzala, Michael Niedermayer, Felix Buenemann, LGB requirements: - be able to do partial rendering, within a given bounding box - usefull, when parts of osd are outside of teh image and has to be - updated only when osd changes, or even has different colorspace + useful when parts of the OSD are outside of the image and has to be + updated only when OSD changes, or even has different colorspace - text should be rendered in 2-pass way: 1. alpha 2. pixels so char's alpha won't overwrite previous char, and may be faster - -- osd elements should be cached - so rendering once into the cache and + +- OSD elements should be cached - so rendering once into the cache and reuse this while it's unchanged - -- colors support (csp could be YA, YUVA, RGB ) + +- color support (colorspace could be YA, YUVA, RGB) - change brightness, saturation, hue of chars ??? - way to disable alphablending, and use black outline (FAST_OSD now) -- respect movie and monitor aspect, so osd is rendered/scaled correctly - eg. for svcd/anamorphic dvd with hardware scaling (now OSD is squashed) +- respect movie and monitor aspect, so OSD is rendered/scaled correctly + eg. for SVCD/anamorphic DVD with hardware scaling (now OSD is squashed) - develop some text-based apps: osdterm, osdzilla etc ;) -Ok. The basic idea of my design is using 'osd objects', a data structure +Ok. The basic idea of my design is using 'OSD objects', a data structure in a 1 (or 2?) way linked list. -There would be different object types, sharing type-dependent data in an +There would be different object types, sharing type-dependent data in a union. The basic types: box, text, symbol, progressbar, group. -Group would be a special type, grouping other osd objects together, -with a common x,y and boundingbox. usefull for grouping symbol+progrbar +Group would be a special type, grouping other OSD objects together, +with a common x,y and boundingbox. Useful for grouping symbol+progrbar or multiline subtitle text. -Each obj could have flags, for example: +Each object could have flags, for example: - visible (set if we should display it) - color (set if it's YUVA not YA) - cached (set when there is a cached rendered variant) - bbox updated (should be set when recalc bbox, reset when change params) - several flags to control positioning. for example, x;y could be - absolute coord, or percent. flags to set left/center/right alignment... + absolute coordinates, or percent. flags to set left/center/right alignment... - start and end timestamp, to automagically set/reset visible flag -ok, my first draft: +OK, my first draft: typedef struct mp_osd_obj_s { struct mp_osd_obj_s* next;

1 0

CVS: main configure,1.1091,1.1092
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv17319 Modified Files: configure Log Message: support for prescott, nocona and pentium-m processors based on a patch by Corey Hickey < bugfood-ml . at . fatooh . dot . org > Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1091 retrieving revision 1.1092 diff -u -r1.1091 -r1.1092 --- configure 23 Oct 2005 13:13:12 -0000 1.1091 +++ configure 23 Oct 2005 13:55:23 -0000 1.1092 @@ -870,7 +870,9 @@ fi ;; 6) iproc=686 - if test "$pmodel" -ge 7; then + if test "$pmodel" -eq 9 -o "$pmodel" -eq 13; then + proc=pentium-m + elif test "$pmodel" -ge 7; then proc=pentium3 elif test "$pmodel" -ge 3; then proc=pentium2 @@ -878,8 +880,15 @@ proc=i686 fi ;; - 15) proc=pentium4 iproc=686 ;; - *) proc=pentium4 iproc=686 ;; + 15) iproc=686 + # A nocona in 32-bit mode has no more capabilities than a prescott. + if test "$pmodel" -ge 3; then + proc=prescott + else + proc=pentium4 + fi + ;; + *) proc=prescott iproc=686 ;; esac ;; CentaurHauls) @@ -952,7 +961,7 @@ fi fi fi - if test "$proc" = "pentium4" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon" || test "$proc" = "c3-2"; then + if test "$proc" = "pentium4" || test "$proc" = "pentium-m" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon" || test "$proc" = "c3-2"; then cc_check -march=$proc $cpuopt=$proc || proc=i686 fi if test "$proc" = "i686" || test "$proc" = "pentium-mmx" || test "$proc" = "winchip-c6" || test "$proc" = "winchip2"; then @@ -968,7 +977,7 @@ cc_check -march=$proc $cpuopt=$proc || proc=error fi if test "$proc" = "error" ; then - echores "Your $_cc does not even support \"i386\" for '-march' and '$cpuopt'." + echores "CPU optimization disabled.\nYou have an old compiler and/or configure does not recognize your CPU." _mcpu="" _march="" _optimizing="" @@ -1037,9 +1046,16 @@ else cpuopt=-mcpu fi - # k8 cpu-type only supported in gcc >= 3.4.0, but that will be - # caught and remedied in the optimization tests below. - proc=k8 + case "$pvendor" in + AuthenticAMD) + proc=k8;; + GenuineIntel) + # 64-bit prescotts exist, but as far as GCC is concerned they have the + # same capabilities as a nocona. + proc=nocona;; + *) + proc=error;; + esac echocheck "GCC & CPU optimization abilities" cat > $TMPC << EOF @@ -1047,6 +1063,7 @@ EOF # This is a stripped-down version of the i386 fallback. if test "$_runtime_cpudetection" = no ; then + # --- AMD processors --- if test "$proc" = "k8" -o "$proc" = "opteron" -o "$proc" = "athlon64" -o "$proc" = "athlon-fx" ; then cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp fi @@ -1056,10 +1073,18 @@ if test "$proc" = "athlon-xp" || test "$proc" = "athlon-4" ; then cc_check -march=$proc $cpuopt=$proc || proc=error fi + # --- Intel processors --- + if test "$proc" = "nocona" || test "$proc" = "prescott" ; then + cc_check -march=$proc $cpuopt=$proc || proc=pentium4 + fi + if test "$proc" = "pentium4" || test "$proc" = "pentium4m" ; then + cc_check -march=$proc $cpuopt=$proc || proc=error + fi + _march="-march=$proc" _mcpu="$cpuopt=$proc" if test "$proc" = "error" ; then - echores "Your $_cc does not even support \"athlon-xp\" for '-march' and '$cpuopt'." + echores "CPU optimization disabled.\nYou have an old compiler and/or configure does not recognize your CPU." _mcpu="" _march="" fi

1 0

CVS: main configure,1.1090,1.1091
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv25457 Modified Files: configure Log Message: Add a comment to an esac where the case is very far away. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1090 retrieving revision 1.1091 diff -u -r1.1090 -r1.1091 --- configure 23 Oct 2005 12:39:47 -0000 1.1090 +++ configure 23 Oct 2005 13:13:12 -0000 1.1091 @@ -1326,7 +1326,7 @@ echo "It seems nobody has ported MPlayer to your OS or CPU type yet." die "unsupported architecture $host_arch" ;; -esac +esac # case "$host_arch" in if test "$_runtime_cpudetection" = yes ; then if x86; then

1 0

CVS: main configure,1.1088,1.1089
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv10110 Modified Files: configure Log Message: Add a comment to else clauses where the if is very far away. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1088 retrieving revision 1.1089 diff -u -r1.1088 -r1.1089 --- configure 18 Oct 2005 21:48:09 -0000 1.1088 +++ configure 23 Oct 2005 11:26:36 -0000 1.1089 @@ -540,7 +540,7 @@ esac ;; esac -else +else # if test -z "$_target" system_name=`echo $_target | cut -d '-' -f 2` case "`echo $system_name | tr A-Z a-z`" in linux) system_name=Linux ;; @@ -984,7 +984,7 @@ _mcpu="$cpuopt=$proc" _optimizing="$proc" fi - else + else # if test "$_runtime_cpudetection" = no # i686 is probably the most common CPU - optimize for it _mcpu="$cpuopt=i686" # at least i486 required, for bswap instruction

1 0

CVS: main mencoder.c,1.315,1.316
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv8650 Modified Files: mencoder.c Log Message: honor decoder's/filter's decision to remove frames when using -noskip. this may go against the original intention of the vf layer, but it's how all the filters that drop frames have been written to work, so it's now the de-facto standard. without this patch, -noskip will result in tons of duplicate frames (either soft or hard duplicates) and a/v desync whenever decimation, ivtc, etc. is used. even with this patch -noskip is still a bad idea for most of these purposes, but it will work reliably with filmdint, framestep, and some other filters with fixed in:out ratios as long as the right -ofps value is used. without this patch, there is no hope of -noskip working with frame-dropping filters. (this patch was previously committed erroneously as part of another change, then reversed. it is now being committed again.) Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- mencoder.c 23 Oct 2005 07:32:35 -0000 1.315 +++ mencoder.c 23 Oct 2005 07:37:55 -0000 1.316 @@ -1300,6 +1300,8 @@ badframes++; if(skip_flag<=0){ // unwanted skipping of a frame, what to do? + v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; +#if 0 if(skip_limit==0){ // skipping not allowed -> write empty frame: if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE) @@ -1308,6 +1310,7 @@ // skipping allowed -> skip it and distriubute timer error: v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; } +#endif } } }

2 1

CVS: main mencoder.c,1.314,1.315
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv27278 Modified Files: mencoder.c Log Message: reapply rawaudio muxer fix (don't disable audio without user's permission!) (previously reversed because of mistake in patch.. 10l to me :) Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- mencoder.c 23 Oct 2005 07:30:56 -0000 1.314 +++ mencoder.c 23 Oct 2005 07:32:35 -0000 1.315 @@ -582,10 +582,6 @@ mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_ForcingInputFPS, sh_video->fps); } - if(sh_audio && out_file_format==MUXER_TYPE_RAWVIDEO){ - mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_RawvideoDoesNotSupportAudio); - sh_audio=NULL; - } if(sh_audio && out_audio_codec<0){ if(audio_id==-2) mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_DemuxerDoesntSupportNosound);

1 0

CVS: main mencoder.c,1.313,1.314
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv7374 Modified Files: mencoder.c Log Message: reverse patch that was mistakenly applied with unwanted unrelated changes Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- mencoder.c 20 Oct 2005 05:54:51 -0000 1.313 +++ mencoder.c 23 Oct 2005 07:30:56 -0000 1.314 @@ -582,6 +582,10 @@ mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_ForcingInputFPS, sh_video->fps); } + if(sh_audio && out_file_format==MUXER_TYPE_RAWVIDEO){ + mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_RawvideoDoesNotSupportAudio); + sh_audio=NULL; + } if(sh_audio && out_audio_codec<0){ if(audio_id==-2) mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_DemuxerDoesntSupportNosound); @@ -1300,8 +1304,6 @@ badframes++; if(skip_flag<=0){ // unwanted skipping of a frame, what to do? - v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; -#if 0 if(skip_limit==0){ // skipping not allowed -> write empty frame: if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE) @@ -1310,7 +1312,6 @@ // skipping allowed -> skip it and distriubute timer error: v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; } -#endif } } }

1 0

CVS: main mencoder.c,1.311,1.312
by syncmail＠mplayerhq.hu 22 Oct '05

22 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv4577 Modified Files: mencoder.c Log Message: processing audio is sometimes essential for a/v sync, so 1000l to whoever made rawvideo muxer disable audio!! with this patch, audio is processed but simply thrown away by the muxer. various 'error' conditions in rawvideo muxer are removed to make it work. feel free to re-add them if they can be done without breaking anything, but do not use printf !!!! btw old behavior can be obtained by manually specifying -nosound. Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- mencoder.c 16 Oct 2005 19:14:08 -0000 1.311 +++ mencoder.c 19 Oct 2005 05:44:27 -0000 1.312 @@ -580,10 +580,6 @@ mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_ForcingInputFPS, sh_video->fps); } - if(sh_audio && out_file_format==MUXER_TYPE_RAWVIDEO){ - mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_RawvideoDoesNotSupportAudio); - sh_audio=NULL; - } if(sh_audio && out_audio_codec<0){ if(audio_id==-2) mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_DemuxerDoesntSupportNosound); @@ -1302,6 +1298,8 @@ badframes++; if(skip_flag<=0){ // unwanted skipping of a frame, what to do? + v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; +#if 0 if(skip_limit==0){ // skipping not allowed -> write empty frame: if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE) @@ -1310,6 +1308,7 @@ // skipping allowed -> skip it and distriubute timer error: v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; } +#endif } } }

4 7

CVS: main/etc codecs.conf,1.435,1.436
by syncmail＠mplayerhq.hu 22 Oct '05

22 Oct '05

CVS change done by Ivan Kalvachev CVS Update of /cvsroot/mplayer/main/etc In directory mail:/var2/tmp/cvs-serv22298 Modified Files: codecs.conf Log Message: Support for video files created by Samsung Miniket VP-M100 diskless camcorder initial patch by Georgi Chorbadzhiyski <gf(a)unixsol.org> Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.435 retrieving revision 1.436 diff -u -r1.435 -r1.436 --- codecs.conf 18 Oct 2005 20:18:28 -0000 1.435 +++ codecs.conf 22 Oct 2005 13:53:18 -0000 1.436 @@ -528,6 +528,7 @@ fourcc UMP4 fourcc 3IV2,3iv2 ; 3ivx Delta 4 fourcc DXGM + fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110 format 0x10000004 ; mpeg 4 es driver ffmpeg dll mpeg4 ;opendivx

1 0