December 2007 - 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

r23335 - in trunk: configure vidix/Makefile
by diego 04 Feb '09

04 Feb '09

Author: diego Date: Thu May 17 23:48:56 2007 New Revision: 23335 Log: Remove awk test. awk is a basic Unix tool, any implementation is sufficient. Modified: trunk/configure trunk/vidix/Makefile Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu May 17 23:48:56 2007 @@ -7179,28 +7179,7 @@ if test "$_vidix_internal" = auto ; then beos && _vidix_internal=no darwin && _vidix_internal=no fi - -# checking for a working awk, I'm using mawk first, because it's fastest - atmos -_awk=awk if test "$_vidix_internal" = yes ; then -_awk_verc_fail=yes -echocheck "awk" -for _awk in mawk gawk nawk; do - if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then - _awk_verc_fail=no - break - fi -done -test "$_awk_verc_fail" = yes && _awk=no -echores "$_awk" -if test "$_awk_verc_fail" = yes; then -echo "VIDIX needs awk, but no working implementation was found!" -echo "Try the GNU version, which can be downloaded from:" -echo "ftp://ftp.gnu.org/gnu/gawk/" -echo "If you don't need VIDIX, you can use configure --disable-vidix instead." -die "no awk" -fi -fi if test "$_vidix_internal" = yes; then _res_comment="internal" @@ -7544,7 +7523,6 @@ libdir = \$(LIBDIR) #AR = ar CC = $_cc HOST_CC = $_host_cc -AWK = $_awk RANLIB = $_ranlib LDCONFIG = $_ldconfig INSTALL = $_install Modified: trunk/vidix/Makefile ============================================================================== --- trunk/vidix/Makefile (original) +++ trunk/vidix/Makefile Thu May 17 23:48:56 2007 @@ -47,7 +47,7 @@ rage128_vid.o: radeon_vid.c $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< pci_names.c pci_dev_ids.c: pci.db - LC_ALL=C $(AWK) -f pci_db2c.awk $< + LC_ALL=C awk -f pci_db2c.awk $< clean:: rm -f pci_*.c pci_*.h

5 8

r23727 - trunk/libdvdcss/libdvdcss.c
by reimar 30 Aug '08

30 Aug '08

