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

r18855 - trunk/libmpdemux/librtsp/rtsp.c
by ben 29 Jun '06

29 Jun '06

Author: ben Date: Thu Jun 29 23:27:07 2006 New Revision: 18855 Modified: trunk/libmpdemux/librtsp/rtsp.c Log: 2 more unused functions removal (trying to sync with xine) Modified: trunk/libmpdemux/librtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp.c (original) +++ trunk/libmpdemux/librtsp/rtsp.c Thu Jun 29 23:27:07 2006 @@ -114,58 +114,6 @@ * network utilities */ -static int host_connect_attempt(struct in_addr ia, int port) { - - int s; - struct sockaddr_in sin; - - s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (s == -1) { - mp_msg(MSGT_OPEN, MSGL_ERR, "rtsp: socket(): %s\n", strerror(errno)); - return -1; - } - - sin.sin_family = AF_INET; - sin.sin_addr = ia; - sin.sin_port = htons(port); - - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 -#ifndef HAVE_WINSOCK2 - && errno != EINPROGRESS) { -#else - && WSAGetLastError() == WSAEINPROGRESS) { -#endif - mp_msg(MSGT_OPEN, MSGL_ERR, "rtsp: connect(): %s\n", strerror(errno)); - closesocket(s); - return -1; - } - - return s; -} - -static int host_connect(const char *host, int port) { - - struct hostent *h; - int i, s; - - h = gethostbyname(host); - if (h == NULL) { - mp_msg(MSGT_OPEN, MSGL_ERR, "rtsp: unable to resolve '%s'.\n", host); - return -1; - } - - for (i = 0; h->h_addr_list[i]; i++) { - struct in_addr ia; - - memcpy (&ia, h->h_addr_list[i], 4); - s = host_connect_attempt(ia, port); - if(s != -1) - return s; - } - mp_msg(MSGT_OPEN, MSGL_ERR, "rtsp: unable to connect to '%s'.\n", host); - return -1; -} - static int write_stream(int s, const char *buf, int len) { int total, timeout;

1 0

r18854 - trunk/libmpdemux/librtsp/rtsp.c
by ben 29 Jun '06

29 Jun '06

Author: ben Date: Thu Jun 29 23:20:01 2006 New Revision: 18854 Modified: trunk/libmpdemux/librtsp/rtsp.c Log: removed unused hexdump() Modified: trunk/libmpdemux/librtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp.c (original) +++ trunk/libmpdemux/librtsp/rtsp.c Thu Jun 29 23:20:01 2006 @@ -232,42 +232,6 @@ } /* - * debugging utilities - */ -#if 0 -static void hexdump (char *buf, int length) { - - int i; - - mp_msg(MSGT_OPEN, MSGL_INFO, "rtsp: ascii>"); - for (i = 0; i < length; i++) { - unsigned char c = buf[i]; - - if ((c >= 32) && (c <= 128)) - mp_msg(MSGT_OPEN, MSGL_INFO, "%c", c); - else - mp_msg(MSGT_OPEN, MSGL_INFO, "."); - } - mp_msg(MSGT_OPEN, MSGL_INFO, "\n"); - - mp_msg(MSGT_OPEN, MSGL_INFO, "rtsp: hexdump> "); - for (i = 0; i < length; i++) { - unsigned char c = buf[i]; - - mp_msg(MSGT_OPEN, MSGL_INFO, "%02x", c); - - if ((i % 16) == 15) - mp_msg(MSGT_OPEN, MSGL_INFO, "\nrtsp: "); - - if ((i % 2) == 1) - mp_msg(MSGT_OPEN, MSGL_INFO, " "); - - } - mp_msg(MSGT_OPEN, MSGL_INFO, "\n"); -} -#endif - -/* * rtsp_get gets a line from stream * and returns a null terminated string. */

1 0

r18853 - trunk/libmpdemux/librtsp/rtsp_rtp.c
by ben 29 Jun '06

29 Jun '06

Author: ben Date: Thu Jun 29 19:07:57 2006 New Revision: 18853 Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c Log: fix compilation under mingw (thanks to tempn AT twmi DOT rr DOT com for report and pacman for fix) Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp_rtp.c (original) +++ trunk/libmpdemux/librtsp/rtsp_rtp.c Thu Jun 29 19:07:57 2006 @@ -24,6 +24,7 @@ #include <errno.h> #include <stdlib.h> #include <sys/types.h> +#include <inttypes.h> #include "config.h"

