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

r34959 - trunk/gui/ui/gtk/fileselect.c
by ib 22 May '12

22 May '12

Author: ib Date: Tue May 22 11:32:16 2012 New Revision: 34959 Log: Fix wrong (too large) height of filter combo box. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Tue May 22 02:59:41 2012 (r34958) +++ trunk/gui/ui/gtk/fileselect.c Tue May 22 11:32:16 2012 (r34959) @@ -716,6 +716,7 @@ GtkWidget * create_FileSelect( void ) gtk_widget_set_name( fsFilterCombo,"fsFilterCombo" ); gtk_widget_show( fsFilterCombo ); gtk_entry_set_editable (GTK_ENTRY( fsFilterCombo ),FALSE ); + gtk_widget_set_usize( fsFilterCombo,-2,20 ); AddHSeparator( vbox4 );

1 0

r34957 - in trunk: debian/mplayer-gui.mime debian/mplayer.mime etc/mplayer.desktop gui/ui/gtk/fileselect.c
by ib 21 May '12

21 May '12

Author: ib Date: Tue May 22 00:56:37 2012 New Revision: 34957 Log: Add Windows Media Station file (application/x-netshow-channel) support. Modified: trunk/debian/mplayer-gui.mime trunk/debian/mplayer.mime trunk/etc/mplayer.desktop trunk/gui/ui/gtk/fileselect.c Modified: trunk/debian/mplayer-gui.mime ============================================================================== --- trunk/debian/mplayer-gui.mime Mon May 21 22:53:55 2012 (r34956) +++ trunk/debian/mplayer-gui.mime Tue May 22 00:56:37 2012 (r34957) @@ -1,4 +1,5 @@ application/mxf; /usr/bin/gmplayer %s; description="MXF video" +application/x-netshow-channel; /usr/bin/gmplayer %s; description="Windows Media Station file" application/ogg; /usr/bin/gmplayer %s; description="Ogg multimedia file" application/ram; /usr/bin/gmplayer %s; description="RealMedia Metafile" application/vnd.rn-realmedia; /usr/bin/gmplayer %s; description="RealMedia document" Modified: trunk/debian/mplayer.mime ============================================================================== --- trunk/debian/mplayer.mime Mon May 21 22:53:55 2012 (r34956) +++ trunk/debian/mplayer.mime Tue May 22 00:56:37 2012 (r34957) @@ -1,4 +1,5 @@ application/mxf; /usr/bin/mplayer %s; description="MXF video" +application/x-netshow-channel; /usr/bin/mplayer %s; description="Windows Media Station file" application/ogg; /usr/bin/mplayer %s; description="Ogg multimedia file" application/ram; /usr/bin/mplayer %s; description="RealMedia Metafile" application/vnd.rn-realmedia; /usr/bin/mplayer %s; description="RealMedia document" Modified: trunk/etc/mplayer.desktop ============================================================================== --- trunk/etc/mplayer.desktop Mon May 21 22:53:55 2012 (r34956) +++ trunk/etc/mplayer.desktop Tue May 22 00:56:37 2012 (r34957) @@ -27,4 +27,4 @@ TryExec=gmplayer Exec=gmplayer %F Terminal=false Categories=GTK;AudioVideo;Audio;Video;Player;TV; -MimeType=application/mxf;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm; +MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm; Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 22:53:55 2012 (r34956) +++ trunk/gui/ui/gtk/fileselect.c Tue May 22 00:56:37 2012 (r34957) @@ -77,7 +77,7 @@ char * fsVideoFilterNames[][2] = { MSGTR_Filter_VideoCDImages, "*.bin" }, { MSGTR_Filter_WAVFiles, "*.wav" }, { MSGTR_Filter_WindowsMedia, "*.asf,*.wma,*.wmv" }, - { MSGTR_Filter_Playlists, "*.asx,*.m3u,*.m3u8,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, + { MSGTR_Filter_Playlists, "*.asx,*.m3u,*.m3u8,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, { MSGTR_Filter_AllAudioFiles, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, { MSGTR_Filter_AllVideoFiles, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv" }, { MSGTR_Filter_AllFiles, "*" },

1 0

r34956 - in trunk: gui/ui/gtk/fileselect.c help/help_mp-de.h help/help_mp-en.h
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 22:53:55 2012 New Revision: 34956 Log: Revise UTF-8 encoded subtitle file filter for file selector. Modified: trunk/gui/ui/gtk/fileselect.c Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 22:32:55 2012 (r34955) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 22:53:55 2012 (r34956) @@ -96,7 +96,7 @@ char * fsSubtitleFilterNames[][2] = { "SubStation Alpha (*.ssa)", "*.ssa" }, { "MicroDVD (*.sub)", "*.sub" }, { "Text (*.txt)", "*.txt" }, - { "UTF (*.utf)", "*.utf" }, + { MSGTR_Filter_UTF8Subtitles, "*.utf,*.utf-8,*.utf8" }, { MSGTR_Filter_AllSubtitles, "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" }, { MSGTR_Filter_AllFiles, "*" }, { NULL,NULL }

1 0

r34955 - trunk/gui/ui/gtk/fileselect.c
by ib 21 May '12

21 May '12

Author: ib Date: Mon May 21 22:32:55 2012 New Revision: 34955 Log: Remove extensions .rmj and .rmm from playlist filter for file selector. The freedesktop.org shared MIME info database associates these with MIME type application/vnd.rn-realmedia which is the type for Real Media files (and no playlist type). Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Mon May 21 22:21:32 2012 (r34954) +++ trunk/gui/ui/gtk/fileselect.c Mon May 21 22:32:55 2012 (r34955) @@ -77,7 +77,7 @@ char * fsVideoFilterNames[][2] = { MSGTR_Filter_VideoCDImages, "*.bin" }, { MSGTR_Filter_WAVFiles, "*.wav" }, { MSGTR_Filter_WindowsMedia, "*.asf,*.wma,*.wmv" }, - { MSGTR_Filter_Playlists, "*.asx,*.m3u,*.m3u8,*.pls,*.ram,*.rmj,*.rmm,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, + { MSGTR_Filter_Playlists, "*.asx,*.m3u,*.m3u8,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, { MSGTR_Filter_AllAudioFiles, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, { MSGTR_Filter_AllVideoFiles, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv" }, { MSGTR_Filter_AllFiles, "*" },

1 0

r34954 - trunk/configure
by reimar 21 May '12

21 May '12

Author: reimar Date: Mon May 21 22:21:32 2012 New Revision: 34954 Log: More extensive LIVE555 check that will fail with incompatible newer versions. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon May 21 22:08:01 2012 (r34953) +++ trunk/configure Mon May 21 22:21:32 2012 (r34954) @@ -6671,7 +6671,7 @@ if test "$_live" = auto && test "$netwo #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/> #endif #include "BasicUsageEnvironment.hh" -int main(void) { BasicTaskScheduler::createNew(); return 0; } +int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), 0, "", 0); return 0; } EOF _live=no

1 0

r34953 - trunk/configure
by al 21 May '12

21 May '12

Author: al Date: Mon May 21 22:08:01 2012 New Revision: 34953 Log: build: Fix vo directx configure check on Cygwin Without windows.h included syntax errors will arise inside (some versions of) the ddraw.h header. The wine-based ddraw.h header was reported to not have this problems. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon May 21 22:00:03 2012 (r34952) +++ trunk/configure Mon May 21 22:08:01 2012 (r34953) @@ -5277,6 +5277,7 @@ echores "$_direct3d" echocheck "Directx" if test "$_directx" = auto ; then cat > $TMPC << EOF +#include <windows.h> #include <ddraw.h> #include <dsound.h> int main(void) { return 0; }

1 0

r34952 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 21 May '12

21 May '12

Author: reimar Date: Mon May 21 22:00:03 2012 New Revision: 34952 Log: Only try to get a "numbered" mpi for nonref DR. This is simpler, more flexible and more robust. Should fix bug #2067. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Mon May 21 22:00:01 2012 (r34951) +++ trunk/libmpcodecs/vd_ffmpeg.c Mon May 21 22:00:03 2012 (r34952) @@ -564,11 +564,11 @@ static int get_buffer(AVCodecContext *av } if (ctx->nonref_dr) { - if (flags & MP_IMGFLAG_PRESERVE || ctx->b_count > 1) { - if (!(flags & MP_IMGFLAG_PRESERVE)) ctx->b_count--; + if (flags & MP_IMGFLAG_PRESERVE) return avcodec_default_get_buffer(avctx, pic); - } - type = MP_IMGTYPE_TEMP; + // Use NUMBERED since for e.g. TEMP vos assume there will + // be no other frames between the get_image and matching put_image. + type = MP_IMGTYPE_NUMBERED; } if(init_vo(sh, avctx->pix_fmt) < 0){

1 0

r34951 - trunk/libmpcodecs/vf_ass.c
by reimar 21 May '12

21 May '12

Author: reimar Date: Mon May 21 22:00:01 2012 New Revision: 34951 Log: vf_ass: fix running out of images and crashing. This would happen when running direct rendering with MP_IMGTYPE_NUMBERED. Modified: trunk/libmpcodecs/vf_ass.c Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Mon May 21 21:59:59 2012 (r34950) +++ trunk/libmpcodecs/vf_ass.c Mon May 21 22:00:01 2012 (r34951) @@ -168,6 +168,8 @@ static int prepare_image(struct vf_insta mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_MPCODECS_FunWhydowegetNULL); return 0; } + // allow reusing it after this processing + vf->dmpi->usage_count--; mpi->priv = NULL; // we've used DR, so we're ready... if (ass_top_margin)

1 0

r34950 - trunk/libvo/vo_gl.c
by reimar 21 May '12

21 May '12

Author: reimar Date: Mon May 21 21:59:59 2012 New Revision: 34950 Log: Do not give out the same buffer to multiple mp_images. In exchange, allow us to provide more image types. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Mon May 21 21:59:58 2012 (r34949) +++ trunk/libvo/vo_gl.c Mon May 21 21:59:59 2012 (r34950) @@ -926,9 +926,11 @@ static uint32_t get_image(mp_image_t *mp err_shown = 1; return VO_FALSE; } + if (gl_bufferptr) return VO_FALSE; if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; if (mpi->type != MP_IMGTYPE_STATIC && mpi->type != MP_IMGTYPE_TEMP && - (mpi->type != MP_IMGTYPE_NUMBERED || mpi->number)) + mpi->type != MP_IMGTYPE_IPB && + mpi->type != MP_IMGTYPE_NUMBERED) return VO_FALSE; if (mesa_buffer) mpi->width = texture_width; else if (ati_hack) {

1 0

r34949 - in trunk/libmpcodecs: vd_ffmpeg.c vf.c
by reimar 21 May '12

21 May '12

Author: reimar Date: Mon May 21 21:59:58 2012 New Revision: 34949 Log: Change MP_IMGTYPE_NUMBERED semantics. This makes it easier to detect filters that claim to support it for direct rendering but actually don't. Modified: trunk/libmpcodecs/vd_ffmpeg.c trunk/libmpcodecs/vf.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Mon May 21 21:17:55 2012 (r34948) +++ trunk/libmpcodecs/vd_ffmpeg.c Mon May 21 21:59:58 2012 (r34949) @@ -581,7 +581,7 @@ static int get_buffer(AVCodecContext *av } if (IMGFMT_IS_HWACCEL(ctx->best_csp)) { - type = MP_IMGTYPE_NUMBERED | (0xffff << 16); + type = MP_IMGTYPE_NUMBERED; } else if (type == MP_IMGTYPE_IP || type == MP_IMGTYPE_IPB) { if(ctx->b_count>1 || ctx->ip_count>2){ Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Mon May 21 21:17:55 2012 (r34948) +++ trunk/libmpcodecs/vf.c Mon May 21 21:59:58 2012 (r34949) @@ -278,7 +278,7 @@ void vf_mpi_clear(mp_image_t* mpi,int x0 mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h){ mp_image_t* mpi=NULL; int w2; - int number = mp_imgtype >> 16; + int number = (mp_imgtype >> 16) - 1; #ifdef MP_DEBUG assert(w == -1 || w >= vf->w); @@ -333,7 +333,10 @@ mp_image_t* vf_get_image(vf_instance_t* break; number = i; } - if (number < 0 || number >= NUM_NUMBERED_MPI) return NULL; + if (number < 0 || number >= NUM_NUMBERED_MPI) { + mp_msg(MSGT_VFILTER, MSGL_FATAL, "Ran out of numbered images, expect crash. Filter before %s is broken.\n", vf->info->name); + return NULL; + } if (!vf->imgctx.numbered_images[number]) vf->imgctx.numbered_images[number] = new_mp_image(w2,h); mpi = vf->imgctx.numbered_images[number]; mpi->number = number;

1 0