Author: reimar Date: Sat Jul 7 00:07:35 2007 New Revision: 23727 Log: Fix CSS format strings, they could print more than two digits for "negative" numbers. Modified: trunk/libdvdcss/libdvdcss.c Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c (original) +++ trunk/libdvdcss/libdvdcss.c Sat Jul 7 00:07:35 2007 @@ -472,7 +472,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( { char psz_tmp[16 + 1]; sprintf( psz_tmp, - "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", + "%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"", psz_serial[0], psz_serial[1], psz_serial[2], psz_serial[3], psz_serial[4], psz_serial[5], psz_serial[6], psz_serial[7] ); @@ -488,7 +488,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( psz_key[0] = '-'; for( i = 0; i < KEY_SIZE; i++ ) { - sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] ); + sprintf( &psz_key[1+i*2], "%.2"PRIx8, dvdcss->css.p_disc_key[i] ); } psz_key[1 + KEY_SIZE * 2] = '\0'; }

4 12

r24584 - in trunk: cfg-common.h configure libmpdemux/Makefile libmpdemux/demux_nemesi.c libmpdemux/demux_nemesi.h libmpdemux/demuxer.c stream/Makefile stream/stream_nemesi.c
by lu_zero 22 Mar '08

22 Mar '08

Author: lu_zero Date: Wed Sep 19 23:38:22 2007 New Revision: 24584 Log: libnemesi support, yet another rtsp/rtp library... Added: trunk/libmpdemux/demux_nemesi.c trunk/libmpdemux/demux_nemesi.h trunk/stream/stream_nemesi.c Modified: trunk/cfg-common.h trunk/configure trunk/libmpdemux/Makefile trunk/libmpdemux/demuxer.c trunk/stream/Makefile Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h (original) +++ trunk/cfg-common.h Wed Sep 19 23:38:22 2007 @@ -74,6 +74,9 @@ {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, // -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 (LIBNEMESI) + {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"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 @@ -502,6 +505,10 @@ extern m_option_t lavfdopts_conf[]; #ifdef STREAMING_LIVE555 extern int rtspStreamOverTCP; #endif +#ifdef LIBNEMESI +extern int rtsp_transport_tcp; +extern int rtsp_transport_sctp; +#endif extern int rtsp_port; extern char *rtsp_destination; Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Wed Sep 19 23:38:22 2007 @@ -255,6 +255,7 @@ Optional features: --enable-winsock2 enable winsock2 [autodetect] --enable-smb enable Samba (SMB) input [autodetect] --enable-live enable LIVE555 Streaming Media [autodetect] + --enable-nemesi enable Nemesi Streaming Media [autodetect] --disable-dvdnav disable libdvdnav [autodetect] --disable-dvdread disable libdvdread [autodetect] --disable-dvdread-internal disable internal libdvdread [autodetect] @@ -587,6 +588,8 @@ _libdvdcss_internal=auto _xanim=auto _real=auto _live=auto +_nemesi=auto +_native_rtsp=yes _xinerama=auto _mga=no _xmga=auto @@ -944,6 +947,8 @@ for ac_option do --disable-real) _real=no ;; --enable-live) _live=yes ;; --disable-live) _live=no ;; + --enable-nemesi) _nemesi=yes ;; + --disable-nemesi) _nemesi=no ;; --enable-xinerama) _xinerama=yes ;; --disable-xinerama) _xinerama=no ;; --enable-mga) _mga=yes ;; @@ -6222,6 +6227,24 @@ else fi echores "$_qtx" +echocheck "Nemesi Streaming Media libraries" +if test "$_nemesi" = auto && test "$_network" = yes ; then + _nemesi=no + if $_pkg_config --exists libnemesi ; then + _ld_extra="$_ld_extra `$_pkg_config --libs libnemesi`" + _nemesi=yes + fi +fi +echores "$_nemesi" + +if test "$_nemesi" = yes; then + _native_rtsp=no + _def_nemesi='#define LIBNEMESI 1' + _inputmodules="nemesi $_inputmodules" +else + _def_nemesi='#undef LIBNEMESI' + _noinputmodules="nemesi $_noinputmodules" +fi echocheck "LIVE555 Streaming Media libraries" if test "$_live" = auto && test "$_network" = yes ; then @@ -6254,11 +6277,11 @@ EOF fi fi fi -if test "$_live" = yes && test "$_network" = yes ; then +if test "$_live" = yes && test "$_network" = yes && test "$_nemesi" = no; then _res_comment="using $_livelibdir" _def_live='#define STREAMING_LIVE555 1' _inputmodules="live555 $_inputmodules" -elif test "$_live_dist" = yes && test "$_network" = yes ; then +elif test "$_live_dist" = yes && test "$_network" = yes && test "$_nemesi" = no; then _res_comment="using distribution version" _live="yes" _def_live='#define STREAMING_LIVE555 1' @@ -7519,6 +7542,8 @@ EXESUF = $_exesuf MPLAYER_NETWORK = $_network FTP = $_ftp STREAMING_LIVE555 = $_live +LIBNEMESI = $_nemesi +NATIVE_RTSP = $_native_rtsp VSTREAM = $_vstream STREAM_CACHE = $_stream_cache DVBIN = $_dvbin @@ -8084,6 +8109,9 @@ $_def_real_path /* LIVE555 Streaming Media library support */ $_def_live +/* libnemesi Streaming Media library support */ +$_def_nemesi + /* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/ $_def_fastmemcpy Modified: trunk/libmpdemux/Makefile ============================================================================== --- trunk/libmpdemux/Makefile (original) +++ trunk/libmpdemux/Makefile Wed Sep 19 23:38:22 2007 @@ -48,6 +48,7 @@ SRCS_COMMON = asfheader.c \ SRCS_COMMON-$(GIF) += demux_gif.c SRCS_COMMON-$(LIBAVFORMAT) += demux_lavf.c SRCS_COMMON-$(LIBDV) += demux_rawdv.c +SRCS_COMMON-$(LIBNEMESI) += demux_nemesi.c SRCS_COMMON-$(LIBNUT) += demux_nut.c SRCS_COMMON-$(LIBVORBIS) += demux_ogg.c SRCS_COMMON-$(MUSEPACK) += demux_mpc.c Added: trunk/libmpdemux/demux_nemesi.c ============================================================================== --- (empty file) +++ trunk/libmpdemux/demux_nemesi.c Wed Sep 19 23:38:22 2007 @@ -0,0 +1,439 @@ +/* + * Copyright (C) 2007 Alessandro Molina <amol.wrk(a)gmail.com> + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MPlayer; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "demux_nemesi.h" +#include "stheader.h" +#define HAVE_STRUCT_SOCKADDR_STORAGE +#include "nemesi/rtsp.h" +#include "nemesi/rtp.h" + +int rtsp_transport_tcp = 0; +int rtsp_transport_sctp = 0; +// extern int rtsp_port; + +typedef enum { NEMESI_SESSION_VIDEO, + NEMESI_SESSION_AUDIO } Nemesi_SessionType; + +typedef struct { + rtsp_ctrl * rtsp; + rtp_session * session[2]; + rtp_frame first_pkt[2]; + double time[2]; + double seek; +} Nemesi_DemuxerStreamData; + +static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd, + Nemesi_SessionType stype, + rtp_session * sess, + rtp_buff * buff, unsigned int * fps) +{ + extern float force_fps; + rtp_ssrc *ssrc; + rtsp_ctrl * ctl = ndsd->rtsp; + rtp_frame * fr = &ndsd->first_pkt[stype]; + rtp_buff trash_buff; + + ndsd->session[stype] = sess; + + if (buff == NULL) + buff = &trash_buff; + + if ( (buff != NULL) || (fps != NULL) ) { + rtp_fill_buffers(rtsp_get_rtp_th(ctl)); + for (ssrc = rtp_active_ssrc_queue(rtsp_get_rtp_queue(ctl)); + ssrc; + ssrc = rtp_next_active_ssrc(ssrc)) { + if (ssrc->rtp_sess == sess) { + rtp_fill_buffer(ssrc, fr, buff); + break; + } + } + + if ( (force_fps == 0.0) && (fps != NULL) ) { + rtp_fill_buffers(rtsp_get_rtp_th(ctl)); + *fps = rtp_get_fps(ssrc); + } + } +} + +demuxer_t* demux_open_rtp(demuxer_t* demuxer) +{ + nms_rtsp_hints hints; + char * url = demuxer->stream->streaming_ctrl->url->url; + rtsp_ctrl * ctl; + RTSP_Error reply; + rtsp_medium * media; + Nemesi_DemuxerStreamData * ndsd = calloc(1, sizeof(Nemesi_DemuxerStreamData)); + + memset(&hints,0,sizeof(hints)); +// if (rtsp_port) hints.first_rtp_port = rtsp_port; + if (rtsp_transport_tcp) { + hints.pref_rtsp_proto = TCP; + hints.pref_rtp_proto = TCP; + } + if (rtsp_transport_sctp) { + hints.pref_rtsp_proto = SCTP; + hints.pref_rtp_proto = SCTP; + } + + mp_msg(MSGT_DEMUX, MSGL_INFO, "Initializing libNemesi\n"); + if ((ctl = rtsp_init(&hints)) == NULL) { + free(ndsd); + return STREAM_ERROR; + } + + ndsd->rtsp = ctl; + demuxer->priv = ndsd; + //nms_verbosity_set(1); + + mp_msg(MSGT_DEMUX, MSGL_INFO, "Opening: %s\n", url); + if (rtsp_open(ctl, url)) { + mp_msg(MSGT_DEMUX, MSGL_ERR, "rtsp_open failed.\n"); + return demuxer; + } + + reply = rtsp_wait(ctl); + if (reply.got_error) { + mp_msg(MSGT_DEMUX, MSGL_ERR, + "OPEN Error from the server: %s\n", + reply.message.reply_str); + return demuxer; + } + + rtsp_play(ctl, 0, 0); + reply = rtsp_wait(ctl); + if (reply.got_error) { + mp_msg(MSGT_DEMUX, MSGL_ERR, + "PLAY Error from the server: %s\n", + reply.message.reply_str); + return demuxer; + } + + media = ctl->rtsp_queue->media_queue; + for (; media; media=media->next) { + sdp_medium_info * info = media->medium_info; + rtp_session * sess = media->rtp_sess; + + int media_format = atoi(info->fmts); + rtp_pt * ptinfo = rtp_get_pt_info(sess, media_format); + char const * format_name = ptinfo ? ptinfo->name : NULL; + + if (sess->parsers[media_format] == NULL) { + mp_msg(MSGT_DEMUX, MSGL_ERR, + "libNemesi unsupported media format: %s\n", + format_name ? format_name : info->fmts); + continue; + } + else { + mp_msg(MSGT_DEMUX, MSGL_INFO, + "libNemesi supported media: %s\n", + format_name); + } + + if (ptinfo->type == AU) { + if (ndsd->session[NEMESI_SESSION_AUDIO] == NULL) { + sh_audio_t* sh_audio = new_sh_audio(demuxer,0); + WAVEFORMATEX* wf = calloc(1,sizeof(WAVEFORMATEX)); + demux_stream_t* d_audio = demuxer->audio; + + mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as AUDIO stream...\n"); + + link_session_and_fetch_conf(ndsd, NEMESI_SESSION_AUDIO, + sess, NULL, NULL); + + sh_audio->wf = wf; + d_audio->sh = sh_audio; + sh_audio->ds = d_audio; + wf->nSamplesPerSec = 0; + + //List of known audio formats + if (!strcmp(format_name, "MPA")) + wf->wFormatTag = + sh_audio->format = 0x55; + else if (!strcmp(format_name, "vorbis")) + wf->wFormatTag = + sh_audio->format = mmioFOURCC('v','r','b','s'); + else + mp_msg(MSGT_DEMUX, MSGL_WARN, + "Unknown MPlayer format code for MIME" + " type \"audio/%s\"\n", format_name); + } else { + mp_msg(MSGT_DEMUX, MSGL_ERR, + "There is already an audio session registered," + " ignoring...\n"); + } + } else if (ptinfo->type == VI) { + if (ndsd->session[NEMESI_SESSION_AUDIO] == NULL) { + sh_video_t* sh_video; + BITMAPINFOHEADER* bih; + demux_stream_t* d_video; + int fps = 0; + rtp_buff buff; + + mp_msg(MSGT_DEMUX, MSGL_INFO, "Detected as VIDEO stream...\n"); + + link_session_and_fetch_conf(ndsd, NEMESI_SESSION_VIDEO, + sess, &buff, &fps); + + if (buff.len) { + bih = calloc(1,sizeof(BITMAPINFOHEADER)+buff.len); + bih->biSize = sizeof(BITMAPINFOHEADER)+buff.len; + memcpy(bih+1, buff.data, buff.len); + } else { + bih = calloc(1,sizeof(BITMAPINFOHEADER)); + bih->biSize = sizeof(BITMAPINFOHEADER); + } + + sh_video = new_sh_video(demuxer,0); + sh_video->bih = bih; + d_video = demuxer->video; + d_video->sh = sh_video; + sh_video->ds = d_video; + + if (fps) + sh_video->fps = fps; + + //List of known video formats + if (!strcmp(format_name, "MPV")) { + bih->biCompression = + sh_video->format = mmioFOURCC('M','P','E','G'); + } else if (!strcmp(format_name, "H264")) { + bih->biCompression = + sh_video->format = mmioFOURCC('H','2','6','4'); + } else { + mp_msg(MSGT_DEMUX, MSGL_WARN, + "Unknown MPlayer format code for MIME" + " type \"video/%s\"\n", format_name); + } + } else { + mp_msg(MSGT_DEMUX, MSGL_ERR, + "There is already a video session registered," + " ignoring...\n"); + } + } else { + mp_msg(MSGT_DEMUX, MSGL_ERR, "Unsupported media type\n"); + } + } + + demuxer->stream->eof = 0; + + return demuxer; +} + +static int get_data_for_session(Nemesi_DemuxerStreamData * ndsd, + Nemesi_SessionType stype, rtp_frame * fr) +{ + rtsp_ctrl * ctl = ndsd->rtsp; + rtp_ssrc *ssrc = NULL; + + for (ssrc = rtp_active_ssrc_queue(rtsp_get_rtp_queue(ctl)); + ssrc; + ssrc = rtp_next_active_ssrc(ssrc)) { + if (ssrc->rtp_sess == ndsd->session[stype]) { + if (ndsd->first_pkt[stype].len != 0) { + fr->data = ndsd->first_pkt[stype].data; + fr->time_sec = ndsd->first_pkt[stype].time_sec; + fr->len = ndsd->first_pkt[stype].len; + ndsd->first_pkt[stype].len = 0; + return RTP_FILL_OK; + } else { + rtp_buff buff; + return rtp_fill_buffer(ssrc, fr, &buff); + } + } + } + + return RTP_SSRC_NOTVALID; +} + +int demux_rtp_fill_buffer(demuxer_t* demuxer, demux_stream_t* ds) +{ + Nemesi_DemuxerStreamData * ndsd = demuxer->priv; + Nemesi_SessionType stype; + rtsp_ctrl * ctl = ndsd->rtsp; + rtp_thread * rtp_th = rtsp_get_rtp_th(ctl); + rtp_frame fr; + + demux_packet_t* dp; + + if ( (!ctl->rtsp_queue) || (demuxer->stream->eof) || (rtp_fill_buffers(rtp_th)) ) { + mp_msg(MSGT_DEMUX, MSGL_INFO, "End of Stream...\n"); + demuxer->stream->eof = 1; + return 0; + } + + if (ds == demuxer->video) + stype = NEMESI_SESSION_VIDEO; + else if (ds == demuxer->audio) + stype = NEMESI_SESSION_AUDIO; + else + return 0; + + if(!get_data_for_session(ndsd, stype, &fr)) { + dp = new_demux_packet(fr.len); + memcpy(dp->buffer, fr.data, fr.len); + fr.time_sec += ndsd->seek; + ndsd->time[stype] = dp->pts = fr.time_sec; + ds_add_packet(ds, dp); + } + else { + stype = (stype + 1) % 2; + if (stype == NEMESI_SESSION_VIDEO) + ds = demuxer->video; + else + ds = demuxer->audio; + + if(!get_data_for_session(ndsd, stype, &fr)) { + dp = new_demux_packet(fr.len); + memcpy(dp->buffer, fr.data, fr.len); + fr.time_sec += ndsd->seek; + ndsd->time[stype] = dp->pts = fr.time_sec; + ds_add_packet(ds, dp); + } + } + + return 1; +} + + +void demux_close_rtp(demuxer_t* demuxer) +{ + Nemesi_DemuxerStreamData * ndsd = demuxer->priv; + rtsp_ctrl * ctl = ndsd->rtsp; + RTSP_Error err; + + mp_msg(MSGT_DEMUX, MSGL_INFO, "Closing libNemesi RTSP Stream...\n"); + + if (ndsd == NULL) + return; + + free(ndsd); + + if (rtsp_close(ctl)) { + err = rtsp_wait(ctl); + if (err.got_error) + mp_msg(MSGT_DEMUX, MSGL_ERR, + "Error Closing Stream: %s\n", + err.message.reply_str); + } + + rtsp_uninit(ctl); +} + +static void demux_seek_rtp(demuxer_t *demuxer, float rel_seek_secs, + float audio_delay, int flags) +{ + Nemesi_DemuxerStreamData * ndsd = demuxer->priv; + rtsp_ctrl * ctl = ndsd->rtsp; + sdp_attr * r_attr = NULL; + sdp_range r = {0, 0}; + double time = ndsd->time[NEMESI_SESSION_VIDEO] ? + ndsd->time[NEMESI_SESSION_VIDEO] : + ndsd->time[NEMESI_SESSION_AUDIO]; + + if (!ctl->rtsp_queue) + return; + + r_attr = sdp_get_attr(ctl->rtsp_queue->info->attr_list, "range"); + if (r_attr) + r = sdp_parse_range(r_attr->value); + + //flags & 1 -> absolute seek + //flags & 2 -> percent seek + if (flags == 0) { + time += rel_seek_secs; + if (time < r.begin) + time = r.begin; + else if (time > r.end) + time = r.end; + ndsd->seek = time; + + mp_msg(MSGT_DEMUX,MSGL_WARN,"libNemesi SEEK %f on %f - %f)\n", + time, r.begin, r.end); + + if (!rtsp_seek(ctl, time, 0)) { + RTSP_Error err = rtsp_wait(ctl); + if (err.got_error) { + mp_msg(MSGT_DEMUX, MSGL_ERR, + "Error Performing Seek: %s\n", + err.message.reply_str); + demuxer->stream->eof = 1; + } + else + mp_msg(MSGT_DEMUX, MSGL_INFO, "Seek, performed\n"); + } + else { + mp_msg(MSGT_DEMUX, MSGL_ERR, "Unable to pause stream to perform seek\n"); + demuxer->stream->eof = 1; + } + } + else + mp_msg(MSGT_DEMUX, MSGL_ERR, "Unsupported seek type\n"); +} + +static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg) +{ + Nemesi_DemuxerStreamData * ndsd = demuxer->priv; + rtsp_ctrl * ctl = ndsd->rtsp; + sdp_attr * r_attr = NULL; + sdp_range r = {0, 0}; + double time = ndsd->time[NEMESI_SESSION_VIDEO] ? + ndsd->time[NEMESI_SESSION_VIDEO] : + ndsd->time[NEMESI_SESSION_AUDIO]; + + if (!ctl->rtsp_queue) + return DEMUXER_CTRL_DONTKNOW; + + r_attr = sdp_get_attr(ctl->rtsp_queue->info->attr_list, "range"); + if (r_attr) + r = sdp_parse_range(r_attr->value); + + switch (cmd) { + case DEMUXER_CTRL_GET_TIME_LENGTH: + if (r.end == 0) + return DEMUXER_CTRL_DONTKNOW; + + *((double *)arg) = ((double)r.end) - ((double)r.begin); + return DEMUXER_CTRL_OK; + + case DEMUXER_CTRL_GET_PERCENT_POS: + if (r.end == 0) + return DEMUXER_CTRL_DONTKNOW; + + *((int *)arg) = (int)( time * 100 / (r.end - r.begin) ); + return DEMUXER_CTRL_OK; + default: + return DEMUXER_CTRL_DONTKNOW; + } +} + +demuxer_desc_t demuxer_desc_rtp = { + "libNemesi demuxer", + "rtp", + "", + "Alessandro Molina", + "requires libNemesi", + DEMUXER_TYPE_RTP, + 0, // no autodetect + NULL, + demux_rtp_fill_buffer, + demux_open_rtp, + demux_close_rtp, + demux_seek_rtp, + demux_rtp_control +}; Added: trunk/libmpdemux/demux_nemesi.h ============================================================================== --- (empty file) +++ trunk/libmpdemux/demux_nemesi.h Wed Sep 19 23:38:22 2007 @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2007 Alessandro Molina <amol.wrk(a)gmail.com> + * based on previous Live555 RTP support. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MPlayer; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +#ifndef DEMUX_NEMESI_H +#define DEMUX_NEMESI_H + +#include <stdlib.h> +#include <stdio.h> +#include "stream/stream.h" +#include "demuxer.h" + + +/** + * Open the RTP demuxer + */ +demuxer_t* demux_open_rtp(demuxer_t* demuxer); + +/** + * Read from the RTP demuxer + */ +int demux_rtp_fill_buffer(demuxer_t *demux, demux_stream_t* ds); + +/** + * Close the RTP demuxer + */ +void demux_close_rtp(demuxer_t* demuxer); + +#endif /* DEMUX_NEMESI_H */ + Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c (original) +++ trunk/libmpdemux/demuxer.c Wed Sep 19 23:38:22 2007 @@ -116,7 +116,7 @@ demuxer_desc_t* demuxer_list[] = { #endif &demuxer_desc_audio, &demuxer_desc_mpeg_ty, -#ifdef STREAMING_LIVE555 +#if defined(STREAMING_LIVE555) || defined(LIBNEMESI) &demuxer_desc_rtp, #endif #ifdef USE_LIBAVFORMAT Modified: trunk/stream/Makefile ============================================================================== --- trunk/stream/Makefile (original) +++ trunk/stream/Makefile Wed Sep 19 23:38:22 2007 @@ -28,19 +28,22 @@ SRCS_COMMON-$(MPLAYER_NETWORK) += stre udp.c \ tcp.c \ stream_rtp.c \ - stream_rtsp.c \ stream_udp.c \ + realrtsp/asmrp.c \ + realrtsp/real.c \ + realrtsp/rmff.c \ + realrtsp/sdpplin.c \ + realrtsp/xbuffer.c \ + +SRCS_COMMON-$(NATIVE_RTSP) += stream_rtsp.c \ freesdp/common.c \ freesdp/errorlist.c \ freesdp/parser.c \ librtsp/rtsp.c \ librtsp/rtsp_rtp.c \ librtsp/rtsp_session.c \ - realrtsp/asmrp.c \ - realrtsp/real.c \ - realrtsp/rmff.c \ - realrtsp/sdpplin.c \ - realrtsp/xbuffer.c \ + +SRCS_COMMON-$(LIBNEMESI) += stream_nemesi.c SRCS_COMMON-$(PVR) += stream_pvr.c SRCS_COMMON-$(RADIO) += stream_radio.c Added: trunk/stream/stream_nemesi.c ============================================================================== --- (empty file) +++ trunk/stream/stream_nemesi.c Wed Sep 19 23:38:22 2007 @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2007 Alessandro Molina <amol.wrk(a)gmail.com> + * based on previous RTSP support from Benjamin Zores. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MPlayer; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#define HAVE_STRUCT_SOCKADDR_STORAGE + +#include <stdlib.h> +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> +#include "config.h" + +#include "nemesi/rtsp.h" +#include "libmpdemux/demux_nemesi.h" + +#include <errno.h> + +#include "stream.h" +#include "tcp.h" + +extern int network_bandwidth; +int rtsp_port = 0; +char *rtsp_destination = NULL; + +static int rtsp_streaming_seek(int fd, off_t pos, + streaming_ctrl_t* streaming_ctrl) { + return -1; +} + +static int rtsp_streaming_open (stream_t *stream, int mode, void *opts, + int *file_format) +{ + rtsp_ctrl * ctl; + extern int index_mode; + URL_t *url; + stream->fd = -1; + + mp_msg (MSGT_OPEN, MSGL_V, "STREAM_RTSP, URL: %s\n", stream->url); + stream->streaming_ctrl = streaming_ctrl_new (); + if (!stream->streaming_ctrl) + return STREAM_ERROR; + + stream->streaming_ctrl->bandwidth = network_bandwidth; + url = url_new(stream->url); + stream->streaming_ctrl->url = check4proxies(url); + stream->streaming_ctrl->streaming_seek = rtsp_streaming_seek; + + *file_format = DEMUXER_TYPE_RTP; + stream->type = STREAMTYPE_STREAM; + return STREAM_OK; +} + +stream_info_t stream_info_rtsp = { + "RTSP streaming", + "rtsp", + "Alessandro Molina", + "implemented over libnemesi", + rtsp_streaming_open, + {"rtsp", NULL}, + NULL, + 0 /* Urls are an option string */ +}; +

5 5

r25521 - trunk/libmpdemux/demux_ogg.c
by reimar 22 Jan '08

22 Jan '08

Author: reimar Date: Mon Dec 24 16:56:33 2007 New Revision: 25521 Log: Get rid of some of the more excessive () and casts. Modified: trunk/libmpdemux/demux_ogg.c Modified: trunk/libmpdemux/demux_ogg.c ============================================================================== --- trunk/libmpdemux/demux_ogg.c (original) +++ trunk/libmpdemux/demux_ogg.c Mon Dec 24 16:56:33 2007 @@ -182,7 +182,7 @@ void demux_ogg_add_sub (ogg_stream_t* os duration <<= 8; duration |= (unsigned char)packet[i]; } - if ((hdrlen > 0) && (duration > 0)) { + if (hdrlen > 0 && duration > 0) { float pts; if(pack->granulepos == -1) pack->granulepos = os->lastpos + os->lastsize; @@ -283,7 +283,7 @@ static unsigned char* demux_ogg_read_pac { os->lastpos = pack->granulepos >> keyframe_granule_shift; os->lastpos += pack->granulepos & iframemask; - *flags = ((pack->granulepos & iframemask) == 0); + *flags = (pack->granulepos & iframemask) == 0; } else { @@ -351,7 +351,7 @@ static void demux_ogg_check_comments(dem const char *hdr, *val; char **cmt = vc->user_comments; int index, i; - ogg_demuxer_t *ogg_d = (ogg_demuxer_t *)d->priv; + ogg_demuxer_t *ogg_d = d->priv; struct table { const char *ogg; const char *mp; @@ -456,9 +456,9 @@ static int demux_ogg_add_packet(demux_st // (PACKET_TYPE_HEADER bit doesn't even exist for theora ?!) // We jump nothing for FLAC. Ain't this great? Packet contents have to be // handled differently for each and every stream type. The joy! The joy! - if(!os->flac && ((*pack->packet & PACKET_TYPE_HEADER) && - (ds != d->audio || ( ((sh_audio_t*)ds->sh)->format != FOURCC_VORBIS || os->hdr_packets >= NUM_VORBIS_HDR_PACKETS ) ) && - (ds != d->video || (((sh_video_t*)ds->sh)->format != FOURCC_THEORA)))) + if(!os->flac && (*pack->packet & PACKET_TYPE_HEADER) && + (ds != d->audio || ((sh_audio_t*)ds->sh)->format != FOURCC_VORBIS || os->hdr_packets >= NUM_VORBIS_HDR_PACKETS ) && + (ds != d->video || (((sh_video_t*)ds->sh)->format != FOURCC_THEORA))) return 0; // For vorbis packet the packet is the data, for other codec we must jump @@ -629,7 +629,7 @@ extern unsigned int store_ughvlc(unsigne track. */ int demux_ogg_sub_id(demuxer_t *demuxer, int index) { - ogg_demuxer_t *ogg_d = (ogg_demuxer_t *)demuxer->priv; + ogg_demuxer_t *ogg_d = demuxer->priv; return (index < 0) ? index : (index >= ogg_d->n_text) ? -1 : ogg_d->text_ids[index]; } @@ -638,7 +638,7 @@ int demux_ogg_sub_id(demuxer_t *demuxer, * \param id The ogg track number of the subtitle track. */ static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id) { - ogg_demuxer_t *ogg_d = (ogg_demuxer_t *)demuxer->priv; + ogg_demuxer_t *ogg_d = demuxer->priv; int i; for (i = 0; i < ogg_d->n_text; i++) if (ogg_d->text_ids[i] == id) return i; @@ -650,7 +650,7 @@ static int demux_ogg_sub_reverse_id(demu * \param index The subtitle number. */ char *demux_ogg_sub_lang(demuxer_t *demuxer, int index) { - ogg_demuxer_t *ogg_d = (ogg_demuxer_t *)demuxer->priv; + ogg_demuxer_t *ogg_d = demuxer->priv; return (index < 0) ? NULL : (index >= ogg_d->n_text) ? NULL : ogg_d->text_langs[index]; } @@ -682,7 +682,7 @@ static void fixup_vorbis_wf(sh_audio_t * memcpy(buf[i], op[i].packet, op[i].bytes); op[i].b_o_s = (i==0); - ris = vorbis_synthesis_headerin(&(os->vi),&vc,&(op[i])); + ris = vorbis_synthesis_headerin(&os->vi,&vc,&op[i]); if(ris < 0) { init_error = 1; mp_msg(MSGT_DECAUDIO,MSGL_ERR,"DEMUX_OGG: header n. %d broken! len=%ld, code: %d\n", i, op[i].bytes, ris); @@ -709,7 +709,7 @@ static void fixup_vorbis_wf(sh_audio_t * } sh->wf->cbSize = offset; mp_msg(MSGT_DEMUX,MSGL_V, "demux_ogg, extradata size: %d\n", sh->wf->cbSize); - sh->wf = (WAVEFORMATEX*)realloc(sh->wf, sizeof(WAVEFORMATEX) + sh->wf->cbSize); + sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX) + sh->wf->cbSize); if(op[0].bytes >= 29) { unsigned int br; @@ -807,7 +807,7 @@ int demux_ogg_open(demuxer_t* demuxer) { } /// Init the data structure needed for a logical stream - ogg_d->subs = (ogg_stream_t*)realloc(ogg_d->subs,(ogg_d->num_sub+1)*sizeof(ogg_stream_t)); + ogg_d->subs = realloc(ogg_d->subs,(ogg_d->num_sub+1)*sizeof(ogg_stream_t)); memset(&ogg_d->subs[ogg_d->num_sub],0,sizeof(ogg_stream_t)); /// Get the stream serial number s_no = ogg_page_serialno(page); @@ -1046,9 +1046,9 @@ int demux_ogg_open(demuxer_t* demuxer) { text_id = ogg_d->num_sub; new_sh_sub(demuxer, ogg_d->n_text); ogg_d->n_text++; - ogg_d->text_ids = (int *)realloc(ogg_d->text_ids, sizeof(int) * ogg_d->n_text); + ogg_d->text_ids = realloc(ogg_d->text_ids, sizeof(int) * ogg_d->n_text); ogg_d->text_ids[ogg_d->n_text - 1] = ogg_d->num_sub; - ogg_d->text_langs = (char **)realloc(ogg_d->text_langs, sizeof(char *) * ogg_d->n_text); + ogg_d->text_langs = realloc(ogg_d->text_langs, sizeof(char *) * ogg_d->n_text); ogg_d->text_langs[ogg_d->n_text - 1] = NULL; //// Unknown header type } else @@ -1066,7 +1066,7 @@ int demux_ogg_open(demuxer_t* demuxer) { // if(sh_a->wf) print_wave_header(sh_a->wf,MSGL_INFO); } /// Is it the stream we want - if(demuxer->audio->id == (n_audio - 1)) { + if(demuxer->audio->id == n_audio - 1) { demuxer->audio->sh = sh_a; sh_a->ds = demuxer->audio; ds = demuxer->audio; @@ -1079,7 +1079,7 @@ int demux_ogg_open(demuxer_t* demuxer) { demuxer->video->id = n_video - 1; // if(sh_v->bih) print_video_header(sh_v->bih,MSGL_INFO); } - if(demuxer->video->id == (n_video - 1)) { + if(demuxer->video->id == n_video - 1) { demuxer->video->sh = sh_v; sh_v->ds = demuxer->video; ds = demuxer->video; @@ -1101,11 +1101,11 @@ int demux_ogg_open(demuxer_t* demuxer) { goto err_out; } - if(!n_video || (video_id < 0)) + if(!n_video || video_id < 0) demuxer->video->id = -2; else demuxer->video->id = video_id; - if(!n_audio || (audio_id < 0)) + if(!n_audio || audio_id < 0) demuxer->audio->id = -2; else demuxer->audio->id = audio_id; @@ -1467,19 +1467,19 @@ static void demux_ogg_seek(demuxer_t *de //prepare another seek because we are off by more than 1s pos += (gp - op.granulepos) * (pos - old_pos) / (op.granulepos - old_gp); if (pos < 0) pos = 0; - if (pos < (demuxer->movi_end - demuxer->movi_start)) { + if (pos < demuxer->movi_end - demuxer->movi_start) { do_seek=1; break; } } } - if (is_gp_valid && (pos > 0) && (old_gp > gp) - && (2 * (old_gp - op.granulepos) < old_gp - gp)) { + if (is_gp_valid && pos > 0 && old_gp > gp + && 2 * (old_gp - op.granulepos) < old_gp - gp) { /* prepare another seek because looking for a syncpoint destroyed the backward search */ pos = old_pos - 1.5 * (old_pos - pos); if (pos < 0) pos = 0; - if (pos < (demuxer->movi_end - demuxer->movi_start)) { + if (pos < demuxer->movi_end - demuxer->movi_start) { do_seek=1; break; } @@ -1553,12 +1553,12 @@ static int demux_ogg_control(demuxer_t * switch(cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: if (ogg_d->final_granulepos<=0) return DEMUXER_CTRL_DONTKNOW; - *((double *)arg)=(double)ogg_d->final_granulepos / rate; + *(double *)arg=(double)ogg_d->final_granulepos / rate; return DEMUXER_CTRL_GUESS; case DEMUXER_CTRL_GET_PERCENT_POS: if (ogg_d->final_granulepos<=0) return DEMUXER_CTRL_DONTKNOW; - *((int *)arg)=(int)( (os->lastpos*100) / ogg_d->final_granulepos); + *(int *)arg=(os->lastpos*100) / ogg_d->final_granulepos; return DEMUXER_CTRL_OK; default:

11 31

r25350 - in trunk: mpcommon.c spudec.c spudec.h vobsub.c
by ulion 18 Jan '08

18 Jan '08

Author: ulion Date: Tue Dec 11 11:12:58 2007 New Revision: 25350 Log: Fix spudec to display current vobsub immediately after a seek. Modified: trunk/mpcommon.c trunk/spudec.c trunk/spudec.h trunk/vobsub.c Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c (original) +++ trunk/mpcommon.c Tue Dec 11 11:12:58 2007 @@ -97,7 +97,7 @@ void update_subtitles(sh_video_t *sh_vid } } if (len<=0 || !packet) break; - if (timestamp >= 0) + if (vo_vobsub || timestamp >= 0) spudec_assemble(vo_spudec, packet, len, timestamp); } Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c (original) +++ trunk/spudec.c Tue Dec 11 11:12:58 2007 @@ -69,7 +69,7 @@ typedef struct { size_t packet_reserve; /* size of the memory pointed to by packet */ unsigned int packet_offset; /* end of the currently assembled fragment */ unsigned int packet_size; /* size of the packet once all fragments are assembled */ - unsigned int packet_pts; /* PTS for this packet */ + int packet_pts; /* PTS for this packet */ unsigned int palette[4]; unsigned int alpha[4]; unsigned int cuspal[4]; @@ -341,7 +341,7 @@ static void compute_palette(spudec_handl } } -static void spudec_process_control(spudec_handle_t *this, unsigned int pts100) +static void spudec_process_control(spudec_handle_t *this, int pts100) { int a,b; /* Temporary vars */ unsigned int date, type; @@ -376,7 +376,7 @@ static void spudec_process_control(spude /* Menu ID, 1 byte */ mp_msg(MSGT_SPUDEC,MSGL_DBG2,"Menu ID\n"); /* shouldn't a Menu ID type force display start? */ - start_pts = pts100 + date; + start_pts = pts100 < 0 && -pts100 >= date ? 0 : pts100 + date; end_pts = UINT_MAX; display = 1; this->is_forced_sub=~0; // current subtitle is forced @@ -384,7 +384,7 @@ static void spudec_process_control(spude case 0x01: /* Start display */ mp_msg(MSGT_SPUDEC,MSGL_DBG2,"Start display!\n"); - start_pts = pts100 + date; + start_pts = pts100 < 0 && -pts100 >= date ? 0 : pts100 + date; end_pts = UINT_MAX; display = 1; this->is_forced_sub=0; @@ -392,7 +392,7 @@ static void spudec_process_control(spude case 0x02: /* Stop display */ mp_msg(MSGT_SPUDEC,MSGL_DBG2,"Stop display!\n"); - end_pts = pts100 + date; + end_pts = pts100 < 0 && -pts100 >= date ? 0 : pts100 + date; break; case 0x03: /* Palette */ @@ -450,14 +450,17 @@ static void spudec_process_control(spude } } next_control: - if (display) { + if (!display) + continue; + if (end_pts == UINT_MAX && start_off != next_off) { + end_pts = get_be16(this->packet + next_off) * 1024; + end_pts = 1 - pts100 >= end_pts ? 0 : pts100 + end_pts - 1; + } + if (end_pts > 0) { packet_t *packet = calloc(1, sizeof(packet_t)); int i; packet->start_pts = start_pts; - if (end_pts == UINT_MAX && start_off != next_off) { - start_pts = pts100 + get_be16(this->packet + next_off) * 1024; - packet->end_pts = start_pts - 1; - } else packet->end_pts = end_pts; + packet->end_pts = end_pts; packet->current_nibble[0] = current_nibble[0]; packet->current_nibble[1] = current_nibble[1]; packet->start_row = start_row; @@ -479,17 +482,18 @@ static void spudec_process_control(spude } } -static void spudec_decode(spudec_handle_t *this, unsigned int pts100) +static void spudec_decode(spudec_handle_t *this, int pts100) { - if(this->hw_spu) { + if (!this->hw_spu) + spudec_process_control(this, pts100); + else if (pts100 >= 0) { static vo_mpegpes_t packet = { NULL, 0, 0x20, 0 }; static vo_mpegpes_t *pkg=&packet; packet.data = this->packet; packet.size = this->packet_size; packet.timestamp = pts100; this->hw_spu->draw_frame((uint8_t**)&pkg); - } else - spudec_process_control(this, pts100); + } } int spudec_changed(void * this) @@ -498,7 +502,7 @@ int spudec_changed(void * this) return (spu->spu_changed || spu->now_pts > spu->end_pts); } -void spudec_assemble(void *this, unsigned char *packet, unsigned int len, unsigned int pts100) +void spudec_assemble(void *this, unsigned char *packet, unsigned int len, int pts100) { spudec_handle_t *spu = (spudec_handle_t*)this; // spudec_heartbeat(this, pts100); Modified: trunk/spudec.h ============================================================================== --- trunk/spudec.h (original) +++ trunk/spudec.h Tue Dec 11 11:12:58 2007 @@ -4,7 +4,7 @@ #include "libvo/video_out.h" void spudec_heartbeat(void *this, unsigned int pts100); -void spudec_assemble(void *this, unsigned char *packet, unsigned int len, unsigned int pts100); +void spudec_assemble(void *this, unsigned char *packet, unsigned int len, int pts100); void spudec_draw(void *this, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); void spudec_draw_scaled(void *this, unsigned int dxs, unsigned int dys, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); void spudec_update_palette(void *this, unsigned int *palette); Modified: trunk/vobsub.c ============================================================================== --- trunk/vobsub.c (original) +++ trunk/vobsub.c Tue Dec 11 11:12:58 2007 @@ -1297,6 +1297,22 @@ vobsub_get_packet(void *vobhandle, float unsigned int pts100 = 90000 * pts; if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) { packet_queue_t *queue = vob->spu_streams + vobsub_id; + + int reseek_count = 0; + unsigned int lastpts = 0; + while (queue->current_index < queue->packets_size + && queue->packets[queue->current_index].pts100 <= pts100) { + lastpts = queue->packets[queue->current_index].pts100; + ++queue->current_index; + ++reseek_count; + } + while (reseek_count--) { + --queue->current_index; + if (queue->packets[queue->current_index-1].pts100 != UINT_MAX && + queue->packets[queue->current_index-1].pts100 != lastpts) + break; + } + while (queue->current_index < queue->packets_size) { packet_t *pkt = queue->packets + queue->current_index; if (pkt->pts100 != UINT_MAX)

4 6

r25556 - trunk/libmenu/menu_filesel.c
by ulion 17 Jan '08

17 Jan '08

Author: ulion Date: Mon Dec 31 02:20:50 2007 New Revision: 25556 Log: Default use the dir where the current playing file located if path not set. Modified: trunk/libmenu/menu_filesel.c Modified: trunk/libmenu/menu_filesel.c ============================================================================== --- trunk/libmenu/menu_filesel.c (original) +++ trunk/libmenu/menu_filesel.c Mon Dec 31 02:20:50 2007 @@ -31,6 +31,7 @@ int menu_keepdir = 0; char *menu_chroot = NULL; +extern char *filename; struct list_entry_s { struct list_entry p; @@ -425,8 +426,21 @@ static int open_fs(menu_t* menu, char* a } getcwd(wd,PATH_MAX); - if (!path || path[0] == '\0') - path = wd; + if (!path || path[0] == '\0') { + char *slash = NULL; + if (filename && !strstr(filename, "://") && (path=realpath(filename, b))) { + slash = strrchr(path, '/'); +#if defined(__MINGW32__) || defined(__CYGWIN__) + // FIXME: Do we need and can convert all '\\' in path to '/' on win32? + if (!slash) + slash = strrchr(path, '\\'); +#endif + } + if (slash) + slash[1] = '\0'; + else + path = wd; + } if (path[0] != '/') { if(path[strlen(path)-1] != '/') snprintf(b,sizeof(b),"%s/%s/",wd,path);

4 12

r25454 - in trunk: libmpcodecs/vd_zrmjpeg.c libmpcodecs/vf_zrmjpeg.c libvo/vo_bl.c libvo/vo_zr.c libvo/vo_zr2.c
by rik 06 Jan '08

06 Jan '08

Author: rik Date: Tue Dec 18 22:43:12 2007 New Revision: 25454 Log: change license from GPLv2 to 'GPL v2 or later', requested by Diego, I can do that since I wrote the files (based on other stuff from MPlayer (and some external things under GPL v2 or later)) Modified: trunk/libmpcodecs/vd_zrmjpeg.c trunk/libmpcodecs/vf_zrmjpeg.c trunk/libvo/vo_bl.c trunk/libvo/vo_zr.c trunk/libvo/vo_zr2.c Modified: trunk/libmpcodecs/vd_zrmjpeg.c ============================================================================== --- trunk/libmpcodecs/vd_zrmjpeg.c (original) +++ trunk/libmpcodecs/vd_zrmjpeg.c Tue Dec 18 22:43:12 2007 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Rik Snel <rsnel(a)cube.dyndns.org>, license GPL v2 + * Copyright (C) 2005 Rik Snel <rsnel(a)cube.dyndns.org>, license GPL v2 or later * - based on vd_mpegpes.c by A'rpi (C) 2002-2003 * - guess_mjpeg_type code stolen from lav_io.c (C) 2000 Rainer Johanni * <Rainer(a)Johanni.de> from the mjpegtools package Modified: trunk/libmpcodecs/vf_zrmjpeg.c ============================================================================== --- trunk/libmpcodecs/vf_zrmjpeg.c (original) +++ trunk/libmpcodecs/vf_zrmjpeg.c Tue Dec 18 22:43:12 2007 @@ -5,7 +5,7 @@ * as by the zr video driver. */ /* - * Copyright (C) 2005 Rik Snel <rsnel(a)cube.dyndns.org>, license GPL v2 + * Copyright (C) 2005 Rik Snel <rsnel(a)cube.dyndns.org>, license GPL v2 or later * - based on vd_lavc.c by A'rpi (C) 2002-2003 * - parts from ffmpeg Copyright (c) 2000-2003 Fabrice Bellard * Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c (original) +++ trunk/libvo/vo_bl.c Tue Dec 18 22:43:12 2007 @@ -10,7 +10,7 @@ * (these portions are licensed under GNU GPL v2 or "(at your option) * any later version") * - * Other stuff: Copyright (C) Rik Snel 2002, License GNU GPL v2 + * Other stuff: Copyright (C) Rik Snel 2002, License GNU GPL v2 or later * * patch from Stefan Schuermans <1stein(a)schuermans.info>: * - correction of "maxval" in Blinkenlights UDP protcol Modified: trunk/libvo/vo_zr.c ============================================================================== --- trunk/libvo/vo_zr.c (original) +++ trunk/libvo/vo_zr.c Tue Dec 18 22:43:12 2007 @@ -1,6 +1,6 @@ /* * vo_zr.c - playback on zoran cards - * Copyright (C) Rik Snel 2001,2002, License GNU GPL v2 + * Copyright (C) Rik Snel 2001,2002, License GNU GPL v2 or later */ /* $Id$ */ Modified: trunk/libvo/vo_zr2.c ============================================================================== --- trunk/libvo/vo_zr2.c (original) +++ trunk/libvo/vo_zr2.c Tue Dec 18 22:43:12 2007 @@ -1,7 +1,7 @@ /* * vo_zr2.c - playback on zoran cards * Based on vo_zr.c,v 1.27 - * Copyright (C) Rik Snel 2001-2005, License GNU GPL v2 + * Copyright (C) Rik Snel 2001-2005, License GNU GPL v2 or later */ /* $Id$ */

11 19

r21474 - in trunk/libass: ass.c ass.h ass_cache.c ass_font.c ass_fontconfig.c ass_fontconfig.h ass_library.c ass_library.h ass_render.c
by eugeni 06 Jan '08

06 Jan '08

Author: eugeni Date: Sun Dec 3 18:59:13 2006 New Revision: 21474 Modified: trunk/libass/ass.c trunk/libass/ass.h trunk/libass/ass_cache.c trunk/libass/ass_font.c trunk/libass/ass_fontconfig.c trunk/libass/ass_fontconfig.h trunk/libass/ass_library.c trunk/libass/ass_library.h trunk/libass/ass_render.c Log: Keep embedded fonts in ass_library_t and perform actual disk write in fontconfig initialization. This is required for some fontconfig-related improvements. Modified: trunk/libass/ass.c ============================================================================== --- trunk/libass/ass.c (original) +++ trunk/libass/ass.c Sun Dec 3 18:59:13 2006 @@ -1046,86 +1046,6 @@ return 0; } -static char* validate_fname(char* name) -{ - char* fname; - char* p; - char* q; - unsigned code; - int sz = strlen(name); - - q = fname = malloc(sz + 1); - p = name; - while (*p) { - code = utf8_get_char(&p); - if (code == 0) - break; - if ( (code > 0x7F) || - (code == '\\') || - (code == '/') || - (code == ':') || - (code == '*') || - (code == '?') || - (code == '<') || - (code == '>') || - (code == '|') || - (code == 0)) - { - *q++ = '_'; - } else { - *q++ = code; - } - if (p - name > sz) - break; - } - *q = 0; - return fname; -} - -/** - * \brief Add a memory font. - * \param name attachment name - * \param data binary font data - * \param data_size data size -*/ -void ass_add_font(ass_library_t* library, const char* name, char* data, int data_size) -{ - char buf[1000]; - FILE* fp = 0; - int rc; - struct stat st; - char* fname; - const char* fonts_dir = library->fonts_dir; - - if (!fonts_dir) - return; - rc = stat(fonts_dir, &st); - if (rc) { - int res; -#ifndef __MINGW32__ - res = mkdir(fonts_dir, 0700); -#else - res = mkdir(fonts_dir); -#endif - if (res) { - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FailedToCreateDirectory, fonts_dir); - } - } else if (!S_ISDIR(st.st_mode)) { - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir); - } - - fname = validate_fname((char*)name); - - snprintf(buf, 1000, "%s/%s", fonts_dir, fname); - free(fname); - - fp = fopen(buf, "wb"); - if (!fp) return; - - fwrite(data, data_size, 1, fp); - fclose(fp); -} - long long ass_step_sub(ass_track_t* track, long long now, int movement) { int i; Modified: trunk/libass/ass.h ============================================================================== --- trunk/libass/ass.h (original) +++ trunk/libass/ass.h Sun Dec 3 18:59:13 2006 @@ -182,7 +182,7 @@ * \param data binary font data * \param data_size data size */ -void ass_add_font(ass_library_t* library, const char* name, char* data, int data_size); +void ass_add_font(ass_library_t* library, char* name, char* data, int data_size); /** * \brief Calculates timeshift from now to the start of some other subtitle event, depending on movement parameter Modified: trunk/libass/ass_cache.c ============================================================================== --- trunk/libass/ass_cache.c (original) +++ trunk/libass/ass_cache.c Sun Dec 3 18:59:13 2006 @@ -27,6 +27,7 @@ #include <assert.h> #include "mputils.h" +#include "ass.h" #include "ass_fontconfig.h" #include "ass_font.h" #include "ass_bitmap.h" Modified: trunk/libass/ass_font.c ============================================================================== --- trunk/libass/ass_font.c (original) +++ trunk/libass/ass_font.c Sun Dec 3 18:59:13 2006 @@ -26,6 +26,8 @@ #include FT_SYNTHESIS_H #include FT_GLYPH_H +#include "ass.h" +#include "ass_library.h" #include "ass_font.h" #include "ass_bitmap.h" #include "ass_cache.h" Modified: trunk/libass/ass_fontconfig.c ============================================================================== --- trunk/libass/ass_fontconfig.c (original) +++ trunk/libass/ass_fontconfig.c Sun Dec 3 18:59:13 2006 @@ -28,6 +28,8 @@ #include <sys/stat.h> #include "mputils.h" +#include "ass.h" +#include "ass_library.h" #include "ass_fontconfig.h" #ifdef HAVE_FONTCONFIG @@ -184,6 +186,89 @@ return fontconfig_select_with_charset(priv, family, bold, italic, index, 0); } +static char* validate_fname(char* name) +{ + char* fname; + char* p; + char* q; + unsigned code; + int sz = strlen(name); + + q = fname = malloc(sz + 1); + p = name; + while (*p) { + code = utf8_get_char(&p); + if (code == 0) + break; + if ( (code > 0x7F) || + (code == '\\') || + (code == '/') || + (code == ':') || + (code == '*') || + (code == '?') || + (code == '<') || + (code == '>') || + (code == '|') || + (code == 0)) + { + *q++ = '_'; + } else { + *q++ = code; + } + if (p - name > sz) + break; + } + *q = 0; + return fname; +} + +/** + * \brief Process embedded matroska font. Saves it to ~/.mplayer/fonts. + * \param name attachment name + * \param data binary font data + * \param data_size data size +*/ +static void process_fontdata(fc_instance_t* priv, ass_library_t* library, int idx) +{ + char buf[1000]; + FILE* fp = 0; + int rc; + struct stat st; + char* fname; + const char* name = library->fontdata[idx].name; + const char* data = library->fontdata[idx].data; + int data_size = library->fontdata[idx].size; + const char* fonts_dir = library->fonts_dir; + + if (!fonts_dir) + return; + rc = stat(fonts_dir, &st); + if (rc) { + int res; +#ifndef __MINGW32__ + res = mkdir(fonts_dir, 0700); +#else + res = mkdir(fonts_dir); +#endif + if (res) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FailedToCreateDirectory, fonts_dir); + } + } else if (!S_ISDIR(st.st_mode)) { + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir); + } + + fname = validate_fname((char*)name); + + snprintf(buf, 1000, "%s/%s", fonts_dir, fname); + free(fname); + + fp = fopen(buf, "wb"); + if (!fp) return; + + fwrite(data, data_size, 1, fp); + fclose(fp); +} + /** * \brief Init fontconfig. * \param dir additional directoryu for fonts @@ -191,11 +276,13 @@ * \param path default font path * \return pointer to fontconfig private data */ -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) { int rc; struct stat st; fc_instance_t* priv = calloc(1, sizeof(fc_instance_t)); + const char* dir = library->fonts_dir; + int i; rc = FcInit(); assert(rc); @@ -206,6 +293,9 @@ return 0; } + for (i = 0; i < library->num_fontdata; ++i) + process_fontdata(priv, library, i); + if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse) { mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache); @@ -265,7 +355,7 @@ return priv->path_default; } -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path) +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path) { fc_instance_t* priv; Modified: trunk/libass/ass_fontconfig.h ============================================================================== --- trunk/libass/ass_fontconfig.h (original) +++ trunk/libass/ass_fontconfig.h Sun Dec 3 18:59:13 2006 @@ -27,7 +27,7 @@ typedef struct fc_instance_s fc_instance_t; -fc_instance_t* fontconfig_init(const char* dir, const char* family, const char* path); +fc_instance_t* fontconfig_init(ass_library_t* library, const char* family, const char* path); char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index); void fontconfig_done(fc_instance_t* priv); Modified: trunk/libass/ass_library.c ============================================================================== --- trunk/libass/ass_library.c (original) +++ trunk/libass/ass_library.c Sun Dec 3 18:59:13 2006 @@ -71,3 +71,19 @@ *q = strdup(*p); priv->style_overrides[cnt] = NULL; } + +static void grow_array(void **array, int nelem, size_t elsize) +{ + if (!(nelem & 31)) + *array = realloc(*array, (nelem + 32) * elsize); +} + +void ass_add_font(ass_library_t* priv, char* name, char* data, int size) +{ + grow_array((void**)&priv->fontdata, priv->num_fontdata, sizeof(*priv->fontdata)); + priv->fontdata[priv->num_fontdata].name = name; + priv->fontdata[priv->num_fontdata].data = data; + priv->fontdata[priv->num_fontdata].size = size; + priv->num_fontdata ++; +} + Modified: trunk/libass/ass_library.h ============================================================================== --- trunk/libass/ass_library.h (original) +++ trunk/libass/ass_library.h Sun Dec 3 18:59:13 2006 @@ -21,10 +21,19 @@ #ifndef __ASS_LIBRARY_H__ #define __ASS_LIBRARY_H__ +typedef struct ass_fontdata_s { + char* name; + char* data; + int size; +} ass_fontdata_t; + struct ass_library_s { char* fonts_dir; int extract_fonts; char** style_overrides; + + ass_fontdata_t* fontdata; + int num_fontdata; }; #endif Modified: trunk/libass/ass_render.c ============================================================================== --- trunk/libass/ass_render.c (original) +++ trunk/libass/ass_render.c Sun Dec 3 18:59:13 2006 @@ -1928,7 +1928,7 @@ if (priv->fontconfig_priv) fontconfig_done(priv->fontconfig_priv); - priv->fontconfig_priv = fontconfig_init(priv->library->fonts_dir, default_family, default_font); + priv->fontconfig_priv = fontconfig_init(priv->library, default_family, default_font); return !!priv->fontconfig_priv; }

2 1

r25563 - in trunk: drivers/generic_math.h gui/app.h gui/cfg.h gui/interface.h gui/mplayer/common.h gui/mplayer/gmplayer.h gui/mplayer/gtk/about.h gui/mplayer/gtk/common.h gui/mplayer/gtk/eq.h gui/mplayer/gtk/fs.h gui/mplayer/gtk/mb.h gui/mplayer/gtk/menu.h gui/mplayer/gtk/opts.h gui/mplayer/gtk/pl.h gui/mplayer/gtk/sb.h gui/mplayer/gtk/url.h gui/mplayer/play.h gui/mplayer/widgets.h gui/skin/cut.h gui/skin/font.h gui/skin/skin.h gui/win32/dialogs.h gui/win32/gui.h gui/win32/playlist.h gui/wi
by diego 31 Dec '07

31 Dec '07

Author: diego Date: Mon Dec 31 17:15:50 2007 New Revision: 25563 Log: Add explanatory comments to the #endif part of multiple inclusion guards. Modified: trunk/drivers/generic_math.h trunk/gui/app.h trunk/gui/cfg.h trunk/gui/interface.h trunk/gui/mplayer/common.h trunk/gui/mplayer/gmplayer.h trunk/gui/mplayer/gtk/about.h trunk/gui/mplayer/gtk/common.h trunk/gui/mplayer/gtk/eq.h trunk/gui/mplayer/gtk/fs.h trunk/gui/mplayer/gtk/mb.h trunk/gui/mplayer/gtk/menu.h trunk/gui/mplayer/gtk/opts.h trunk/gui/mplayer/gtk/pl.h trunk/gui/mplayer/gtk/sb.h trunk/gui/mplayer/gtk/url.h trunk/gui/mplayer/play.h trunk/gui/mplayer/widgets.h trunk/gui/skin/cut.h trunk/gui/skin/font.h trunk/gui/skin/skin.h trunk/gui/win32/dialogs.h trunk/gui/win32/gui.h trunk/gui/win32/playlist.h trunk/gui/win32/skinload.h trunk/gui/win32/wincfg.h trunk/gui/wm/ws.h trunk/gui/wm/wskeys.h trunk/gui/wm/wsxdnd.h trunk/libaf/dsp.h trunk/libaf/filter.h trunk/libaf/window.h trunk/libao2/audio_out.h trunk/libass/ass.h trunk/libass/ass_bitmap.h trunk/libass/ass_cache.h trunk/libass/ass_font.h trunk/libass/ass_fontconfig.h trunk/libass/ass_library.h trunk/libass/ass_mp.h trunk/libass/ass_types.h trunk/libass/ass_utils.h trunk/libass/mputils.h trunk/libmpcodecs/ae.h trunk/libmpcodecs/ae_faac.h trunk/libmpcodecs/ae_lame.h trunk/libmpcodecs/ae_lavc.h trunk/libmpcodecs/ae_pcm.h trunk/libmpcodecs/ae_toolame.h trunk/libmpcodecs/ae_twolame.h trunk/libmpcodecs/cmmx.h trunk/libmpcodecs/img_format.h trunk/libmpcodecs/mp_image.h trunk/libmpcodecs/mpc_info.h trunk/libmpcodecs/vqf.h trunk/libmpdemux/asf.h trunk/libmpdemux/demux_rtp.h trunk/libmpdemux/demux_rtp_internal.h trunk/libmpdemux/demux_xmms_plugin.h trunk/libmpdemux/mf.h trunk/libmpdemux/ms_hdr.h trunk/libmpdemux/qtpalette.h trunk/libmpdemux/stheader.h trunk/libvo/aspect.h trunk/libvo/fastmemcpy.h trunk/libvo/gl_common.h trunk/libvo/gtf.h trunk/libvo/osd.h trunk/libvo/sub.h trunk/libvo/vesa_lvo.h trunk/libvo/video_out.h trunk/libvo/vosub_vidix.h trunk/libvo/wskeys.h trunk/libvo/x11_common.h trunk/loader/dmo/dmo_guids.h trunk/loader/ext.h trunk/loader/wine/objbase.h trunk/playtree.h trunk/playtreeparser.h trunk/spudec.h trunk/stream/cache2.h trunk/stream/cookies.h trunk/stream/dvbin.h trunk/stream/freesdp/errorlist.c trunk/stream/librtsp/rtsp.h trunk/stream/librtsp/rtsp_session.h trunk/stream/network.h trunk/stream/realrtsp/asmrp.h trunk/stream/realrtsp/real.h trunk/stream/realrtsp/rmff.h trunk/stream/realrtsp/sdpplin.h trunk/stream/realrtsp/xbuffer.h trunk/stream/rtp.h trunk/stream/stream_dvdnav.h trunk/sub_cc.h trunk/subopt-helper.h trunk/subreader.h trunk/vidix/dha.h trunk/vidix/dhahelperwin/dhahelper.h trunk/vidix/fourcc.h trunk/vidix/vidix.h trunk/vidix/vidixlib.h trunk/xvid_vbr.h Modified: trunk/drivers/generic_math.h ============================================================================== --- trunk/drivers/generic_math.h (original) +++ trunk/drivers/generic_math.h Mon Dec 31 17:15:50 2007 @@ -255,4 +255,4 @@ static double inline gen_cos(double x) #undef cos #define cos(x) gen_cos(x) -#endif \ No newline at end of file +#endif /* GENERIC_MATH_H */ Modified: trunk/gui/app.h ============================================================================== --- trunk/gui/app.h (original) +++ trunk/gui/app.h Mon Dec 31 17:15:50 2007 @@ -184,4 +184,4 @@ extern void btnModify( int event,float s extern float btnGetValue( int event ); extern void btnSet( int event,int set ); -#endif +#endif /* GUI_APP_H */ Modified: trunk/gui/cfg.h ============================================================================== --- trunk/gui/cfg.h (original) +++ trunk/gui/cfg.h Mon Dec 31 17:15:50 2007 @@ -69,4 +69,4 @@ extern gtkASS_t gtkASS; extern int cfg_read( void ); extern int cfg_write( void ); -#endif +#endif /* GUI_CFG_H */ Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h (original) +++ trunk/gui/interface.h Mon Dec 31 17:15:50 2007 @@ -223,4 +223,4 @@ extern char * gstrchr( char * str,int c sprintf( s,"%s/%s",d,n ); \ } -#endif +#endif /* GUI_INTERFACE_H */ Modified: trunk/gui/mplayer/common.h ============================================================================== --- trunk/gui/mplayer/common.h (original) +++ trunk/gui/mplayer/common.h Mon Dec 31 17:15:50 2007 @@ -18,4 +18,4 @@ extern void PutImage( txSample * bf,int extern void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac ); extern void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size ); -#endif +#endif /* GUI_COMMON_H */ Modified: trunk/gui/mplayer/gmplayer.h ============================================================================== --- trunk/gui/mplayer/gmplayer.h (original) +++ trunk/gui/mplayer/gmplayer.h Mon Dec 31 17:15:50 2007 @@ -31,4 +31,4 @@ extern void mplMenuMouseHandle( int X,in extern void mplPBInit( void ); extern void mplPBShow( int x, int y ); -#endif +#endif /* GUI_GMPLAYER_H */ Modified: trunk/gui/mplayer/gtk/about.h ============================================================================== --- trunk/gui/mplayer/gtk/about.h (original) +++ trunk/gui/mplayer/gtk/about.h Mon Dec 31 17:15:50 2007 @@ -9,4 +9,4 @@ extern GtkWidget * About; extern GtkWidget * create_About( void ); extern void ShowAboutBox( void ); -#endif +#endif /* GUI_ABOUT_H */ Modified: trunk/gui/mplayer/gtk/common.h ============================================================================== --- trunk/gui/mplayer/gtk/common.h (original) +++ trunk/gui/mplayer/gtk/common.h Mon Dec 31 17:15:50 2007 @@ -21,4 +21,4 @@ extern GtkWidget * AddVScaler( GtkAdjust extern GtkWidget * AddComboBox( GtkWidget * parent ); extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ); -#endif +#endif /* GUI_COMMON_H */ Modified: trunk/gui/mplayer/gtk/eq.h ============================================================================== --- trunk/gui/mplayer/gtk/eq.h (original) +++ trunk/gui/mplayer/gtk/eq.h Mon Dec 31 17:15:50 2007 @@ -9,4 +9,4 @@ extern GtkWidget * Equalizer; extern GtkWidget * create_Equalizer( void ); extern void ShowEqualizer( void ); -#endif +#endif /* GUI_EQ_H */ Modified: trunk/gui/mplayer/gtk/fs.h ============================================================================== --- trunk/gui/mplayer/gtk/fs.h (original) +++ trunk/gui/mplayer/gtk/fs.h Mon Dec 31 17:15:50 2007 @@ -18,4 +18,4 @@ extern void ShowFileSelect( int type, in extern GtkWidget * create_FileSelect( void ); -#endif +#endif /* GUI_FS_H */ Modified: trunk/gui/mplayer/gtk/mb.h ============================================================================== --- trunk/gui/mplayer/gtk/mb.h (original) +++ trunk/gui/mplayer/gtk/mb.h Mon Dec 31 17:15:50 2007 @@ -9,4 +9,4 @@ extern GtkWidget * MessageBox; extern GtkWidget * create_MessageBox( int type ); extern void ShowMessageBox( const char * msg ); -#endif +#endif /* GUI_MB_H */ Modified: trunk/gui/mplayer/gtk/menu.h ============================================================================== --- trunk/gui/mplayer/gtk/menu.h (original) +++ trunk/gui/mplayer/gtk/menu.h Mon Dec 31 17:15:50 2007 @@ -10,4 +10,4 @@ extern GtkWidget * AddSubMenu( GtkWidget extern GtkWidget * AddSeparator( GtkWidget * Menu ); extern GtkWidget * create_PopUpMenu( void ); -#endif +#endif /* GUI_MENU_H */ Modified: trunk/gui/mplayer/gtk/opts.h ============================================================================== --- trunk/gui/mplayer/gtk/opts.h (original) +++ trunk/gui/mplayer/gtk/opts.h Mon Dec 31 17:15:50 2007 @@ -13,4 +13,4 @@ extern GtkWidget * create_AudioConfig( v extern void ShowPreferences( void ); -#endif +#endif /* GUI_OPTS_H */ Modified: trunk/gui/mplayer/gtk/pl.h ============================================================================== --- trunk/gui/mplayer/gtk/pl.h (original) +++ trunk/gui/mplayer/gtk/pl.h Mon Dec 31 17:15:50 2007 @@ -9,4 +9,4 @@ extern void HidePlayList( void ); extern GtkWidget * create_PlayList (void); -#endif +#endif /* GUI_PL_H */ Modified: trunk/gui/mplayer/gtk/sb.h ============================================================================== --- trunk/gui/mplayer/gtk/sb.h (original) +++ trunk/gui/mplayer/gtk/sb.h Mon Dec 31 17:15:50 2007 @@ -9,4 +9,4 @@ extern GtkWidget * SkinBrowser; extern void ShowSkinBrowser( void ); extern GtkWidget * create_SkinBrowser( void ); -#endif +#endif /* GUI_SB_H */ Modified: trunk/gui/mplayer/gtk/url.h ============================================================================== --- trunk/gui/mplayer/gtk/url.h (original) +++ trunk/gui/mplayer/gtk/url.h Mon Dec 31 17:15:50 2007 @@ -8,4 +8,4 @@ extern int gtkVURLDialogBox; extern void ShowURLDialogBox( void ); extern GtkWidget * create_URL( void ); -#endif +#endif /* GUI_URL_H */ Modified: trunk/gui/mplayer/play.h ============================================================================== --- trunk/gui/mplayer/play.h (original) +++ trunk/gui/mplayer/play.h Mon Dec 31 17:15:50 2007 @@ -31,4 +31,4 @@ extern void EventHandling( void ); extern void mplSetFileName( char * dir,char * name,int type ); -#endif +#endif /* GUI_PLAY_H */ Modified: trunk/gui/mplayer/widgets.h ============================================================================== --- trunk/gui/mplayer/widgets.h (original) +++ trunk/gui/mplayer/widgets.h Mon Dec 31 17:15:50 2007 @@ -60,4 +60,4 @@ extern void gtkMessageBox( int type,cons extern void gtkSetLayer( GtkWidget * wdg ); extern void gtkActive( GtkWidget * wdg ); -#endif +#endif /* GUI_WIDGETS_H */ Modified: trunk/gui/skin/cut.h ============================================================================== --- trunk/gui/skin/cut.h (original) +++ trunk/gui/skin/cut.h Mon Dec 31 17:15:50 2007 @@ -7,4 +7,4 @@ extern int cutItemToInt( char * in,cha extern float cutItemToFloat( char * in,char sep,int num ); extern void cutChunk( char * in,char * s1 ); -#endif +#endif /* GUI_CUT_H */ Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h (original) +++ trunk/gui/skin/font.h Mon Dec 31 17:15:50 2007 @@ -34,5 +34,4 @@ extern int fntTextWidth( int id,char * extern int fntRead( char * path,char * fname ); extern txSample * fntRender( wItem * item,int px,const char * fmt,... ); -#endif - +#endif /* GUI_FONT_H */ Modified: trunk/gui/skin/skin.h ============================================================================== --- trunk/gui/skin/skin.h (original) +++ trunk/gui/skin/skin.h Mon Dec 31 17:15:50 2007 @@ -15,4 +15,4 @@ extern char * trimleft( char * in ); extern char * strswap( char * in,char what,char whereof ); extern char * trim( char * in ); -#endif +#endif /* GUI_SKIN_H */ Modified: trunk/gui/win32/dialogs.h ============================================================================== --- trunk/gui/win32/dialogs.h (original) +++ trunk/gui/win32/dialogs.h Mon Dec 31 17:15:50 2007 @@ -131,4 +131,4 @@ #define GTK_MB_WARNING 0x4 #define GTK_MB_SIMPLE 0x8 -#endif +#endif /* GUI_DIALOGS_H */ Modified: trunk/gui/win32/gui.h ============================================================================== --- trunk/gui/win32/gui.h (original) +++ trunk/gui/win32/gui.h Mon Dec 31 17:15:50 2007 @@ -117,4 +117,4 @@ extern void display_eqwindow(gui_t *gui) extern void display_prefswindow(gui_t *gui); extern void display_opensubtitlewindow(gui_t *gui); -#endif +#endif /* GUI_GUI_H */ Modified: trunk/gui/win32/playlist.h ============================================================================== --- trunk/gui/win32/playlist.h (original) +++ trunk/gui/win32/playlist.h Mon Dec 31 17:15:50 2007 @@ -56,4 +56,4 @@ struct playlist_t extern playlist_t *create_playlist(void); extern BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive); -#endif +#endif /* GUI_PLAYLIST_H */ Modified: trunk/gui/win32/skinload.h ============================================================================== --- trunk/gui/win32/skinload.h (original) +++ trunk/gui/win32/skinload.h Mon Dec 31 17:15:50 2007 @@ -212,4 +212,4 @@ extern skin_t *loadskin(char *skindir, i #define evShowWindow 7004 #define evFirstLoad 7005 -#endif +#endif /* GUI_SKINLOAD_H */ Modified: trunk/gui/win32/wincfg.h ============================================================================== --- trunk/gui/win32/wincfg.h (original) +++ trunk/gui/win32/wincfg.h Mon Dec 31 17:15:50 2007 @@ -37,4 +37,4 @@ extern int gui_sub_pos_y; extern int cfg_read(void); extern int cfg_write(void); -#endif +#endif /* GUI_WINCFG_H */ Modified: trunk/gui/wm/ws.h ============================================================================== --- trunk/gui/wm/ws.h (original) +++ trunk/gui/wm/ws.h Mon Dec 31 17:15:50 2007 @@ -257,5 +257,4 @@ extern void wsScreenSaverOff( Display * #define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( (X) > (tX) )&&( (Y) > (tY) )&&( (X) < (bX) )&&( (Y) < (bY) ) ) -#endif - +#endif /* GUI_WS_H */ Modified: trunk/gui/wm/wskeys.h ============================================================================== --- trunk/gui/wm/wskeys.h (original) +++ trunk/gui/wm/wskeys.h Mon Dec 31 17:15:50 2007 @@ -161,5 +161,4 @@ typedef struct extern const TwsKeyNames wsKeyNames[ wsKeyNumber ]; -#endif - +#endif /* GUI_WSKEYS_H */ Modified: trunk/gui/wm/wsxdnd.h ============================================================================== --- trunk/gui/wm/wsxdnd.h (original) +++ trunk/gui/wm/wsxdnd.h Mon Dec 31 17:15:50 2007 @@ -50,4 +50,4 @@ void wsXDNDClearAwareness(wsTWindow* win /* XdndFinished */ #define XDND_FINISHED_TARGET_WIN(e) ((e)->xclient.data.l[0]) -#endif +#endif /* GUI_WSXDND_H */ Modified: trunk/libaf/dsp.h ============================================================================== --- trunk/libaf/dsp.h (original) +++ trunk/libaf/dsp.h Mon Dec 31 17:15:50 2007 @@ -19,4 +19,4 @@ #include <window.h> #include <filter.h> -#endif +#endif /* DSP_H */ Modified: trunk/libaf/filter.h ============================================================================== --- trunk/libaf/filter.h (original) +++ trunk/libaf/filter.h Mon Dec 31 17:15:50 2007 @@ -66,4 +66,4 @@ extern int af_filter_szxform(_ftype_t* a xq[xi]=(xq)[(xi)+(n)]=*(in);\ xi=(++(xi))&((n)-1); -#endif +#endif /* FILTER_H */ Modified: trunk/libaf/window.h ============================================================================== --- trunk/libaf/window.h (original) +++ trunk/libaf/window.h Mon Dec 31 17:15:50 2007 @@ -30,4 +30,4 @@ extern void af_window_blackman(int n,_ft extern void af_window_flattop(int n,_ftype_t* w); extern void af_window_kaiser(int n, _ftype_t* w,_ftype_t b); -#endif +#endif /* WINDOW_H */ Modified: trunk/libao2/audio_out.h ============================================================================== --- trunk/libao2/audio_out.h (original) +++ trunk/libao2/audio_out.h Mon Dec 31 17:15:50 2007 @@ -72,4 +72,4 @@ typedef struct ao_control_vol_s { float right; } ao_control_vol_t; -#endif +#endif /* AUDIO_OUT_H */ Modified: trunk/libass/ass.h ============================================================================== --- trunk/libass/ass.h (original) +++ trunk/libass/ass.h Mon Dec 31 17:15:50 2007 @@ -205,5 +205,4 @@ void ass_add_font(ass_library_t* library */ long long ass_step_sub(ass_track_t* track, long long now, int movement); -#endif - +#endif /* ASS_H */ Modified: trunk/libass/ass_bitmap.h ============================================================================== --- trunk/libass/ass_bitmap.h (original) +++ trunk/libass/ass_bitmap.h Mon Dec 31 17:15:50 2007 @@ -45,5 +45,4 @@ int glyph_to_bitmap(ass_synth_priv_t* pr void ass_free_bitmap(bitmap_t* bm); -#endif - +#endif /* ASS_BITMAP_H */ Modified: trunk/libass/ass_cache.h ============================================================================== --- trunk/libass/ass_cache.h (original) +++ trunk/libass/ass_cache.h Mon Dec 31 17:15:50 2007 @@ -94,5 +94,4 @@ void hashmap_done(hashmap_t* map); void* hashmap_insert(hashmap_t* map, void* key, void* value); void* hashmap_find(hashmap_t* map, void* key); -#endif - +#endif /* ASS_CACHE_H */ Modified: trunk/libass/ass_font.h ============================================================================== --- trunk/libass/ass_font.h (original) +++ trunk/libass/ass_font.h Mon Dec 31 17:15:50 2007 @@ -48,4 +48,4 @@ FT_Glyph ass_font_get_glyph(void* fontco FT_Vector ass_font_get_kerning(ass_font_t* font, uint32_t c1, uint32_t c2); void ass_font_free(ass_font_t* font); -#endif +#endif /* ASS_FONT_H */ Modified: trunk/libass/ass_fontconfig.h ============================================================================== --- trunk/libass/ass_fontconfig.h (original) +++ trunk/libass/ass_fontconfig.h Mon Dec 31 17:15:50 2007 @@ -31,5 +31,4 @@ fc_instance_t* fontconfig_init(ass_libra char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index, uint32_t code); void fontconfig_done(fc_instance_t* priv); -#endif - +#endif /* ASS_FONTCONFIG_H */ Modified: trunk/libass/ass_library.h ============================================================================== --- trunk/libass/ass_library.h (original) +++ trunk/libass/ass_library.h Mon Dec 31 17:15:50 2007 @@ -36,5 +36,4 @@ struct ass_library_s { int num_fontdata; }; -#endif - +#endif /* ASS_LIBRARY_H */ Modified: trunk/libass/ass_mp.h ============================================================================== --- trunk/libass/ass_mp.h (original) +++ trunk/libass/ass_mp.h Mon Dec 31 17:15:50 2007 @@ -50,5 +50,4 @@ typedef struct { int changed; } mp_eosd_images_t; -#endif - +#endif /* ASS_MP_H */ Modified: trunk/libass/ass_types.h ============================================================================== --- trunk/libass/ass_types.h (original) +++ trunk/libass/ass_types.h Mon Dec 31 17:15:50 2007 @@ -110,5 +110,4 @@ typedef struct ass_track_s { parser_priv_t* parser_priv; } ass_track_t; -#endif - +#endif /* ASS_TYPES_H */ Modified: trunk/libass/ass_utils.h ============================================================================== --- trunk/libass/ass_utils.h (original) +++ trunk/libass/ass_utils.h Mon Dec 31 17:15:50 2007 @@ -57,5 +57,4 @@ static inline int double_to_d16(double x return (int)(x * 0x10000); } -#endif - +#endif /* ASS_UTILS_H */ Modified: trunk/libass/mputils.h ============================================================================== --- trunk/libass/mputils.h (original) +++ trunk/libass/mputils.h Mon Dec 31 17:15:50 2007 @@ -8,4 +8,4 @@ #include "libvo/sub.h" // for utf8_get_char #include "libavutil/common.h" -#endif +#endif /* ASS_MPUTILS_H */ Modified: trunk/libmpcodecs/ae.h ============================================================================== --- trunk/libmpcodecs/ae.h (original) +++ trunk/libmpcodecs/ae.h Mon Dec 31 17:15:50 2007 @@ -43,4 +43,4 @@ typedef struct audio_encoder_s { audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params); -#endif +#endif /* MPAE_H */ Modified: trunk/libmpcodecs/ae_faac.h ============================================================================== --- trunk/libmpcodecs/ae_faac.h (original) +++ trunk/libmpcodecs/ae_faac.h Mon Dec 31 17:15:50 2007 @@ -5,4 +5,4 @@ int mpae_init_faac(audio_encoder_t *encoder); -#endif +#endif /* MPAE_FAAC_H */ Modified: trunk/libmpcodecs/ae_lame.h ============================================================================== --- trunk/libmpcodecs/ae_lame.h (original) +++ trunk/libmpcodecs/ae_lame.h Mon Dec 31 17:15:50 2007 @@ -5,4 +5,4 @@ int mpae_init_lame(audio_encoder_t *encoder); -#endif +#endif /* AE_LAME_H */ Modified: trunk/libmpcodecs/ae_lavc.h ============================================================================== --- trunk/libmpcodecs/ae_lavc.h (original) +++ trunk/libmpcodecs/ae_lavc.h Mon Dec 31 17:15:50 2007 @@ -5,4 +5,4 @@ int mpae_init_lavc(audio_encoder_t *encoder); -#endif +#endif /* AE_LAVC_H */ Modified: trunk/libmpcodecs/ae_pcm.h ============================================================================== --- trunk/libmpcodecs/ae_pcm.h (original) +++ trunk/libmpcodecs/ae_pcm.h Mon Dec 31 17:15:50 2007 @@ -5,4 +5,4 @@ int mpae_init_pcm(audio_encoder_t *encoder); -#endif +#endif /* AE_PCM_H */ Modified: trunk/libmpcodecs/ae_toolame.h ============================================================================== --- trunk/libmpcodecs/ae_toolame.h (original) +++ trunk/libmpcodecs/ae_toolame.h Mon Dec 31 17:15:50 2007 @@ -13,4 +13,4 @@ typedef struct { int mpae_init_toolame(audio_encoder_t *encoder); -#endif +#endif /* MPAE_TOOLAME_H */ Modified: trunk/libmpcodecs/ae_twolame.h ============================================================================== --- trunk/libmpcodecs/ae_twolame.h (original) +++ trunk/libmpcodecs/ae_twolame.h Mon Dec 31 17:15:50 2007 @@ -11,4 +11,4 @@ typedef struct { int mpae_init_twolame(audio_encoder_t *encoder); -#endif +#endif /* MPAE_TWOLAME_H */ Modified: trunk/libmpcodecs/cmmx.h ============================================================================== --- trunk/libmpcodecs/cmmx.h (original) +++ trunk/libmpcodecs/cmmx.h Mon Dec 31 17:15:50 2007 @@ -183,4 +183,4 @@ pcmpeqb(cmmx_t a, cmmx_t b) return pcmpzb(a ^ b); } -#endif +#endif /* CMMX_H */ Modified: trunk/libmpcodecs/img_format.h ============================================================================== --- trunk/libmpcodecs/img_format.h (original) +++ trunk/libmpcodecs/img_format.h Mon Dec 31 17:15:50 2007 @@ -117,4 +117,4 @@ typedef struct { const char *vo_format_name(int format); -#endif +#endif /* IMG_FORMAT_H */ Modified: trunk/libmpcodecs/mp_image.h ============================================================================== --- trunk/libmpcodecs/mp_image.h (original) +++ trunk/libmpcodecs/mp_image.h Mon Dec 31 17:15:50 2007 @@ -228,4 +228,4 @@ static inline void free_mp_image(mp_imag mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt); void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi); -#endif +#endif /* MP_IMAGE_H */ Modified: trunk/libmpcodecs/mpc_info.h ============================================================================== --- trunk/libmpcodecs/mpc_info.h (original) +++ trunk/libmpcodecs/mpc_info.h Mon Dec 31 17:15:50 2007 @@ -22,4 +22,4 @@ typedef struct mp_codec_info_s #define CONTROL_ERROR -2 #define CONTROL_NA -3 -#endif +#endif /* MP_CODEC_INFO_T */ Modified: trunk/libmpcodecs/vqf.h ============================================================================== --- trunk/libmpcodecs/vqf.h (original) +++ trunk/libmpcodecs/vqf.h Mon Dec 31 17:15:50 2007 @@ -223,4 +223,4 @@ DllPort int TvqGetFbTotalBits(); // q #endif -#endif +#endif /* tvqdec_h */ Modified: trunk/libmpdemux/asf.h ============================================================================== --- trunk/libmpdemux/asf.h (original) +++ trunk/libmpdemux/asf.h Mon Dec 31 17:15:50 2007 @@ -244,4 +244,4 @@ struct asf_priv { unsigned bps; }; -#endif +#endif /* ASF_H */ Modified: trunk/libmpdemux/demux_rtp.h ============================================================================== --- trunk/libmpdemux/demux_rtp.h (original) +++ trunk/libmpdemux/demux_rtp.h Mon Dec 31 17:15:50 2007 @@ -28,4 +28,4 @@ int demux_rtp_fill_buffer(demuxer_t *dem // Close a RTP demuxer void demux_close_rtp(demuxer_t* demuxer); -#endif +#endif /* DEMUX_RTP_H */ Modified: trunk/libmpdemux/demux_rtp_internal.h ============================================================================== --- trunk/libmpdemux/demux_rtp_internal.h (original) +++ trunk/libmpdemux/demux_rtp_internal.h Mon Dec 31 17:15:50 2007 @@ -41,4 +41,4 @@ Boolean awaitRTPPacket(demuxer_t* demuxe // "streamType": 0 => video; 1 => audio // This routine returns False if the input stream has closed -#endif +#endif /* DEMUX_RTP_INTERNAL_H */ Modified: trunk/libmpdemux/demux_xmms_plugin.h ============================================================================== --- trunk/libmpdemux/demux_xmms_plugin.h (original) +++ trunk/libmpdemux/demux_xmms_plugin.h Mon Dec 31 17:15:50 2007 @@ -152,4 +152,4 @@ typedef struct _VisPlugin void (*render_freq)(short freq_data[2][256]); /* Render the freq data, don't do anything time consuming in here */ } VisPlugin; -#endif +#endif /* PLUGIN_H */ Modified: trunk/libmpdemux/mf.h ============================================================================== --- trunk/libmpdemux/mf.h (original) +++ trunk/libmpdemux/mf.h Mon Dec 31 17:15:50 2007 @@ -16,4 +16,4 @@ typedef struct mf_t* open_mf(char * filename); -#endif +#endif /* MF_H */ Modified: trunk/libmpdemux/ms_hdr.h ============================================================================== --- trunk/libmpdemux/ms_hdr.h (original) +++ trunk/libmpdemux/ms_hdr.h Mon Dec 31 17:15:50 2007 @@ -79,4 +79,4 @@ typedef struct { #endif #endif -#endif +#endif /* MS_HDR_H */ Modified: trunk/libmpdemux/qtpalette.h ============================================================================== --- trunk/libmpdemux/qtpalette.h (original) +++ trunk/libmpdemux/qtpalette.h Mon Dec 31 17:15:50 2007 @@ -568,4 +568,4 @@ static unsigned char qt_default_grayscal /* 255, 0xFF */ 0x00, 0x00, 0x00, 0x00 }; -#endif +#endif /* QTPALETTE_H */ Modified: trunk/libmpdemux/stheader.h ============================================================================== --- trunk/libmpdemux/stheader.h (original) +++ trunk/libmpdemux/stheader.h Mon Dec 31 17:15:50 2007 @@ -119,4 +119,4 @@ void free_sh_video(sh_video_t *sh); int video_read_properties(sh_video_t *sh_video); int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps); -#endif +#endif /* STHEADER_H */ Modified: trunk/libvo/aspect.h ============================================================================== --- trunk/libvo/aspect.h (original) +++ trunk/libvo/aspect.h Mon Dec 31 17:15:50 2007 @@ -20,5 +20,4 @@ void aspect_save_screenres(int scrw, int void aspect(int *srcw, int *srch, int zoom); -#endif - +#endif /* ASPECT_H */ Modified: trunk/libvo/fastmemcpy.h ============================================================================== --- trunk/libvo/fastmemcpy.h (original) +++ trunk/libvo/fastmemcpy.h Mon Dec 31 17:15:50 2007 @@ -105,4 +105,4 @@ static inline void * memcpy_pic2(void * return retval; } -#endif +#endif /* FASTMEMCPY_H */ Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h (original) +++ trunk/libvo/gl_common.h Mon Dec 31 17:15:50 2007 @@ -328,4 +328,4 @@ extern int (APIENTRY *SwapInterval)(int) extern void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -#endif +#endif /* GL_COMMON_H */ Modified: trunk/libvo/gtf.h ============================================================================== --- trunk/libvo/gtf.h (original) +++ trunk/libvo/gtf.h Mon Dec 31 17:15:50 2007 @@ -45,4 +45,4 @@ typedef struct { void GTF_calcTimings(double X,double Y,double freq, int type, int want_margins, int want_interlace,struct VesaCRTCInfoBlock *result); -#endif +#endif /* GTF_H */ Modified: trunk/libvo/osd.h ============================================================================== --- trunk/libvo/osd.h (original) +++ trunk/libvo/osd.h Mon Dec 31 17:15:50 2007 @@ -15,5 +15,4 @@ extern void vo_draw_alpha_rgb32(int w,in extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride); extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride); -#endif - +#endif /* MPLAYER_OSD_H */ Modified: trunk/libvo/sub.h ============================================================================== --- trunk/libvo/sub.h (original) +++ trunk/libvo/sub.h Mon Dec 31 17:15:50 2007 @@ -139,4 +139,5 @@ void osd_set_nav_box (uint16_t sx, uint1 #endif #endif -#endif + +#endif /* MPLAYER_SUB_H */ Modified: trunk/libvo/vesa_lvo.h ============================================================================== --- trunk/libvo/vesa_lvo.h (original) +++ trunk/libvo/vesa_lvo.h Mon Dec 31 17:15:50 2007 @@ -24,4 +24,4 @@ uint32_t vlvo_draw_frame(uint8_t *src[]) void vlvo_flip_page(void); void vlvo_draw_osd(void); -#endif +#endif /* VESA_LVO_H */ Modified: trunk/libvo/video_out.h ============================================================================== --- trunk/libvo/video_out.h (original) +++ trunk/libvo/video_out.h Mon Dec 31 17:15:50 2007 @@ -254,5 +254,5 @@ extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; #endif - -#endif + +#endif /* VIDEO_OUT_H */ Modified: trunk/libvo/vosub_vidix.h ============================================================================== --- trunk/libvo/vosub_vidix.h (original) +++ trunk/libvo/vosub_vidix.h Mon Dec 31 17:15:50 2007 @@ -35,4 +35,4 @@ int vidix_grkey_support(void); int vidix_grkey_get(vidix_grkey_t *gr_key); int vidix_grkey_set(const vidix_grkey_t *gr_key); -#endif +#endif /* VOSUB_VIDIX_H */ Modified: trunk/libvo/wskeys.h ============================================================================== --- trunk/libvo/wskeys.h (original) +++ trunk/libvo/wskeys.h Mon Dec 31 17:15:50 2007 @@ -152,5 +152,4 @@ #define wsGrayInsert 0x9e + 256 #define wsGrayDelete 0x9f + 256 -#endif - +#endif /* WSKEYS_H */ Modified: trunk/libvo/x11_common.h ============================================================================== --- trunk/libvo/x11_common.h (original) +++ trunk/libvo/x11_common.h Mon Dec 31 17:15:50 2007 @@ -125,5 +125,4 @@ void update_xinerama_info(void); int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return); -#endif - +#endif /* X11_COMMON_H */ Modified: trunk/loader/dmo/dmo_guids.h ============================================================================== --- trunk/loader/dmo/dmo_guids.h (original) +++ trunk/loader/dmo/dmo_guids.h Mon Dec 31 17:15:50 2007 @@ -32,4 +32,4 @@ extern const GUID DMOCATEGORY_AUDIO_NOIS extern const GUID DMOCATEGORY_AGC; */ -#endif +#endif /* DMO_GUIDS_H */ Modified: trunk/loader/ext.h ============================================================================== --- trunk/loader/ext.h (original) +++ trunk/loader/ext.h Mon Dec 31 17:15:50 2007 @@ -17,4 +17,4 @@ extern int FILE_munmap( LPVOID start, DW extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n); extern int __vprintf( const char *format, ... ); -#endif +#endif /* loader_ext_h */ Modified: trunk/loader/wine/objbase.h ============================================================================== --- trunk/loader/wine/objbase.h (original) +++ trunk/loader/wine/objbase.h Mon Dec 31 17:15:50 2007 @@ -16,4 +16,5 @@ typedef enum tagCOINIT { HRESULT STDCALL CoInitialize(LPVOID pvReserved); HRESULT STDCALL CoInitializeEx(LPVOID pvReserved, DWORD dwCoinit); void STDCALL CoUninitialize(void); -#endif + +#endif /* WINE_OBJBASE_H */ Modified: trunk/playtree.h ============================================================================== --- trunk/playtree.h (original) +++ trunk/playtree.h Mon Dec 31 17:15:50 2007 @@ -282,6 +282,6 @@ void pt_iter_goto_head(play_tree_iter_t* ///@} -#endif +#endif /* PLAYTREE_H */ ///@} Modified: trunk/playtreeparser.h ============================================================================== --- trunk/playtreeparser.h (original) +++ trunk/playtreeparser.h Mon Dec 31 17:15:50 2007 @@ -47,6 +47,6 @@ play_tree_parser_get_play_tree(play_tree void play_tree_add_bpf(play_tree_t* pt, char* filename); -#endif +#endif /* PLAYTREEPARSER_H */ ///@} Modified: trunk/spudec.h ============================================================================== --- trunk/spudec.h (original) +++ trunk/spudec.h Mon Dec 31 17:15:50 2007 @@ -19,5 +19,5 @@ void spudec_set_hw_spu(void *this, const int spudec_changed(void *this); void spudec_calc_bbox(void *me, unsigned int dxs, unsigned int dys, unsigned int* bbox); void spudec_set_forced_subs_only(void * const this, const unsigned int flag); -#endif +#endif /* MPLAYER_SPUDEC_H */ Modified: trunk/stream/cache2.h ============================================================================== --- trunk/stream/cache2.h (original) +++ trunk/stream/cache2.h Mon Dec 31 17:15:50 2007 @@ -3,4 +3,4 @@ extern void cache_uninit(stream_t *s); -#endif +#endif /* CACHE2_H */ Modified: trunk/stream/cookies.h ============================================================================== --- trunk/stream/cookies.h (original) +++ trunk/stream/cookies.h Mon Dec 31 17:15:50 2007 @@ -13,4 +13,4 @@ extern void cookies_set(HTTP_header_t * http_hdr, const char *hostname, const char *url); -#endif +#endif /* COOKIES_H */ Modified: trunk/stream/dvbin.h ============================================================================== --- trunk/stream/dvbin.h (original) +++ trunk/stream/dvbin.h Mon Dec 31 17:15:50 2007 @@ -113,4 +113,4 @@ extern int dvb_set_channel(stream_t *, i extern dvb_config_t *dvb_get_config(void); extern void dvb_free_config(dvb_config_t *config); -#endif +#endif /* DVBIN_H */ Modified: trunk/stream/freesdp/errorlist.c ============================================================================== --- trunk/stream/freesdp/errorlist.c (original) +++ trunk/stream/freesdp/errorlist.c Mon Dec 31 17:15:50 2007 @@ -69,4 +69,4 @@ fsdp_strerror (fsdp_error_t err_no) return (fsdp_error_t_s[err_no]); } -#endif +#endif /* FSDP_ERRORLIST_C */ Modified: trunk/stream/librtsp/rtsp.h ============================================================================== --- trunk/stream/librtsp/rtsp.h (original) +++ trunk/stream/librtsp/rtsp.h Mon Dec 31 17:15:50 2007 @@ -80,5 +80,4 @@ void rtsp_schedule_field(rtsp_t *s, cons void rtsp_unschedule_field(rtsp_t *s, const char *string); void rtsp_unschedule_all(rtsp_t *s); -#endif - +#endif /* HAVE_RTSP_H */ Modified: trunk/stream/librtsp/rtsp_session.h ============================================================================== --- trunk/stream/librtsp/rtsp_session.h (original) +++ trunk/stream/librtsp/rtsp_session.h Mon Dec 31 17:15:50 2007 @@ -40,4 +40,4 @@ int rtsp_session_read(rtsp_session_t *se void rtsp_session_end(rtsp_session_t *session); -#endif +#endif /* HAVE_RTSP_SESSION_H */ Modified: trunk/stream/network.h ============================================================================== --- trunk/stream/network.h (original) +++ trunk/stream/network.h Mon Dec 31 17:15:50 2007 @@ -63,4 +63,4 @@ HTTP_header_t *http_read_response(int fd int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry); URL_t* check4proxies(URL_t *url); -#endif +#endif /* NETWORK_H */ Modified: trunk/stream/realrtsp/asmrp.h ============================================================================== --- trunk/stream/realrtsp/asmrp.h (original) +++ trunk/stream/realrtsp/asmrp.h Mon Dec 31 17:15:50 2007 @@ -44,4 +44,4 @@ int asmrp_match (const char *rules, int bandwidth, int *matches) ; -#endif +#endif /* HAVE_ASMRP_H */ Modified: trunk/stream/realrtsp/real.h ============================================================================== --- trunk/stream/realrtsp/real.h (original) +++ trunk/stream/realrtsp/real.h Mon Dec 31 17:15:50 2007 @@ -57,5 +57,4 @@ rmff_header_t *real_setup_and_get_header struct real_rtsp_session_t *init_real_rtsp_session (void); void free_real_rtsp_session (struct real_rtsp_session_t* real_session); -#endif - +#endif /* HAVE_REAL_H */ Modified: trunk/stream/realrtsp/rmff.h ============================================================================== --- trunk/stream/realrtsp/rmff.h (original) +++ trunk/stream/realrtsp/rmff.h Mon Dec 31 17:15:50 2007 @@ -273,4 +273,4 @@ void rmff_dump_pheader(rmff_pheader_t *h */ void rmff_free_header(rmff_header_t *h); -#endif +#endif /* HAVE_RMFF_H */ Modified: trunk/stream/realrtsp/sdpplin.h ============================================================================== --- trunk/stream/realrtsp/sdpplin.h (original) +++ trunk/stream/realrtsp/sdpplin.h Mon Dec 31 17:15:50 2007 @@ -105,5 +105,4 @@ sdpplin_t *sdpplin_parse(char *data); void sdpplin_free(sdpplin_t *description); -#endif - +#endif /* HAVE_SDPPLIN_H */ Modified: trunk/stream/realrtsp/xbuffer.h ============================================================================== --- trunk/stream/realrtsp/xbuffer.h (original) +++ trunk/stream/realrtsp/xbuffer.h Mon Dec 31 17:15:50 2007 @@ -23,4 +23,4 @@ void *xbuffer_copyin(void *buf, int inde void *xbuffer_ensure_size(void *buf, int size); void *xbuffer_strcat(void *buf, char *data); -#endif +#endif /* XCL_H */ Modified: trunk/stream/rtp.h ============================================================================== --- trunk/stream/rtp.h (original) +++ trunk/stream/rtp.h Mon Dec 31 17:15:50 2007 @@ -10,4 +10,4 @@ int read_rtp_from_server(int fd, char *buffer, int length); -#endif +#endif /* RTP_H */ Modified: trunk/stream/stream_dvdnav.h ============================================================================== --- trunk/stream/stream_dvdnav.h (original) +++ trunk/stream/stream_dvdnav.h Mon Dec 31 17:15:50 2007 @@ -35,4 +35,4 @@ void mp_dvdnav_update_mouse_pos(stream_t void mp_dvdnav_get_highlight (stream_t *stream, nav_highlight_t *hl); unsigned int *mp_dvdnav_get_spu_clut(stream_t *stream); -#endif +#endif /* MPLAYER_STREAM_DVDNAV_H */ Modified: trunk/sub_cc.h ============================================================================== --- trunk/sub_cc.h (original) +++ trunk/sub_cc.h Mon Dec 31 17:15:50 2007 @@ -6,5 +6,5 @@ extern int subcc_enabled; void subcc_init(void); void subcc_process_data(unsigned char *inputdata,unsigned int len); -#endif /*SUB_CC_H*/ +#endif /* SUB_CC_H */ Modified: trunk/subopt-helper.h ============================================================================== --- trunk/subopt-helper.h (original) +++ trunk/subopt-helper.h Mon Dec 31 17:15:50 2007 @@ -47,4 +47,4 @@ int int_pos( int * i ); int strargcmp(strarg_t *arg, const char *str); int strargcasecmp(strarg_t *arg, char *str); -#endif +#endif /* SUBOPT_HELPER_H */ Modified: trunk/subreader.h ============================================================================== --- trunk/subreader.h (original) +++ trunk/subreader.h Mon Dec 31 17:15:50 2007 @@ -89,4 +89,5 @@ void find_sub(sub_data* subd,int key); void step_sub(sub_data *subd, float pts, int movement); void sub_add_text(subtitle *sub, const char *txt, int len, double endpts); int sub_clear_text(subtitle *sub, double pts); -#endif + +#endif /* MPLAYER_SUBREADER_H */ Modified: trunk/vidix/dha.h ============================================================================== --- trunk/vidix/dha.h (original) +++ trunk/vidix/dha.h Mon Dec 31 17:15:50 2007 @@ -92,4 +92,4 @@ extern int mtrr_set_type(unsigned base,u } #endif -#endif +#endif /* LIBDHA_H */ Modified: trunk/vidix/dhahelperwin/dhahelper.h ============================================================================== --- trunk/vidix/dhahelperwin/dhahelper.h (original) +++ trunk/vidix/dhahelperwin/dhahelper.h Mon Dec 31 17:15:50 2007 @@ -68,4 +68,4 @@ struct __attribute__((__packed__)) dhahe typedef struct dhahelper_t dhahelper_t; -#endif +#endif /* _DHAHELPER_H */ Modified: trunk/vidix/fourcc.h ============================================================================== --- trunk/vidix/fourcc.h (original) +++ trunk/vidix/fourcc.h Mon Dec 31 17:15:50 2007 @@ -79,4 +79,4 @@ /* Vendor-specific formats */ #define IMGFMT_WNVA vid_fourcc('W','N','V','A') /* Winnov hw compress */ -#endif +#endif /* FOURCC_H */ Modified: trunk/vidix/vidix.h ============================================================================== --- trunk/vidix/vidix.h (original) +++ trunk/vidix/vidix.h Mon Dec 31 17:15:50 2007 @@ -314,4 +314,4 @@ typedef struct vidix_oem_fx_s } #endif -#endif +#endif /* VIDIX_H */ Modified: trunk/vidix/vidixlib.h ============================================================================== --- trunk/vidix/vidixlib.h (original) +++ trunk/vidix/vidixlib.h Mon Dec 31 17:15:50 2007 @@ -141,4 +141,4 @@ int vdlPlaybackCopyFrame(VDL_HANDLE, c } #endif -#endif +#endif /* VIDIXLIB_H */ Modified: trunk/xvid_vbr.h ============================================================================== --- trunk/xvid_vbr.h (original) +++ trunk/xvid_vbr.h Mon Dec 31 17:15:50 2007 @@ -228,4 +228,4 @@ extern int vbrUpdate(vbr_control_t *stat int ublocks); extern int vbrFinish(vbr_control_t *state); -#endif +#endif /* XVID_VBR_H */

1 0