June 2006 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/input input.c,1.125,1.126
by syncmail＠mplayerhq.hu 24 Dec '06

24 Dec '06

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv3818/input Modified Files: input.c Log Message: libvo input cleanup: remove the dependency on libinput, remove most of the crappy mappings (like O->o or ESC->q). Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- input.c 25 Oct 2005 21:23:45 -0000 1.125 +++ input.c 2 Nov 2005 21:50:54 -0000 1.126 @@ -240,10 +240,27 @@ { JOY_BTN8, "JOY_BTN8" }, { JOY_BTN9, "JOY_BTN9" }, - { KEY_XF86_PAUSE, "XF86_PAUSE" }, - { KEY_XF86_STOP, "XF86_STOP" }, - { KEY_XF86_PREV, "XF86_PREV" }, - { KEY_XF86_NEXT, "XF86_NEXT" }, + { KEY_POWER, "POWER" }, + { KEY_MENU, "MENU" }, + { KEY_PLAY, "PLAY" }, + { KEY_PAUSE, "PAUSE" }, + { KEY_PLAYPAUSE, "PLAYPAUSE" }, + { KEY_STOP, "STOP" }, + { KEY_FORWARD, "FORWARD" }, + { KEY_REWIND, "REWIND" }, + { KEY_NEXT, "NEXT" }, + { KEY_PREV, "PREV" }, + { KEY_VOLUME_UP, "VOLUME_UP" }, + { KEY_VOLUME_DOWN, "VOLUME_DOWN" }, + { KEY_MUTE, "MUTE" }, + + // These are kept for backward compatibility + { KEY_PAUSE, "XF86_PAUSE" }, + { KEY_STOP, "XF86_STOP" }, + { KEY_PREV, "XF86_PREV" }, + { KEY_NEXT, "XF86_NEXT" }, + + { KEY_CLOSE_WIN, "CLOSE_WIN" }, { 0, NULL } }; @@ -282,9 +299,11 @@ { { '}', 0 }, "speed_mult 2.0" }, { { KEY_BACKSPACE, 0 }, "speed_set 1.0" }, { { 'q', 0 }, "quit" }, + { { 'Q', 0 }, "quit" }, #ifndef HAVE_NEW_GUI { { KEY_ESC, 0 }, "quit" }, { { 'p', 0 }, "pause" }, + { { 'P', 0 }, "pause" }, #endif { { ' ', 0 }, "pause" }, { { '.', 0 }, "frame_step" }, @@ -298,6 +317,7 @@ { { KEY_INS, 0 }, "alt_src_step 1" }, { { KEY_DEL, 0 }, "alt_src_step -1" }, { { 'o', 0 }, "osd" }, + { { 'O', 0 }, "osd" }, { { 'z', 0 }, "sub_delay -0.1" }, { { 'x', 0 }, "sub_delay +0.1" }, { { 'g', 0 }, "sub_step -1" }, @@ -307,6 +327,7 @@ { { '0', 0 }, "volume 1" }, { { '*', 0 }, "volume 1" }, { { 'm', 0 }, "mute" }, + { { 'M', 0 }, "mute" }, { { '1', 0 }, "contrast -1" }, { { '2', 0 }, "contrast 1" }, { { '3', 0 }, "brightness -1" }, @@ -358,10 +379,21 @@ { { 'w', 0 }, "panscan -0.1" }, { { 'e', 0 }, "panscan +0.1" }, - { { KEY_XF86_PAUSE, 0 }, "pause" }, - { { KEY_XF86_STOP, 0 }, "quit" }, - { { KEY_XF86_PREV, 0 }, "seek -60" }, - { { KEY_XF86_NEXT, 0 }, "seek +60" }, + { { KEY_POWER, 0 }, "quit" }, + { { KEY_MENU, 0 }, "osd" }, + { { KEY_PLAY, 0 }, "pause" }, + { { KEY_PAUSE, 0 }, "pause" }, + { { KEY_PLAYPAUSE, 0 }, "pause" }, + { { KEY_STOP, 0 }, "quit" }, + { { KEY_FORWARD, 0 }, "seek 60" }, + { { KEY_REWIND, 0 }, "seek -60" }, + { { KEY_NEXT, 0 }, "pt_step 1" }, + { { KEY_PREV, 0 }, "pt_step -1" }, + { { KEY_VOLUME_UP, 0 }, "volume 1" }, + { { KEY_VOLUME_DOWN, 0 }, "volume -1" }, + { { KEY_MUTE, 0 }, "mute" }, + + { { KEY_CLOSE_WIN, 0 }, "quit" }, { { 0 }, NULL } };

