February 2005 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] fbdev2 positioning
by Balint Marton 27 Feb '05

27 Feb '05

Hi, I made a patch that adds positioning (-geometry +x+y) support to the fbdev2 video output driver. It's quite simple, i don't think it would break anything :) Cus

1 0

Re: [MPlayer-dev-eng] [PATCH] -slave-idle option
by Alexander Strasser 27 Feb '05

27 Feb '05

Oded Shimon wrote ( On Sun, Feb 27, 2005 at 12:38:31PM +0200 ): > On Saturday 26 February 2005 17:29, D Richard Felker III wrote: > > On Sat, Feb 26, 2005 at 04:18:48PM +0100, Alexander Strasser wrote: > > > Should all be changed to idle, as mentioned in the other mail. > > > > yes. > > Done. > Still used 'slave_idle' for the internal variable, because a variable of > "idle" just seems too short... That's no argument. Find a non misleading name for it. Alex (beastd)

3 3

Re: [MPlayer-dev-eng] Re: [PATCH] New video filter: deblendlogo
by Ivo 27 Feb '05

27 Feb '05

On Thursday 24 February 2005 18:08, Oded Shimon wrote: > Adds YV12 support to this deblendlogo filter. > Almost a complete re-write of the original filter. > Unlike original filter, it accepts only a filename, no offset, and the > png image has to be the same res as the video frame. Doing alpha deblending on chroma channels is utter nonsense. It only works if the logo mask is all white, which means there is no chroma, so the unblended chroma is preserved and only the luminance is corrected. With colored logo's this won't work. --Ivo

3 4

Mpeg audio detected incorrectly
by Ed Wildgoose 27 Feb '05

27 Feb '05

Hi, I have noticed that for me at least that handling of audio streams seems to have changed between the last two pre-release versions. For example I have a ripped DVD file (.vob) containing 3 languages including english and previously this would correctly play the english audio track when I specify alang=en in mplayer.conf. However, with pre6 I consistently get the last audio track detected regardless of it's language In order to debug this further, could someone please point me to the right code doing the audio stream detection please? I have had a quick poke around, but I ended up following through some other audio detection stuff (might have been specific to DVD's only...?). Cheers Ed W

1 0

[PATCH] MEncoder Multiple file 2 pass fix
by Oded Shimon 27 Feb '05

27 Feb '05

This patch fixes MEncoder's handling with multiple files and the VE - instead of what was before, that the VE was completely uninited and then re-inited for each file, the VE stays the same the whole time and for that reason can now handle creating 2 pass files gracefully, and doesn't force a keyframe when switching between files, etc... Also the handling with a change between different files' resolution is different, the checking was moved to the VE, as keeping it in mencoder.c is impossible with new set up. Compiled and tested. - ods15

3 8

[PATCH] MEncoder multi-file EOF fix
by Oded Shimon 27 Feb '05

27 Feb '05

I never checked merging 2 complete files... at_eof stays non-zero when starting the second file, and doesn't encode a single frame... - ods15

1 0

[PATCH] Remove auto-inserted lavc if vd init fails
by Zoltan Hidvegi 27 Feb '05

27 Feb '05

When you play mpeg, the first video decoder which matches is mpegpes, mpeg passthrough. If you use any video filters, it will fail of course, but before that, it will try auto-inserting all kinds of filters, and if the vo reports support for mpeg-pes, it will auto-insert the lavc filter. The problem is that this auto-inserted lavc stays in the filter chain even after the mpegpes vd fails, and when the libmpeg2 vd is tried, the lavc filter will still remain in the filter chain. Fine but this all seems to be just a theoretical problem. But the problem is that -vo null supports all formats, so if you play an mpeg with -vo null, and you use any video filters, it will use the lavc filter and mpegpes format for output, which is very slow, so in the end, -vo null will be slower than -vo xv for example. The attached patch removes the auto-inserted lavc if mpcodecs_config_vo fails. OK to commit? Zoli

3 2

[patch] libpostproc fix for negative strides
by Jindrich Makovicka 27 Feb '05

27 Feb '05

