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

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r28039 - trunk/etc/codecs.conf
by diego 04 Sep '09

04 Sep '09

Author: diego Date: Wed Nov 26 14:04:10 2008 New Revision: 28039 Log: Update Tremor comment regarding fixed-point mode. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Wed Nov 26 14:04:10 2008 @@ -3494,7 +3494,7 @@ audiocodec vorbis audiocodec tremor info "OggVorbis audio decoder" status working - comment "OggVorbis fixed-point decoder useful for ARM based systems" + comment "fixed-point decoder useful systems without floating-point unit" fourcc vrbs format 0x566F driver tremor

4 3

r28743 - trunk/libvo/vo_vdpau.c
by cehoyos 16 Aug '09

16 Aug '09

Author: cehoyos Date: Fri Feb 27 22:52:59 2009 New Revision: 28743 Log: Add one-field-only output for -vo vdpau. Change syntax of -vo vdpau:deint for the last time. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Fri Feb 27 22:46:13 2009 (r28742) +++ trunk/libvo/vo_vdpau.c Fri Feb 27 22:52:59 2009 (r28743) @@ -208,7 +208,7 @@ static void video_to_output_surface(void // we would need to provide 2 past and 1 future frames to allow advanced // deinterlacing, which is not really possible currently. - for (i = 0; i <= !!deint; i++) { + for (i = 0; i <= !!(deint > 1); i++) { int field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME; VdpOutputSurface output_surface; if (i) @@ -394,9 +394,9 @@ static int create_vdp_mixer(VdpChromaTyp &vid_height, &vdp_chroma_type }; - if (deint == 2) - features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL; if (deint == 3) + features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL; + if (deint == 4) features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL; if (pullup) features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE; @@ -946,9 +946,10 @@ static const char help_msg[] = "\nOptions:\n" " deint (all modes > 0 respect -field-dominance)\n" " 0: no deinterlacing\n" - " 1: bob deinterlacing (current fallback)\n" - " 2: temporal deinterlacing (not yet working)\n" - " 3: temporal-spatial deinterlacing (not yet working)\n" + " 1: only show first field\n" + " 2: bob deinterlacing (current fallback)\n" + " 3: temporal deinterlacing (not yet working)\n" + " 4: temporal-spatial deinterlacing (not yet working)\n" " pullup\n" " Try to apply inverse-telecine (needs deinterlacing, not working)\n" " denoise\n"

2 1

r29321 - trunk/cfg-common-opts.h
by lu_zero 03 Jun '09

03 Jun '09

Author: lu_zero Date: Mon May 25 19:51:10 2009 New Revision: 29321 Log: Make sure -rtsp-stream-with-sctp is supported while building with libnemesi Modified: trunk/cfg-common-opts.h Modified: trunk/cfg-common-opts.h ============================================================================== --- trunk/cfg-common-opts.h Mon May 25 18:42:54 2009 (r29320) +++ trunk/cfg-common-opts.h Mon May 25 19:51:10 2009 (r29321) @@ -82,14 +82,18 @@ #ifdef CONFIG_LIVE555 {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +#endif /* CONFIG_LIVE555 */ +#ifdef CONFIG_LIBNEMESI || CONFIG_LIVE555 // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#elif defined (CONFIG_LIBNEMESI) - {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +#else + {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +#endif /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */ +#ifdef CONFIG_LIBNEMESI {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else - {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIVE555 */ + {"rtsp-stream-over-sctp", "-rtsp-stream-over-sctp requires the", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +#endif /* CONFIG_LIBNEMESI */ #ifdef CONFIG_NETWORK {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},

2 1

r29333 - trunk/stream/asf_mmst_streaming.c
by reimar 31 May '09

31 May '09

Author: reimar Date: Sun May 31 15:09:48 2009 New Revision: 29333 Log: Using nl_langinfo in the asf mmst implementation makes no sense since MPlayer does not use setlocale. Just default to UTF-8 as input charset until there is a better solution. Modified: trunk/stream/asf_mmst_streaming.c Modified: trunk/stream/asf_mmst_streaming.c ============================================================================== --- trunk/stream/asf_mmst_streaming.c Sun May 31 15:00:51 2009 (r29332) +++ trunk/stream/asf_mmst_streaming.c Sun May 31 15:09:48 2009 (r29333) @@ -49,9 +49,6 @@ #ifdef CONFIG_ICONV #include <iconv.h> -#ifdef HAVE_LANGINFO -#include <langinfo.h> -#endif #endif #include "url.h" @@ -574,11 +571,7 @@ int asf_mmst_streaming_start(stream_t *s /* prepare for the url encoding conversion */ #ifdef CONFIG_ICONV -#ifdef HAVE_LANGINFO - url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET)); -#else - url_conv = iconv_open("UTF-16LE", NULL); -#endif + url_conv = iconv_open("UTF-16LE", "UTF-8"); #endif snprintf (str, 1023, "\034\003NSPlayer/7.0.0.1956; {33715801-BAB3-9D85-24E9-03B90328270A}; Host: %s", url1->hostname);

1 0

r29332 - in trunk: mp_msg.c osdep/getch2-os2.c osdep/getch2-win.c osdep/getch2.c
by reimar 31 May '09

31 May '09

Author: reimar Date: Sun May 31 15:00:51 2009 New Revision: 29332 Log: Use a malloced string for the get_term_charset return value. This is necessary at least on POSIX systems since the buffer returned by nl_langinfo may change its contents with e.g. each setlocale call. Modified: trunk/mp_msg.c trunk/osdep/getch2-os2.c trunk/osdep/getch2-win.c trunk/osdep/getch2.c Modified: trunk/mp_msg.c ============================================================================== --- trunk/mp_msg.c Sun May 31 14:48:53 2009 (r29331) +++ trunk/mp_msg.c Sun May 31 15:00:51 2009 (r29332) @@ -8,6 +8,13 @@ #ifdef CONFIG_ICONV #include <iconv.h> #include <errno.h> +/** + * \brief gets the name of the system's terminal character set + * \return a malloced string indicating the system charset + * + * Be warned that this function on many systems is in no way thread-safe + * since it modifies global data + */ char* get_term_charset(void); #endif Modified: trunk/osdep/getch2-os2.c ============================================================================== --- trunk/osdep/getch2-os2.c Sun May 31 14:48:53 2009 (r29331) +++ trunk/osdep/getch2-os2.c Sun May 31 15:00:51 2009 (r29332) @@ -26,6 +26,7 @@ #include <os2.h> #include <stdio.h> +#include <string.h> #include "config.h" #include "keycodes.h" @@ -189,7 +190,7 @@ char *get_term_charset( void ) #ifdef HAVE_LANGINFO setlocale( LC_CTYPE, ""); - charset = nl_langinfo( CODESET ); + charset = strdup( nl_langinfo( CODESET )); setlocale( LC_CTYPE, "C"); #endif Modified: trunk/osdep/getch2-win.c ============================================================================== --- trunk/osdep/getch2-win.c Sun May 31 14:48:53 2009 (r29331) +++ trunk/osdep/getch2-win.c Sun May 31 15:00:51 2009 (r29332) @@ -25,6 +25,7 @@ #include "config.h" #include <stdio.h> +#include <string.h> #include <windows.h> #include "keycodes.h" #include "input/input.h" @@ -187,7 +188,7 @@ static const struct { char* get_term_charset(void) { - static char codepage[10]; + char codepage[10]; unsigned i, cpno = GetConsoleOutputCP(); if (!cpno) cpno = GetACP(); @@ -196,9 +197,9 @@ char* get_term_charset(void) for (i = 0; cp_alias[i].cp; i++) if (cpno == cp_alias[i].cp) - return cp_alias[i].alias; + return strdup(cp_alias[i].alias); snprintf(codepage, sizeof(codepage), "CP%u", cpno); - return codepage; + return strdup(codepage); } #endif Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Sun May 31 14:48:53 2009 (r29331) +++ trunk/osdep/getch2.c Sun May 31 15:00:51 2009 (r29332) @@ -297,7 +297,7 @@ char* get_term_charset(void) char* charset = NULL; #ifdef HAVE_LANGINFO setlocale(LC_CTYPE, ""); - charset = nl_langinfo(CODESET); + charset = strdup(nl_langinfo(CODESET)); setlocale(LC_CTYPE, "C"); #endif return charset;

1 0

r29331 - trunk/mplayer.c
by reimar 31 May '09

31 May '09

Author: reimar Date: Sun May 31 14:48:53 2009 New Revision: 29331 Log: Make ID_SEEKABLE depend on both the stream and the demuxer being seekable, instead of only depending on the stream. This makes the value correctly 0 e.g. for AVI files without index. Patch by Jason Tackaberry [tack urandom ca] Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat May 30 15:18:57 2009 (r29330) +++ trunk/mplayer.c Sun May 31 14:48:53 2009 (r29331) @@ -3492,7 +3492,8 @@ if (mpctx->global_sub_size) { mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels); } mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(mpctx->demuxer)); - mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_SEEKABLE=%d\n", mpctx->stream->seek ? 1 : 0); + mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_SEEKABLE=%d\n", + mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable)); if (mpctx->demuxer) { if (mpctx->demuxer->num_chapters == 0) stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, &mpctx->demuxer->num_chapters);