3 3

r18775 - in trunk/libmpdemux/realrtsp: real.c rtsp.c rtsp.h
by ben 05 Aug '06

05 Aug '06

Author: ben Date: Wed Jun 21 19:39:27 2006 New Revision: 18775 Modified: trunk/libmpdemux/realrtsp/real.c trunk/libmpdemux/realrtsp/rtsp.c trunk/libmpdemux/realrtsp/rtsp.h Log: better RTSP RFC compliance (fixes in CSeq and TEARDOWN handling) Modified: trunk/libmpdemux/realrtsp/real.c ============================================================================== --- trunk/libmpdemux/realrtsp/real.c (original) +++ trunk/libmpdemux/realrtsp/real.c Wed Jun 21 19:39:27 2006 @@ -800,7 +800,7 @@ rtsp_schedule_field(rtsp_session, "Transport: x-pn-tng/tcp;mode=play,rtp/avp/tcp;unicast;mode=play"); buf = xbuffer_ensure_size(buf, strlen(mrl) + 32); sprintf(buf, "%s/streamid=0", mrl); - rtsp_request_setup(rtsp_session,buf); + rtsp_request_setup(rtsp_session,buf,NULL); if (h->prop->num_streams > 1) { rtsp_schedule_field(rtsp_session, "Transport: x-pn-tng/tcp;mode=play,rtp/avp/tcp;unicast;mode=play"); @@ -810,7 +810,7 @@ buf = xbuffer_ensure_size(buf, strlen(mrl) + 32); sprintf(buf, "%s/streamid=1", mrl); - rtsp_request_setup(rtsp_session,buf); + rtsp_request_setup(rtsp_session,buf,NULL); } /* set stream parameter (bandwidth) with our subscribe string */ rtsp_schedule_field(rtsp_session, subscribe); Modified: trunk/libmpdemux/realrtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/realrtsp/rtsp.c (original) +++ trunk/libmpdemux/realrtsp/rtsp.c Wed Jun 21 19:39:27 2006 @@ -24,6 +24,9 @@ * * a minimalistic implementation of rtsp protocol, * *not* RFC 2326 compilant yet. + * + * 2006, Benjamin Zores and Vincent Mussard + * fixed a lot of RFC compliance issues. */ #include <unistd.h> @@ -382,7 +385,7 @@ char tmp[16]; - snprintf(tmp, 16, "Cseq: %u", s->cseq); + snprintf(tmp, 16, "CSeq: %u", s->cseq); rtsp_schedule_field(s, tmp); if (s->session) { @@ -419,11 +422,11 @@ if (!answer) return 0; - if (!strncmp(answer,"Cseq:",5)) { - sscanf(answer,"Cseq: %u",&answer_seq); + if (!strncmp(answer,"CSeq:",5)) { + sscanf(answer,"CSeq: %u",&answer_seq); if (s->cseq != answer_seq) { #ifdef LOG - mp_msg(MSGT_OPEN, MSGL_WARN, "librtsp: warning: Cseq mismatch. got %u, assumed %u", answer_seq, s->cseq); + mp_msg(MSGT_OPEN, MSGL_WARN, "librtsp: warning: CSeq mismatch. got %u, assumed %u", answer_seq, s->cseq); #endif s->cseq=answer_seq; } @@ -518,11 +521,26 @@ return rtsp_get_answers(s); } -int rtsp_request_setup(rtsp_t *s, const char *what) { +int rtsp_request_setup(rtsp_t *s, const char *what, char *control) { + + char *buf = NULL; - rtsp_send_request(s,"SETUP",what); + if (what) + buf = strdup (what); + else + { + int len = strlen (s->host) + strlen (s->path) + 16; + if (control) + len += strlen (control) + 1; + + buf = malloc (len); + sprintf (buf, "rtsp://%s:%i/%s%s%s", s->host, s->port, s->path, + control ? "/" : "", control ? control : ""); + } - return rtsp_get_answers(s); + rtsp_send_request (s, "SETUP", buf); + free (buf); + return rtsp_get_answers (s); } int rtsp_request_setparameter(rtsp_t *s, const char *what) { @@ -545,7 +563,8 @@ int rtsp_request_play(rtsp_t *s, const char *what) { char *buf; - + int ret; + if (what) { buf=strdup(what); } else @@ -556,13 +575,28 @@ rtsp_send_request(s,"PLAY",buf); free(buf); - return rtsp_get_answers(s); + ret = rtsp_get_answers (s); + if (ret == 200) + s->server_state = RTSP_PLAYING; + + return ret; } -int rtsp_request_tearoff(rtsp_t *s, const char *what) { +int rtsp_request_teardown(rtsp_t *s, const char *what) { - rtsp_send_request(s,"TEAROFF",what); + char *buf; + if (what) + buf = strdup (what); + else + { + buf = + malloc (strlen (s->host) + strlen (s->path) + 16); + sprintf (buf, "rtsp://%s:%i/%s", s->host, s->port, s->path); + } + rtsp_send_request (s, "TEARDOWN", buf); + free (buf); + return rtsp_get_answers(s); } @@ -596,7 +630,7 @@ free(rest); if (seq<0) { #ifdef LOG - mp_msg(MSGT_OPEN, MSGL_WARN, "rtsp: warning: cseq not recognized!\n"); + mp_msg(MSGT_OPEN, MSGL_WARN, "rtsp: warning: CSeq not recognized!\n"); #endif seq=1; } @@ -640,7 +674,7 @@ s->server_state=0; s->server_caps=0; - s->cseq=1; + s->cseq=0; s->session=NULL; if (user_agent) @@ -690,7 +724,13 @@ void rtsp_close(rtsp_t *s) { - if (s->server_state) closesocket(s->s); /* TODO: send a TEAROFF */ + if (s->server_state) + { + if (s->server_state == RTSP_PLAYING) + rtsp_request_teardown (s, NULL); + closesocket (s->s); + } + if (s->path) free(s->path); if (s->host) free(s->host); if (s->mrl) free(s->mrl); @@ -805,6 +845,8 @@ while(*ptr) { if (!strncmp(*ptr, string, strlen(string))) break; + else + ptr++; } if (*ptr) free(*ptr); ptr++; Modified: trunk/libmpdemux/realrtsp/rtsp.h ============================================================================== --- trunk/libmpdemux/realrtsp/rtsp.h (original) +++ trunk/libmpdemux/realrtsp/rtsp.h Wed Jun 21 19:39:27 2006 @@ -24,6 +24,9 @@ * * a minimalistic implementation of rtsp protocol, * *not* RFC 2326 compilant yet. + * + * 2006, Benjamin Zores and Vincent Mussard + * fixed a lot of RFC compliance issues. */ #ifndef HAVE_RTSP_H @@ -41,10 +44,10 @@ int rtsp_request_options(rtsp_t *s, const char *what); int rtsp_request_describe(rtsp_t *s, const char *what); -int rtsp_request_setup(rtsp_t *s, const char *what); +int rtsp_request_setup(rtsp_t *s, const char *what, char *control); int rtsp_request_setparameter(rtsp_t *s, const char *what); int rtsp_request_play(rtsp_t *s, const char *what); -int rtsp_request_tearoff(rtsp_t *s, const char *what); +int rtsp_request_teardown(rtsp_t *s, const char *what); int rtsp_send_ok(rtsp_t *s);

