November 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r35544 - in trunk/gui: interface.h skin/skin.c ui/gtk/equalizer.c ui/gtk/msgbox.c ui/gtk/playlist.c ui/gtk/skinbrowser.c ui/menu.c ui/playbar.c ui/render.c ui/video.c ui/widgets.h win32/gui.c win32...
by ib 30 Nov '12

30 Nov '12

Author: ib Date: Sat Dec 1 00:30:47 2012 New Revision: 35544 Log: Don't include config.h if not necessary. Modified: trunk/gui/interface.h trunk/gui/skin/skin.c trunk/gui/ui/gtk/equalizer.c trunk/gui/ui/gtk/msgbox.c trunk/gui/ui/gtk/playlist.c trunk/gui/ui/gtk/skinbrowser.c trunk/gui/ui/menu.c trunk/gui/ui/playbar.c trunk/gui/ui/render.c trunk/gui/ui/video.c trunk/gui/ui/widgets.h trunk/gui/win32/gui.c trunk/gui/win32/gui.h trunk/gui/wm/ws.h Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/interface.h Sat Dec 1 00:30:47 2012 (r35544) @@ -19,7 +19,6 @@ #ifndef MPLAYER_GUI_INTERFACE_H #define MPLAYER_GUI_INTERFACE_H -#include "config.h" #include "libaf/af.h" #include "libmpdemux/stheader.h" #include "m_config.h" Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/skin/skin.c Sat Dec 1 00:30:47 2012 (r35544) @@ -32,7 +32,6 @@ #include "gui/util/cut.h" #include "gui/util/string.h" -#include "config.h" #include "help_mp.h" #include "libavutil/avstring.h" #include "libavutil/common.h" Modified: trunk/gui/ui/gtk/equalizer.c ============================================================================== --- trunk/gui/ui/gtk/equalizer.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/gtk/equalizer.c Sat Dec 1 00:30:47 2012 (r35544) @@ -26,7 +26,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "config.h" #include "gui/app.h" #include "gui/cfg.h" #include "gui/interface.h" Modified: trunk/gui/ui/gtk/msgbox.c ============================================================================== --- trunk/gui/ui/gtk/msgbox.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/gtk/msgbox.c Sat Dec 1 00:30:47 2012 (r35544) @@ -18,7 +18,6 @@ #include <string.h> -#include "config.h" #include "gui/app.h" #include "help_mp.h" Modified: trunk/gui/ui/gtk/playlist.c ============================================================================== --- trunk/gui/ui/gtk/playlist.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/gtk/playlist.c Sat Dec 1 00:30:47 2012 (r35544) @@ -27,7 +27,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "config.h" #include "help_mp.h" #include "stream/stream.h" Modified: trunk/gui/ui/gtk/skinbrowser.c ============================================================================== --- trunk/gui/ui/gtk/skinbrowser.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/gtk/skinbrowser.c Sat Dec 1 00:30:47 2012 (r35544) @@ -23,7 +23,6 @@ #include <stdlib.h> #include <stdio.h> -#include "config.h" #include "skinbrowser.h" #include "tools.h" Modified: trunk/gui/ui/menu.c ============================================================================== --- trunk/gui/ui/menu.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/menu.c Sat Dec 1 00:30:47 2012 (r35544) @@ -23,7 +23,6 @@ #include <stdint.h> #include <string.h> -#include "config.h" #include "help_mp.h" #include "mp_msg.h" #include "gui/app.h" Modified: trunk/gui/ui/playbar.c ============================================================================== --- trunk/gui/ui/playbar.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/playbar.c Sat Dec 1 00:30:47 2012 (r35544) @@ -24,7 +24,6 @@ #include <unistd.h> #include <string.h> -#include "config.h" #include "gui/app.h" #include "gui/interface.h" #include "gui/skin/font.h" Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/render.c Sat Dec 1 00:30:47 2012 (r35544) @@ -28,7 +28,6 @@ #include "access_mpcontext.h" #include "codec-cfg.h" -#include "config.h" #include "libavutil/avstring.h" #include "libmpdemux/stheader.h" #include "mixer.h" Modified: trunk/gui/ui/video.c ============================================================================== --- trunk/gui/ui/video.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/video.c Sat Dec 1 00:30:47 2012 (r35544) @@ -20,7 +20,6 @@ #include <string.h> -#include "config.h" #include "libvo/x11_common.h" #include "help_mp.h" #include "mp_core.h" Modified: trunk/gui/ui/widgets.h ============================================================================== --- trunk/gui/ui/widgets.h Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/ui/widgets.h Sat Dec 1 00:30:47 2012 (r35544) @@ -26,7 +26,6 @@ #include <X11/Xlib.h> #include <X11/Xproto.h> -#include "config.h" #include "osdep/shmem.h" #include "actions.h" #include "mplayer.h" Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/win32/gui.c Sat Dec 1 00:30:47 2012 (r35544) @@ -29,6 +29,7 @@ #include <windowsx.h> #include <shlobj.h> +#include "config.h" #include "mpcommon.h" #include "mplayer.h" #include "mp_fifo.h" Modified: trunk/gui/win32/gui.h ============================================================================== --- trunk/gui/win32/gui.h Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/win32/gui.h Sat Dec 1 00:30:47 2012 (r35544) @@ -24,7 +24,6 @@ #ifndef MPLAYER_GUI_GUI_H #define MPLAYER_GUI_GUI_H -#include "config.h" #include "mplayer.h" #include "playtree.h" #include "m_config.h" Modified: trunk/gui/wm/ws.h ============================================================================== --- trunk/gui/wm/ws.h Fri Nov 30 23:16:16 2012 (r35543) +++ trunk/gui/wm/ws.h Sat Dec 1 00:30:47 2012 (r35544) @@ -23,6 +23,7 @@ #define MPLAYER_GUI_WS_H #include "gui/ui/widgets.h" +#include "config.h" #include <X11/Xlib.h> #include <X11/Xutil.h>