1 0

[propchange]: r29330 - svn:log
by reimar 30 May '09

30 May '09

Author: reimar Revision: 29330 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,4 +1,4 @@ In all demux_info_add calls change "name" to "title". Currently "name" and "title" are both used at random, this makes it consistent. -"title" was chose because it is less ambiguous and also get_meta_title uses that -(there is no get_meta_name). +"title" was chosen because it is less ambiguous and also the get_meta_title +slave mode command uses that (there is no get_meta_name command).

1 0

r29330 - in trunk/libmpdemux: asfheader.c aviheader.c demux_lavf.c demux_mov.c demux_ogg.c demux_real.c demux_viv.c
by reimar 30 May '09

30 May '09

Author: reimar Date: Sat May 30 15:18:57 2009 New Revision: 29330 Log: In all demux_info_add calls change "name" to "title". Currently "name" and "title" are both used at random, this makes it consistent. "title" was chose because it is less ambiguous and also get_meta_title uses that (there is no get_meta_name). Modified: trunk/libmpdemux/asfheader.c trunk/libmpdemux/aviheader.c trunk/libmpdemux/demux_lavf.c trunk/libmpdemux/demux_mov.c trunk/libmpdemux/demux_ogg.c trunk/libmpdemux/demux_real.c trunk/libmpdemux/demux_viv.c Modified: trunk/libmpdemux/asfheader.c ============================================================================== --- trunk/libmpdemux/asfheader.c Sat May 30 15:15:53 2009 (r29329) +++ trunk/libmpdemux/asfheader.c Sat May 30 15:18:57 2009 (r29330) @@ -565,7 +565,7 @@ int read_asf_header(demuxer_t *demuxer,s if (pos > hdr_len) goto len_err_out; if ((string = get_ucs2str(wstring, len))) { mp_msg(MSGT_HEADER,MSGL_V," Title: %s\n", string); - demux_info_add(demuxer, "name", string); + demux_info_add(demuxer, "title", string); free(string); } } Modified: trunk/libmpdemux/aviheader.c ============================================================================== --- trunk/libmpdemux/aviheader.c Sat May 30 15:15:53 2009 (r29329) +++ trunk/libmpdemux/aviheader.c Sat May 30 15:18:57 2009 (r29330) @@ -167,7 +167,7 @@ while(1){ case mmioFOURCC('I','M','E','D'): hdr="Medium";break; // INAM - Stores the title of the subject of the file, such as // "Seattle from Above." - case mmioFOURCC('I','N','A','M'): hdr="Name";break; + case mmioFOURCC('I','N','A','M'): hdr="Title";break; // IPLT - Specifies the number of colors requested when digitizing // an image, such as "256." case mmioFOURCC('I','P','L','T'): hdr="Palette Setting";break; Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sat May 30 15:15:53 2009 (r29329) +++ trunk/libmpdemux/demux_lavf.c Sat May 30 15:18:57 2009 (r29330) @@ -476,7 +476,7 @@ static demuxer_t* demux_open_lavf(demuxe return NULL; } - if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title ); + if(avfc->title [0]) demux_info_add(demuxer, "title" , avfc->title ); if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author ); if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright); if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment ); Modified: trunk/libmpdemux/demux_mov.c ============================================================================== --- trunk/libmpdemux/demux_mov.c Sat May 30 15:15:53 2009 (r29329) +++ trunk/libmpdemux/demux_mov.c Sat May 30 15:18:57 2009 (r29330) @@ -1549,7 +1549,7 @@ static void lschunks(demuxer_t* demuxer, break; case MOV_FOURCC('n','a','m','e'): case MOV_FOURCC(0xa9,'n','a','m'): - demux_info_add(demuxer, "name", &text[2]); + demux_info_add(demuxer, "title", &text[2]); mp_msg(MSGT_DEMUX, MSGL_V, " Name: %s\n", &text[2]); break; case MOV_FOURCC(0xa9,'A','R','T'): Modified: trunk/libmpdemux/demux_ogg.c ============================================================================== --- trunk/libmpdemux/demux_ogg.c Sat May 30 15:15:53 2009 (r29329) +++ trunk/libmpdemux/demux_ogg.c Sat May 30 15:18:57 2009 (r29330) @@ -375,7 +375,7 @@ static void demux_ogg_check_comments(dem } table[] = { { "ENCODED_USING", "Software" }, { "ENCODER_URL", "Encoder URL" }, - { "TITLE", "Name" }, + { "TITLE", "Title" }, { "ARTIST", "Artist" }, { "COMMENT", "Comments" }, { "DATE", "Creation Date" }, Modified: trunk/libmpdemux/demux_real.c ============================================================================== --- trunk/libmpdemux/demux_real.c Sat May 30 15:15:53 2009 (r29329) +++ trunk/libmpdemux/demux_real.c Sat May 30 15:18:57 2009 (r29330) @@ -1181,7 +1181,7 @@ static demuxer_t* demux_open_real(demuxe buf = malloc(len+1); stream_read(demuxer->stream, buf, len); buf[len] = 0; - demux_info_add(demuxer, "name", buf); + demux_info_add(demuxer, "title", buf); free(buf); } Modified: trunk/libmpdemux/demux_viv.c ============================================================================== --- trunk/libmpdemux/demux_viv.c Sat May 30 15:15:53 2009 (r29329) +++ trunk/libmpdemux/demux_viv.c Sat May 30 15:18:57 2009 (r29330) @@ -208,7 +208,7 @@ static void vivo_parse_text_header(demux /* only for displaying some informations about movie*/ if (!strcmp(opt, "Title")) { - demux_info_add(demux, "name", param); + demux_info_add(demux, "title", param); priv->title = strdup(param); } if (!strcmp(opt, "Author"))

1 0

r29329 - trunk/mplayer.c
by reimar 30 May '09

30 May '09

Author: reimar Date: Sat May 30 15:15:53 2009 New Revision: 29329 Log: 100l, demuxer info tags are _not_ case sensitive, so use strcasecmp. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Thu May 28 17:53:27 2009 (r29328) +++ trunk/mplayer.c Sat May 30 15:15:53 2009 (r29329) @@ -452,7 +452,7 @@ static char *get_demuxer_info (char *tag return NULL; for (n = 0; info[2*n] != NULL ; n++) - if (!strcmp (info[2*n], tag)) + if (!strcasecmp (info[2*n], tag)) break; return info[2*n+1] ? strdup (info[2*n+1]) : NULL;

1 0