2 1

r18869 - in trunk: configure libvo/Makefile libvo/font_load_ft.c
by diego 03 Jul '06

03 Jul '06

Author: diego Date: Fri Jun 30 14:41:05 2006 New Revision: 18869 Modified: trunk/configure trunk/libvo/Makefile trunk/libvo/font_load_ft.c Log: Move conditional FreeType support compilation to the build system. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Fri Jun 30 14:41:05 2006 @@ -7481,6 +7481,7 @@ DIRECTFB_LIB = $_ld_directfb CDPARANOIA_INC = $_inc_cdparanoia CDPARANOIA_LIB = $_ld_cdparanoia +FREETYPE = $_freetype FREETYPE_INC = $_inc_freetype FREETYPE_LIB = $_ld_freetype FONTCONFIG_INC = $_inc_fontconfig Modified: trunk/libvo/Makefile ============================================================================== --- trunk/libvo/Makefile (original) +++ trunk/libvo/Makefile Fri Jun 30 14:41:05 2006 @@ -6,7 +6,6 @@ SRCS=aclib.c \ aspect.c \ font_load.c \ - font_load_ft.c \ geometry.c \ osd.c \ spuenc.c \ @@ -25,6 +24,10 @@ OBJS_TEMP=$(basename $(SRCS)) OBJS=$(OBJS_TEMP:%=%.o) +ifeq ($(FREETYPE),yes) +SRCS += font_load_ft.c +endif + ifeq ($(VIDIX),yes) SRCS += vosub_vidix.c endif Modified: trunk/libvo/font_load_ft.c ============================================================================== --- trunk/libvo/font_load_ft.c (original) +++ trunk/libvo/font_load_ft.c Fri Jun 30 14:41:05 2006 @@ -11,8 +11,6 @@ #include "config.h" -#ifdef HAVE_FREETYPE - #include <stdio.h> #include <stdlib.h> #include <math.h> @@ -1170,5 +1168,3 @@ vo_font=read_font_desc_ft(font_name, width, height); #endif } - -#endif /* HAVE_FREETYPE */