1 0

r35543 - trunk/libmpdemux/demuxer.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 23:16:16 2012 New Revision: 35543 Log: Make stream eof detection less sensitive. Fixes bug #2111. Modified: trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Fri Nov 30 23:12:17 2012 (r35542) +++ trunk/libmpdemux/demuxer.c Fri Nov 30 23:16:16 2012 (r35543) @@ -710,7 +710,10 @@ int ds_fill_buffer(demux_stream_t *ds) // avoid buffering too far ahead in e.g. badly interleaved files // or when one stream is shorter, without breaking large audio // delay with well interleaved files. - if (ds->fill_count > 20) + // This needs to be enough for at least 1 second of packets + // since libavformat mov demuxer does not try to interleave + // with more than 1s precision. + if (ds->fill_count > 80) break; // avoid printing the "too many ..." message over and over if (ds->eof)

1 0

r35542 - in trunk/libmpdemux: demux_demuxers.c demuxer.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 23:12:17 2012 New Revision: 35542 Log: Fix scary "BUG! Invalid demuxer type ..." message when using -audiofile or -subfile. Modified: trunk/libmpdemux/demux_demuxers.c trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demux_demuxers.c ============================================================================== --- trunk/libmpdemux/demux_demuxers.c Fri Nov 30 22:31:14 2012 (r35541) +++ trunk/libmpdemux/demux_demuxers.c Fri Nov 30 23:12:17 2012 (r35542) @@ -66,8 +66,6 @@ demuxer_t* new_demuxers_demuxer(demuxer memcpy(ret->a_streams, ad->a_streams, sizeof(ret->a_streams)); memcpy(ret->s_streams, sd->s_streams, sizeof(ret->s_streams)); - ret->desc = &demuxer_desc_demuxers; - return ret; } Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Fri Nov 30 22:31:14 2012 (r35541) +++ trunk/libmpdemux/demuxer.c Fri Nov 30 23:12:17 2012 (r35542) @@ -108,6 +108,9 @@ extern const demuxer_desc_t demuxer_desc extern const demuxer_desc_t demuxer_desc_nut; extern const demuxer_desc_t demuxer_desc_mng; +// never add this to the list +extern const demuxer_desc_t demuxer_desc_demuxers; + /* Please do not add any new demuxers here. If you want to implement a new * demuxer, add it to libavformat, except for wrappers around external * libraries and demuxers requiring binary support. */ @@ -214,6 +217,8 @@ demux_stream_t *new_demuxer_stream(struc static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format) { int i; + if (file_format == DEMUXER_TYPE_DEMUXERS) + return &demuxer_desc_demuxers; for (i = 0; demuxer_list[i]; i++) if (file_format == demuxer_list[i]->type)

1 0