1 0

r18852 - trunk/mp3lib/dct64_altivec.c
by gpoirier 29 Jun '06

29 Jun '06

Author: gpoirier Date: Thu Jun 29 16:54:53 2006 New Revision: 18852 Modified: trunk/mp3lib/dct64_altivec.c Log: Add missing license, as chosen by its author Modified: trunk/mp3lib/dct64_altivec.c ============================================================================== --- trunk/mp3lib/dct64_altivec.c (original) +++ trunk/mp3lib/dct64_altivec.c Thu Jun 29 16:54:53 2006 @@ -3,6 +3,8 @@ * Discrete Cosine Tansform (DCT) for Altivec * Copyright (c) 2004 Romain Dolbeau <romain(a)dolbeau.org> * based upon code from "mp3lib/dct64.c" + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License */ #define real float

1 0

r18851 - trunk/TOOLS/cpuinfo.c
by gpoirier 29 Jun '06

29 Jun '06

Author: gpoirier Date: Thu Jun 29 16:47:07 2006 New Revision: 18851 Modified: trunk/TOOLS/cpuinfo.c Log: merges two asm constraints to one, patch by Zuxy Meng zuxy PP meng AHH gmail PP com Modified: trunk/TOOLS/cpuinfo.c ============================================================================== --- trunk/TOOLS/cpuinfo.c (original) +++ trunk/TOOLS/cpuinfo.c Thu Jun 29 16:47:07 2006 @@ -63,10 +63,10 @@ static int64_t rdtsc(void) { - unsigned int i, j; + uint64_t i; #define RDTSC ".byte 0x0f, 0x31; " - asm volatile (RDTSC : "=a"(i), "=d"(j) : ); - return ((int64_t)j<<32) + (int64_t)i; + asm volatile (RDTSC : "=A"(i) : ); + return i; } static const char*

1 0

r18844 - trunk/DOCS/tech/svn-howto.txt
by diego 29 Jun '06

29 Jun '06

Author: diego Date: Wed Jun 28 19:02:56 2006 New Revision: 18844 Modified: trunk/DOCS/tech/svn-howto.txt Log: Rewrite and extend the Subversion guidelines. Modified: trunk/DOCS/tech/svn-howto.txt ============================================================================== --- trunk/DOCS/tech/svn-howto.txt (original) +++ trunk/DOCS/tech/svn-howto.txt Wed Jun 28 19:02:56 2006 @@ -3,15 +3,19 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Before everything else, you should know how to use Subversion properly. -Subversion comes with some documentation. +Luckily Subversion comes with excellent documentation. svn help - man svn - info svn -are a good start. The most comprehensive manual is the book "Version Control -with Subversion" by Ben Collins-Sussman, Brian W. Fitzpatrick and C. Michael -Pilato. It can be viewed online at +shows you the available subcommands, + + svn help <command> + +shows information about the subcommand <command>. + +The most comprehensive manual is the book "Version Control with Subversion" +by Ben Collins-Sussman, Brian W. Fitzpatrick and C. Michael Pilato. It can +be viewed online at http://svnbook.org/ @@ -20,75 +24,106 @@ http://subversion.tigris.org/ Consult these resources whenever you have problems, they are quite exhaustive. -What follows now are MPlayer specific guidelines. +What follows now is a basic introduction to Subversion and some MPlayer-specific +guidelines. Read it at least once, if you are granted commit privileges to the +MPlayer project you are expected to be familiar with these rules. -I. TECH SIDE: -============= -1. Checking out development source tree: +I. BASICS: +========== - svn checkout svn://svn.mplayerhq.hu/mplayer/trunk/ +1. Checking out the source tree: -2. Updating source tree to latest revision: + svn checkout svn://svn.mplayerhq.hu/mplayer/trunk/ <target> - svn update + This will put the MPlayer sources into the directory <target>. -3. Committing changes: +2. Updating the source tree to the latest revision: svn update - svn commit --username USERNAME filename(s) - - Do not use comments such as: "bug fix." or "files changed" or "dunno". - You don't have to include the filename in the comment, as comments are linked - to files. If you have made several independent changes, commit them - separately, not at the same time. You will be prompted for a comment in an - editor, which is either specified by --editor-cmd on the command line, set - in your personal configuration file (~/.subversion/config) or set by one of - the following environment variables: SVN_EDITOR, VISUAL or EDITOR. When - prompted for a password, type the password you got assigned by the Subversion - server admin. By default, Subversion caches all authentication tokens. This - behaviour can be disabled by setting both 'store-passwords' and - 'store-auth-creds' to "no" in ~/.subversion/config. You might need to remove - previous cache files, which are located in ~/.subversion/auth, by hand. -4. Adding new files/directories: + pulls in the latest changes from the repository to your working directory. - svn add filename/dirname - svn commit filename/dirname +3. Adding/removing files/directories: -5. Removing files: + svn add <filename/dirname> + svn delete <filename/dirname> - svn delete filename - svn commit filename + Subversion needs to get notified of all changes you make to your working + directory. -6. Checking changes: +4. Showing modifications: - svn diff filename(s) + svn diff <filename(s)> - Doublecheck your changes before committing to avoid trouble later on. - This way you will see if your patch has debug stuff or indentation - changes and you can fix it before committing and triggering flames. + will show all local modifications in your working directory as unified diff. -7. Checking changelog: +5. Inspecting the changelog: - svn log filename(s) + svn log <filename(s)> You may also find viewvc, a web frontend for Subversion, helpful. It's often - more comfortable than using svn log and svn diff. Find it here: + more comfortable than using 'svn log' and 'svn diff'. Find it here: http://svn.mplayerhq.hu/mplayer/trunk/ -8. Renaming/moving files or content of files: +6. Checking source tree status: + + svn status + + detects all the changes you made and lists what actions will be taken in case + of a commit (additions, modifications, deletions, etc.). + +7. Committing: + + svn update + + Run 'svn update' before committing to make sure there were no changes to the + files you worked on in the meantime. Afterwards look at the output of - svn move source destination - svn commit source destination + svn diff <filename(s)> + + to doublecheck your changes before committing to avoid trouble later on. All + experienced developers do this on each and every commit, no matter how small. + Every one of them has been saved from looking like a fool by this many times. + It's very easy for stray debug output or cosmetic modifications to slip in, + please avoid problems through this extra level of scrutiny. + + Once you have made sure everything is fine + + svn commit <filename(s)> + + propagates your stuff to the repository. If you have made several independent + changes, commit them separately, not at the same time. + + When prompted for a password, type the password you got assigned by the + project admins. By default, Subversion caches all authentication tokens. + This behaviour can be disabled by setting both 'store-passwords' and + 'store-auth-creds' to "no" in ~/.subversion/config. You might need to remove + previous cache files, which are located in ~/.subversion/auth, by hand. + + You will be prompted for a log message in an editor, which is either specified + by --editor-cmd on the command line, set in your personal configuration file + (~/.subversion/config) or set by one of the following environment variables: + SVN_EDITOR, VISUAL or EDITOR. + + Log messages should be concise but descriptive. Explain why you made a change, + what you did will be obvious from the changes themselves most of the time. + Saying just "bug fix" or "10l" is bad. Remember that people of varying skill + levels look at and educate themselves while reading through your code. Don't + include filenames in log messages, Subversion provides that information. + +8. Renaming/moving files or contents of files: + + svn move <source> <destination> + svn commit <source> <destination> Do not move or rename files before discussing it on the mplayer-dev-eng mailing list first! Don't do a lot of cut'n'paste from one file to another without a very good reason and discuss it on the mplayer-dev-eng mailing list first. It will make - those changes untraceable! + those changes hard to trace. Such actions are useless and treated as cosmetics in 99% of cases, so try to avoid them. @@ -98,34 +133,27 @@ There is no Subversion equivalent of the 'cvs admin -o' command. Instead, be very careful about what you commit! If somehow you broke something, revert the changes locally and re-commit with a proper commit message. - You may want to use 'svn cat -r<revision> filename' to inspect an older + You may want to use 'svn cat -r<revision> <filename>' to inspect an older revision. -10. Checking status of source tree - - svn status - - This will detect all the changes you made and list what actions will be - taken in case of a commit (Additions, Modifications, Deletions, et cetera). - -11. Reverting local changes +10. Reverting local changes - svn revert filename(s) + svn revert <filename(s)> In case you made a lot of local changes to a file and want to start over - with a fresh checkout of that file, you can use svn revert filename(s). + with a fresh checkout of that file, you can use 'svn revert <filename(s)>'. NOTE: This has nothing to do with reverting changes on the Subversion server! It only reverts changes that were not committed yet. If you need to revert a broken commit, see 9. -12. Changing commit messages +11. Changing commit messages svn propedit svn:log --revprop -r <revision> If your commit message is too short or not explanatory enough, you can edit - it afterwards with svn propedit. + it afterwards with svn' propedit'. -Contact the project admin <root at mplayerhq dot hu> if you have technical +Contact the project admins <root at mplayerhq dot hu> if you have technical problems with the Subversion server. @@ -212,7 +240,7 @@ 3. Create a patch: - Run svn diff from the root of the source tree, like this: + Run 'svn diff' from the root of the source tree, like this: cd devel svn diff > ../my_changes.patch @@ -252,10 +280,10 @@ 7. Commit the patch: If your patch is accepted, double check if your source tree contains the - most recent version of your patch with svn diff! After verifying that you - met these conditions, commit with: + most recent version of your patch with 'svn diff'! After verifying that + you met these conditions, commit with: - svn commit filename(s) + svn commit <filename(s)> Go to step 2 ad infinitum until MPlayer is the perfect media player ;)

3 2

r18849 - trunk/DOCS/tech/svn-howto.txt
by diego 29 Jun '06

29 Jun '06

Author: diego Date: Thu Jun 29 09:01:37 2006 New Revision: 18849 Modified: trunk/DOCS/tech/svn-howto.txt Log: Fix misplaced apostrophe. Modified: trunk/DOCS/tech/svn-howto.txt ============================================================================== --- trunk/DOCS/tech/svn-howto.txt (original) +++ trunk/DOCS/tech/svn-howto.txt Thu Jun 29 09:01:37 2006 @@ -162,7 +162,7 @@ svn propedit svn:log --revprop -r <revision> If your commit message is too short or not explanatory enough, you can edit - it afterwards with svn' propedit'. + it afterwards with 'svn propedit'. Contact the project admins <root at mplayerhq dot hu> if you have technical

1 0

r18848 - trunk/AUTHORS
by pacman 28 Jun '06

28 Jun '06

Author: pacman Date: Wed Jun 28 23:11:54 2006 New Revision: 18848 Modified: trunk/AUTHORS Log: Clear up the "who is pacman / who is tcsetattr?" mystery Modified: trunk/AUTHORS ============================================================================== --- trunk/AUTHORS (original) +++ trunk/AUTHORS Wed Jun 28 23:11:54 2006 @@ -187,7 +187,7 @@ * dvdnav hacks * rawdv demuxer fixes -Curry, Alan <pacman(a)TheWorld.com> +Curry, Alan (pacman, tcsetattr) <pacman(a)TheWorld.com> * swscale AltiVec/big-endian fixes * misc vo_fbdev fixes

1 0

r18846 - trunk/libao2/ao_oss.c
by pacman 28 Jun '06

28 Jun '06

Author: pacman Date: Wed Jun 28 21:22:27 2006 New Revision: 18846 Modified: trunk/libao2/ao_oss.c Log: Respect AOPLAY_FINAL_CHUNK Modified: trunk/libao2/ao_oss.c ============================================================================== --- trunk/libao2/ao_oss.c (original) +++ trunk/libao2/ao_oss.c Wed Jun 28 21:22:27 2006 @@ -495,8 +495,13 @@ // it should round it down to outburst*n // return: number of bytes played static int play(void* data,int len,int flags){ - len/=ao_data.outburst; - len=write(audio_fd,data,len*ao_data.outburst); + if(len==0) + return len; + if(len>ao_data.outburst || !(flags & AOPLAY_FINAL_CHUNK)) { + len/=ao_data.outburst; + len*=ao_data.outburst; + } + len=write(audio_fd,data,len); return len; }

2 1

r18847 - trunk/libmpdemux/demux_lavf.c
by pacman 28 Jun '06

28 Jun '06

Author: pacman Date: Wed Jun 28 21:27:04 2006 New Revision: 18847 Modified: trunk/libmpdemux/demux_lavf.c Log: Remove bogus stream_eof() test - av_read_frame() has its own buffer and can still return usable data after the underlying stream_t has EOF'ed. Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Wed Jun 28 21:27:04 2006 @@ -339,11 +339,6 @@ demux->filepos=stream_tell(demux->stream); - if(stream_eof(demux->stream)){ -// demuxre->stream->eof=1; - return 0; - } - if(av_read_frame(priv->avfc, &pkt) < 0) return 0;

1 0