3 2

r18861 - in trunk: mplayer.c subreader.c
by reynaldo 30 Jun '06

30 Jun '06

Author: reynaldo Date: Fri Jun 30 06:09:29 2006 New Revision: 18861 Modified: trunk/mplayer.c trunk/subreader.c Log: more sizeof(char) fun Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Fri Jun 30 06:09:29 2006 @@ -2993,7 +2993,7 @@ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name); }else if(sub_auto && filename && (strlen(filename)>=5)){ /* try to autodetect vobsub from movie filename ::atmos */ - char *buf = malloc((strlen(filename)-3) * sizeof(char)),*psub; + char *buf = malloc((strlen(filename)-3)),*psub; memset(buf,0,strlen(filename)-3); // make sure string is terminated strncpy(buf, filename, strlen(filename)-4); vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec); @@ -3152,7 +3152,7 @@ if (filename && !strcmp(mp_basename(playlist_entry),playlist_entry)) // add reference path of current file { - temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen(playlist_entry)+1)*sizeof(char)); + temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen(playlist_entry)+1)); if (temp) { strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename))); Modified: trunk/subreader.c ============================================================================== --- trunk/subreader.c (original) +++ trunk/subreader.c Fri Jun 30 06:09:29 2006 @@ -1218,7 +1218,7 @@ if(log2vis) { len = fribidi_remove_bidi_marks (visual, len, NULL, NULL, NULL); - if((op = (char*)malloc(sizeof(char)*(max(2*orig_len,2*len) + 1))) == NULL) { + if((op = (char*)malloc((max(2*orig_len,2*len) + 1))) == NULL) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n"); l++; break; @@ -1314,7 +1314,7 @@ char *detected_sub_cp = NULL; int i; - buffer = (unsigned char*)malloc(MAX_GUESS_BUFFER_SIZE*sizeof(char)); + buffer = (unsigned char*)malloc(MAX_GUESS_BUFFER_SIZE); buflen = stream_read(st,buffer, MAX_GUESS_BUFFER_SIZE); languages = enca_get_languages(&langcnt);

3 2

r18873 - trunk/DOCS/tech/MAINTAINERS
by reynaldo 30 Jun '06

30 Jun '06

Author: reynaldo Date: Fri Jun 30 22:05:28 2006 New Revision: 18873 Modified: trunk/DOCS/tech/MAINTAINERS Log: havent seen him in ages.. Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS (original) +++ trunk/DOCS/tech/MAINTAINERS Fri Jun 30 22:05:28 2006 @@ -42,7 +42,7 @@ * Hungarian: Gabor Mizda * Italian: Daniele Forghieri * Polish: Waclaw Schiller - * Spanish: Juan Martin, Reynaldo H. Verdejo Pinochet (outdated) + * Spanish: Reynaldo H. Verdejo Pinochet (outdated) * Chinese: unmaintained, outdated * Swedish: unmaintained, outdated, incomplete @@ -52,7 +52,7 @@ * German: Sebastian Kr�mer * Hungarian: Gabor Mizda * Polish: Waclaw Schiller - * Spanish: Juan Martin, Reynaldo H. Verdejo Pinochet (outdated) + * Spanish: Reynaldo H. Verdejo Pinochet (outdated) * Chinese (simplified): unmaintained, outdated, still HTML * Italian: unmaintained, outdated, still HTML * Russian: unmaintained, outdated, incomplete

1 0

r18863 - trunk/DOCS/tech/MAINTAINERS
by diego 30 Jun '06

30 Jun '06

Author: diego Date: Fri Jun 30 10:51:37 2006 New Revision: 18863 Modified: trunk/DOCS/tech/MAINTAINERS Log: Update list of documentation maintainers. Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS (original) +++ trunk/DOCS/tech/MAINTAINERS Fri Jun 30 10:51:37 2006 @@ -43,18 +43,19 @@ * Italian: Daniele Forghieri * Polish: Waclaw Schiller * Spanish: Juan Martin, Reynaldo H. Verdejo Pinochet (outdated) - * Swedish: Carl F�rstenberg (incomplete) + * Chinese: unmaintained, outdated + * Swedish: unmaintained, outdated, incomplete Documentation translations: - * Chinese (simplified): Lu Ran (outdated) * Czech: Jiri Heryan * French: Nicolas Le Gaillart, Guillaume Poirier - * German: outdated - * Hungarian: Gabor Mizdad - * Italian: outdated + * German: Sebastian Kr�mer + * Hungarian: Gabor Mizda * Polish: Waclaw Schiller - * Russian: Dmitry Baryshkov (incomplete) * Spanish: Juan Martin, Reynaldo H. Verdejo Pinochet (outdated) + * Chinese (simplified): unmaintained, outdated, still HTML + * Italian: unmaintained, outdated, still HTML + * Russian: unmaintained, outdated, incomplete Platforms/ports: * Debian packaging: None

4 3

r18872 - trunk/libmpdemux/stream_dvd.c
by diego 30 Jun '06

30 Jun '06

Author: diego Date: Fri Jun 30 15:12:51 2006 New Revision: 18872 Modified: trunk/libmpdemux/stream_dvd.c Log: Add some explanatory comments to #endif jungle. Modified: trunk/libmpdemux/stream_dvd.c ============================================================================== --- trunk/libmpdemux/stream_dvd.c (original) +++ trunk/libmpdemux/stream_dvd.c Fri Jun 30 15:12:51 2006 @@ -52,7 +52,7 @@ char * dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; char * dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" }; -#endif +#endif /* #ifdef USE_DVDREAD */ static struct stream_priv_s { @@ -386,7 +386,7 @@ dvd_last_chapter = 0; } -#endif +#endif /* #ifdef USE_DVDREAD */ static int fill_buffer(stream_t *s, char *but, int len) { @@ -832,7 +832,7 @@ stream->priv = (void*)d; return STREAM_OK; } -#endif +#endif /* #ifdef USE_DVDREAD */ mp_msg(MSGT_DVD,MSGL_ERR,MSGTR_NoDVDSupport); m_struct_free(&stream_opts,opts); return STREAM_UNSUPORTED;

1 0

r18871 - trunk/libmpdemux/stream_dvd.c
by diego 30 Jun '06

30 Jun '06

Author: diego Date: Fri Jun 30 15:11:44 2006 New Revision: 18871 Modified: trunk/libmpdemux/stream_dvd.c Log: 10l: wrong #endif removed. Modified: trunk/libmpdemux/stream_dvd.c ============================================================================== --- trunk/libmpdemux/stream_dvd.c (original) +++ trunk/libmpdemux/stream_dvd.c Fri Jun 30 15:11:44 2006 @@ -52,6 +52,7 @@ char * dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; char * dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" }; +#endif static struct stream_priv_s { @@ -848,4 +849,3 @@ &stream_opts, 1 // Urls are an option string }; -#endif

1 0

r18867 - trunk/libmpcodecs/vd_odivx.c
by diego 30 Jun '06

30 Jun '06

Author: diego Date: Fri Jun 30 14:38:22 2006 New Revision: 18867 Modified: trunk/libmpcodecs/vd_odivx.c Log: postprocess.h was moved to libpostproc years ago.. Modified: trunk/libmpcodecs/vd_odivx.c ============================================================================== --- trunk/libmpcodecs/vd_odivx.c (original) +++ trunk/libmpcodecs/vd_odivx.c Fri Jun 30 14:38:22 2006 @@ -44,7 +44,7 @@ #ifndef NEW_DECORE #include "opendivx/decore.h" -#include "postproc/postprocess.h" +#include "libpostproc/postprocess.h" #elif DECORE_XVID #include <divx4.h> #else

3 3

r18870 - trunk/libmpdemux/stream_dvd.c
by diego 30 Jun '06

30 Jun '06

Author: diego Date: Fri Jun 30 15:04:57 2006 New Revision: 18870 Modified: trunk/libmpdemux/stream_dvd.c Log: Remove #ifdef HAVE_DVD, the file is only compiled under #ifdef HAVE_DVD ... Modified: trunk/libmpdemux/stream_dvd.c ============================================================================== --- trunk/libmpdemux/stream_dvd.c (original) +++ trunk/libmpdemux/stream_dvd.c Fri Jun 30 15:04:57 2006 @@ -34,7 +34,6 @@ extern char* dvd_device; int dvd_angle=1; -#ifdef HAVE_DVD #ifdef USE_DVDREAD #define LIBDVDREAD_VERSION(maj,min,micro) ((maj)*10000 + (min)*100 + (micro)) /* @@ -53,7 +52,6 @@ char * dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; char * dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" }; -#endif static struct stream_priv_s {

1 0