r35541 - trunk/libmpdemux/demux_lavf.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 22:31:14 2012 New Revision: 35541 Log: demux_lavf: support subtitle-only formats. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Fri Nov 30 22:22:32 2012 (r35540) +++ trunk/libmpdemux/demux_lavf.c Fri Nov 30 22:31:14 2012 (r35541) @@ -595,6 +595,7 @@ static demuxer_t* demux_open_lavf(demuxe if(!priv->video_streams){ if(!priv->audio_streams){ mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n"); + if (!priv->sub_streams) return NULL; } demuxer->video->id=-2; // audio-only

1 0

r35540 - trunk/command.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 22:22:32 2012 New Revision: 35540 Log: Display correct subtitle language for demux_lavf. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Fri Nov 30 21:51:02 2012 (r35539) +++ trunk/command.c Fri Nov 30 22:22:32 2012 (r35540) @@ -1492,7 +1492,12 @@ static int mp_property_sub(m_option_t *p } if (dvdsub_id >= 0) { char lang[40] = MSGTR_Unknown; - demuxer_sub_lang(mpctx->demuxer, dvdsub_id, lang, sizeof(lang)); + int id = dvdsub_id; + // HACK: for DVDs sub->sh/id will be invalid until + // we actually get the first packet + if (d_sub && d_sub->sh) + id = d_sub->id; + demuxer_sub_lang(mpctx->demuxer, id, lang, sizeof(lang)); snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang); return M_PROPERTY_OK; }

1 0

r35539 - trunk/libvo/vo_gl.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 21:51:02 2012 New Revision: 35539 Log: Fix alpha for ASS subtitles. EOSD always needs to use MODULATE since the vertex colour might contain alpha. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Fri Nov 30 21:11:58 2012 (r35538) +++ trunk/libvo/vo_gl.c Fri Nov 30 21:51:02 2012 (r35539) @@ -824,14 +824,16 @@ static void do_render_osd(int type) { mpglPushMatrix(); mpglLoadMatrixf(matrix); } - if (osd_color != 0xffffff) - mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); mpglEnable(GL_BLEND); if (draw_eosd) { + mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); mpglCallList(eosdDispList); + mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); } if (draw_osd) { + if (osd_color != 0xffffff) + mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); // draw OSD #ifndef FAST_OSD @@ -850,11 +852,11 @@ static void do_render_osd(int type) { mpglBindTexture(gl_target, osdtex[i]); glDrawTex(c->x, c->y, c->w, c->h, 0, 0, c->w, c->h, c->sx, c->sy, using_tex_rect, 0, 0, 0); } + if (osd_color != 0xffffff) + mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); } // set rendering parameters back to defaults mpglDisable(GL_BLEND); - if (osd_color != 0xffffff) - mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); if (!scaled_osd) mpglPopMatrix(); mpglBindTexture(gl_target, 0);

1 0

r35538 - trunk/libaf/af_format.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 21:11:58 2012 New Revision: 35538 Log: af_format: support endianness conversion also for iec61937 formats in general, not just AC3. Modified: trunk/libaf/af_format.c Modified: trunk/libaf/af_format.c ============================================================================== --- trunk/libaf/af_format.c Fri Nov 30 21:10:40 2012 (r35537) +++ trunk/libaf/af_format.c Fri Nov 30 21:11:58 2012 (r35538) @@ -94,14 +94,23 @@ static int control(struct af_instance_s* char buf1[256]; char buf2[256]; af_data_t *data = arg; + int supported_ac3 = 0; // Make sure this filter isn't redundant if(af->data->format == data->format && af->data->bps == data->bps) return AF_DETACH; + // A bit complex because we can convert AC3 + // to generic iec61937 but not the other way + // round. + if (AF_FORMAT_IS_AC3(af->data->format)) + supported_ac3 = AF_FORMAT_IS_AC3(data->format); + else if (AF_FORMAT_IS_IEC61937(af->data->format)) + supported_ac3 = AF_FORMAT_IS_IEC61937(data->format); + // Allow trivial AC3-endianness conversion - if (!AF_FORMAT_IS_AC3(af->data->format) || !AF_FORMAT_IS_AC3(data->format)) + if (!supported_ac3) // Check for errors in configuration if((AF_OK != check_bps(data->bps)) || (AF_OK != check_format(data->format)) ||

1 0

r35537 - in trunk: libaf/af_format.h libao2/ao_alsa.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 21:10:40 2012 New Revision: 35537 Log: Make AF_FORMAT_IS_IEC61937 include AF_FORMAT_IS_AC3. Our AC3 "sample format" is also iec61937. Modified: trunk/libaf/af_format.h trunk/libao2/ao_alsa.c Modified: trunk/libaf/af_format.h ============================================================================== --- trunk/libaf/af_format.h Fri Nov 30 21:08:29 2012 (r35536) +++ trunk/libaf/af_format.h Fri Nov 30 21:10:40 2012 (r35537) @@ -115,7 +115,7 @@ #define AF_FORMAT_UNKNOWN (-1) #define AF_FORMAT_IS_AC3(fmt) (((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) -#define AF_FORMAT_IS_IEC61937(fmt) (((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_IEC61937) +#define AF_FORMAT_IS_IEC61937(fmt) (AF_FORMAT_IS_AC3(fmt) || ((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_IEC61937) int af_str2fmt(const char *str); int af_str2fmt_short(const char *str); Modified: trunk/libao2/ao_alsa.c ============================================================================== --- trunk/libao2/ao_alsa.c Fri Nov 30 21:08:29 2012 (r35536) +++ trunk/libao2/ao_alsa.c Fri Nov 30 21:10:40 2012 (r35537) @@ -111,7 +111,7 @@ static int control(int cmd, void *arg) long get_vol, set_vol; float f_multi; - if(AF_FORMAT_IS_AC3(ao_data.format) || AF_FORMAT_IS_IEC61937(ao_data.format)) + if(AF_FORMAT_IS_IEC61937(ao_data.format)) return CONTROL_TRUE; if(mixer_channel) { @@ -410,7 +410,7 @@ static int init(int rate_hz, int channel * while opening the abstract alias for the spdif subdevice * 'iec958' */ - if (AF_FORMAT_IS_AC3(format) || AF_FORMAT_IS_IEC61937(format)) { + if (AF_FORMAT_IS_IEC61937(format)) { device.str = "iec958"; mp_msg(MSGT_AO,MSGL_V,"alsa-spdif-init: playing AC3/iec61937/iec958, %i channels\n", channels); } @@ -461,7 +461,7 @@ static int init(int rate_hz, int channel if (!alsa_handler) { int open_mode = block ? 0 : SND_PCM_NONBLOCK; - int isac3 = AF_FORMAT_IS_AC3(format) || AF_FORMAT_IS_IEC61937(format); + int isac3 = AF_FORMAT_IS_IEC61937(format); //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC mp_msg(MSGT_AO,MSGL_V,"alsa-init: opening device in %sblocking mode\n", block ? "" : "non-"); if ((err = try_open_device(alsa_device, open_mode, isac3)) < 0)

1 0

r35536 - trunk/libmpcodecs/ad_spdif.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 21:08:29 2012 New Revision: 35536 Log: ad_spdif: use the more specific AF_FORMAT_AC3_LE when we handle AC3. Modified: trunk/libmpcodecs/ad_spdif.c Modified: trunk/libmpcodecs/ad_spdif.c ============================================================================== --- trunk/libmpcodecs/ad_spdif.c Fri Nov 30 20:30:07 2012 (r35535) +++ trunk/libmpcodecs/ad_spdif.c Fri Nov 30 21:08:29 2012 (r35536) @@ -169,7 +169,7 @@ static int init(sh_audio_t *sh) break; case CODEC_ID_AC3: spdif_ctx->iec61937_packet_size = 6144; - sh->sample_format = AF_FORMAT_IEC61937_LE; + sh->sample_format = AF_FORMAT_AC3_LE; sh->samplerate = srate; sh->channels = 2; sh->i_bps = bps;

1 0

r35535 - trunk/libaf/af_format.c
by reimar 30 Nov '12

30 Nov '12

Author: reimar Date: Fri Nov 30 20:30:07 2012 New Revision: 35535 Log: Do not call af_fmt2str on the same data over and over. Modified: trunk/libaf/af_format.c Modified: trunk/libaf/af_format.c ============================================================================== --- trunk/libaf/af_format.c Fri Nov 30 20:25:20 2012 (r35534) +++ trunk/libaf/af_format.c Fri Nov 30 20:30:07 2012 (r35535) @@ -109,9 +109,10 @@ static int control(struct af_instance_s* (AF_OK != check_format(af->data->format))) return AF_ERROR; + af_fmt2str(data->format,buf1,256); + af_fmt2str(af->data->format,buf2,256); mp_msg(MSGT_AFILTER, MSGL_V, "[format] Changing sample format from %s to %s\n", - af_fmt2str(data->format,buf1,256), - af_fmt2str(af->data->format,buf2,256)); + buf1, buf2); af->data->rate = data->rate; af->data->nch = data->nch; @@ -130,16 +131,14 @@ static int control(struct af_instance_s* (af->data->format == AF_FORMAT_S16_NE)) { mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated %s to %s conversion\n", - af_fmt2str(data->format,buf1,256), - af_fmt2str(af->data->format,buf2,256)); + buf1, buf2); af->play = play_float_s16; } if ((data->format == AF_FORMAT_S16_NE) && (af->data->format == AF_FORMAT_FLOAT_NE)) { mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated %s to %s conversion\n", - af_fmt2str(data->format,buf1,256), - af_fmt2str(af->data->format,buf2,256)); + buf1, buf2); af->play = play_s16_float; } return AF_OK;

1 0