Hi, the attached patch fixes libpostproc crashes with negative strides (Bug #191). -- Jindrich Makovicka

4 12

[PATCH] Trivial ac3 skip/resync fix
by Zoltan Hidvegi 27 Feb '05

27 Feb '05

Sometimes when I play ac3 content, mainly from HDTV broadcast, the audio gets garbled up because the ac3 decoder gets out of sync somehow. This usually happens after seeking, the decoder picks up the stream at some bad point, and it cannot recover. Unfortunately I cannot reproduce it now, it does not happen often, but when it happens, it is very annoying. Anyways, I've found a bug which may be the root cause of this, ADCTRL_SKIP_FRAME is broken in ad_liba52 and ad_hwac3. They had a break before the return CONTROL_TRUE statement, so they returned CONTROL_UNKNOWN instead, which triggers some blind skip code. Also neither implements ADCTRL_RESYNC_STREAM. Some other ad_* modules (e.g. ad_mp3lib) implements ADCTRL_RESYNC_STREAM as ADCTRL_SKIP_FRAME, so I've added ADCTRL_RESYNC_STREAM to both ad_liba52 and ad_hwac3 to do the same as ADCTRL_SKIP_FRAME. See attached patch. I'll commit it in a few days if nobody objects. Zoli

1 0

[PATCH] support for changing font size during playback
by compn 27 Feb '05

27 Feb '05

i found this patch in incoming/ and thought i'd post it here. http://mplayerhq.hu/MPlayer/incoming/MPlayer%20Addon%20-%20Dynamicly%20TTF%… i repeat, this is NOT my patch, here is his message/patch: Hello, My name is Korneliusz , i'm write patch (addon) to MPlayer 1.0pre6a with --disable-gui option. This patch add dynamiclly scalling truetype fonts on playing movie . F1 - decrase subtitle font size F2 - increase subtitle font F3 - decrase osd font size F4 - increase osd font F5 - decrase font blur F6 - increase font blur F7 - decrase font outline F8 - increase font outline :) i will be very happy if you add this patch to next relase MPlayer Regrads Korneliusz Jarzebski korneliusz(a)dna.ltd.pl diff -urN MPlayer-1.0pre6a-orginal/input/input.c MPlayer-1.0pre6a-fixed/input/input.c --- MPlayer-1.0pre6a-orginal/input/input.c2004-12-02 14:37:16.000000000 +0000 +++ MPlayer-1.0pre6a-fixed/input/input.c2005-02-12 20:37:32.000000000 +0000 @@ -67,6 +67,10 @@ { MP_CMD_PLAY_ALT_SRC_STEP, "alt_src_step",1, { { MP_CMD_ARG_INT,{0} }, {-1,{0}} } }, { MP_CMD_SUB_DELAY, "sub_delay",1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_SUB_STEP, "sub_step",1, { { MP_CMD_ARG_INT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_SUB_SIZE, "sub_size",1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_SUB_OSD_SIZE, "sub_osd_size",1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_SUB_BLUR, "sub_blur",1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_SUB_OUTLINE, "sub_outline",1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_OSD, "osd",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } }, { MP_CMD_OSD_SHOW_TEXT, "osd_show_text", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, { MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_INT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, @@ -338,6 +342,16 @@ { { 'r', 0 }, "gui_preferences" }, { { 'c', 0 }, "gui_skinbrowser" }, #endif +#ifdef HAVE_FREETYPE + { { KEY_F+1, 0 }, "sub_size -0.2" }, + { { KEY_F+2, 0 }, "sub_size +0.2" }, + { { KEY_F+3, 0 }, "sub_osd_size -0.2" }, + { { KEY_F+4, 0 }, "sub_osd_size +0.2" }, + { { KEY_F+5, 0 }, "sub_blur -0.2" }, + { { KEY_F+6, 0 }, "sub_blur +0.2" }, + { { KEY_F+7, 0 }, "sub_outline -0.2" }, + { { KEY_F+8, 0 }, "sub_outline +0.2" }, +#endif #ifdef HAVE_JOYSTICK { { JOY_AXIS0_PLUS, 0 }, "seek 10" }, { { JOY_AXIS0_MINUS, 0 }, "seek -10" }, diff -urN MPlayer-1.0pre6a-orginal/input/input.h MPlayer-1.0pre6a-fixed/input/input.h --- MPlayer-1.0pre6a-orginal/input/input.h2004-12-02 14:37:16.000000000 +0000 +++ MPlayer-1.0pre6a-fixed/input/input.h2005-02-12 20:38:11.000000000 +0000 @@ -63,6 +63,11 @@ #define MP_CMD_SPEED_SET 59 #define MP_CMD_RUN 60 +#define MP_CMD_SUB_SIZE 4000 +#define MP_CMD_SUB_BLUR 4001 +#define MP_CMD_SUB_OUTLINE 4002 +#define MP_CMD_SUB_OSD_SIZE 4003 + #define MP_CMD_GUI_EVENTS 5000 #define MP_CMD_GUI_LOADFILE 5001 #define MP_CMD_GUI_LOADSUBTITLE 5002 diff -urN MPlayer-1.0pre6a-orginal/libvo/font_load_ft.c MPlayer-1.0pre6a-fixed/libvo/font_load_ft.c --- MPlayer-1.0pre6a-orginal/libvo/font_load_ft.c2004-10-28 01:15:52.000000000 +0000 +++ MPlayer-1.0pre6a-fixed/libvo/font_load_ft.c2005-02-12 20:39:10.000000000 +0000 @@ -41,10 +41,10 @@ char *get_path(char *filename); char *subtitle_font_encoding = NULL; -float text_font_scale_factor = 5.0; -float osd_font_scale_factor = 6.0; -float subtitle_font_radius = 2.0; -float subtitle_font_thickness = 2.0; +float text_font_scale_factor = 2.4; +float osd_font_scale_factor = 2.4; +float subtitle_font_radius = 2.4; +float subtitle_font_thickness = 2.4; // 0 = no autoscale // 1 = video height // 2 = video width diff -urN MPlayer-1.0pre6a-orginal/mplayer.c MPlayer-1.0pre6a-fixed/mplayer.c --- MPlayer-1.0pre6a-orginal/mplayer.c2004-12-21 12:25:58.000000000 +0000 +++ MPlayer-1.0pre6a-fixed/mplayer.c2005-02-12 20:43:00.000000000 +0000 @@ -972,6 +972,10 @@ int osd_show_sub_pos = 0; int osd_show_sub_visibility = 0; int osd_show_sub_alignment = 0; +int osd_show_sub_size = 0; +int osd_show_sub_blur = 0; +int osd_show_sub_outline = 0; +int osd_show_osd_size = 0; int osd_show_vobsub_changed = 0; int osd_show_sub_changed = 0; int osd_show_percentage = 0; @@ -3302,6 +3306,75 @@ } #endif } break; + case MP_CMD_SUB_SIZE: + { +#ifdef HAVE_FREETYPE + if (sh_video) { + float v = cmd->args[0].v.f; + text_font_scale_factor += v; + if (text_font_scale_factor > 5) text_font_scale_factor = 5; + if (text_font_scale_factor < 1) text_font_scale_factor = 1; + force_load_font = 1; +#ifdef USE_OSD + vo_osd_changed(OSDTYPE_SUBTITLE); + osd_show_sub_size = 4; +#endif + } +#endif + } break; + case MP_CMD_SUB_OSD_SIZE: + { +#ifdef HAVE_FREETYPE + if (sh_video) { + float v = cmd->args[0].v.f; + osd_font_scale_factor += v; + if (osd_font_scale_factor > 5) osd_font_scale_factor = 5; + if (osd_font_scale_factor < 1) osd_font_scale_factor = 1; + force_load_font = 1; +#ifdef USE_OSD + float vol; + vo_osd_progbar_type=OSD_VOLUME; + mixer_getbothvolume(&mixer, &vol); + vo_osd_progbar_value=(vol*256.0)/100.0; + vo_osd_changed(OSDTYPE_PROGBAR); + osd_show_osd_size = 4; +#endif + } +#endif + } break; + case MP_CMD_SUB_BLUR: + { +#ifdef HAVE_FREETYPE + if (sh_video) { + float v = cmd->args[0].v.f; + if (subtitle_font_radius < 5 && subtitle_font_radius > 1) subtitle_font_radius += v; + subtitle_font_radius += v; + if (subtitle_font_radius > 5) subtitle_font_radius = 5; + if (subtitle_font_radius < 1) subtitle_font_radius = 1; + force_load_font = 1; +#ifdef USE_OSD + vo_osd_changed(OSDTYPE_SUBTITLE); + osd_show_sub_blur = 4; +#endif + } +#endif + } break; + case MP_CMD_SUB_OUTLINE: + { +#ifdef HAVE_FREETYPE + if (sh_video) { + float v = cmd->args[0].v.f; + subtitle_font_thickness += v; + if (subtitle_font_thickness > 5) subtitle_font_thickness = 5; + if (subtitle_font_thickness < 1) subtitle_font_thickness = 1; + force_load_font = 1; +#ifdef USE_OSD + vo_osd_changed(OSDTYPE_SUBTITLE); + osd_show_sub_outline = 4; +#endif + } +#endif + } break; case MP_CMD_SUB_ALIGNMENT: { #ifdef USE_SUB @@ -3928,6 +4001,24 @@ snprintf(osd_text_tmp, 63, "Sub position: %d/100", sub_pos); osd_show_sub_pos--; } else +#ifdef HAVE_FREETYPE + if (osd_show_osd_size) { + snprintf(osd_text_tmp, 63, "OSD Font size : %0.1f", osd_font_scale_factor); + osd_show_osd_size--; + } else + if (osd_show_sub_size) { + snprintf(osd_text_tmp, 63, "Font size : %0.1f", text_font_scale_factor); + osd_show_sub_size--; + } else + if (osd_show_sub_blur) { + snprintf(osd_text_tmp, 63, "Font blur : %0.1f", subtitle_font_radius); + osd_show_sub_blur--; + } else + if (osd_show_sub_outline) { + snprintf(osd_text_tmp, 63, "Font outline : %0.1f", subtitle_font_thickness); + osd_show_sub_outline--; + } else +#endif if (osd_show_sub_alignment) { snprintf(osd_text_tmp, 63, "Sub alignment: %s", (sub_alignment == 2 ? "bottom" :

2 2