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

r18845 - trunk/DOCS/tech/svn-howto.txt
by diego 28 Jun '06

28 Jun '06

Author: diego Date: Wed Jun 28 19:03:16 2006 New Revision: 18845 Modified: trunk/DOCS/tech/svn-howto.txt Log: cosmetics Modified: trunk/DOCS/tech/svn-howto.txt ============================================================================== --- trunk/DOCS/tech/svn-howto.txt (original) +++ trunk/DOCS/tech/svn-howto.txt Wed Jun 28 19:03:16 2006 @@ -30,6 +30,7 @@ MPlayer project you are expected to be familiar with these rules. + I. BASICS: ========== @@ -39,12 +40,14 @@ This will put the MPlayer sources into the directory <target>. + 2. Updating the source tree to the latest revision: svn update pulls in the latest changes from the repository to your working directory. + 3. Adding/removing files/directories: svn add <filename/dirname> @@ -53,12 +56,14 @@ Subversion needs to get notified of all changes you make to your working directory. + 4. Showing modifications: svn diff <filename(s)> will show all local modifications in your working directory as unified diff. + 5. Inspecting the changelog: svn log <filename(s)> @@ -67,6 +72,7 @@ more comfortable than using 'svn log' and 'svn diff'. Find it here: http://svn.mplayerhq.hu/mplayer/trunk/ + 6. Checking source tree status: svn status @@ -74,6 +80,7 @@ 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 @@ -113,6 +120,7 @@ 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> @@ -128,6 +136,7 @@ Such actions are useless and treated as cosmetics in 99% of cases, so try to avoid them. + 9. Reverting broken commits There is no Subversion equivalent of the 'cvs admin -o' command. Instead, @@ -136,6 +145,7 @@ You may want to use 'svn cat -r<revision> <filename>' to inspect an older revision. + 10. Reverting local changes svn revert <filename(s)> @@ -146,6 +156,7 @@ server! It only reverts changes that were not committed yet. If you need to revert a broken commit, see 9. + 11. Changing commit messages svn propedit svn:log --revprop -r <revision> @@ -153,6 +164,7 @@ If your commit message is too short or not explanatory enough, you can edit it afterwards with svn' propedit'. + Contact the project admins <root at mplayerhq dot hu> if you have technical problems with the Subversion server. @@ -167,18 +179,22 @@ (#ifdef etc) by default so it does not interfere with other developers' work. + 2. You don't have to over-test things. If it works for you, and you think it should work for others, too, then commit. If your code has problems (portability, exploits compiler bugs, unusual environment etc) they will be reported and eventually fixed. + 3. Do not commit unrelated changes together, split them into self-contained pieces. + 4. Do not change behavior of the program (renaming options etc) or remove functionality from the code without approval in a discussion on the mplayer-dev-eng mailing list. + 5. Do not commit changes to the build system (Makefiles, configure script) which change behaviour, defaults etc, without asking first. The same applies to compiler warning fixes, trivial looking fixes and to code @@ -187,6 +203,7 @@ list, and if the code maintainers say OK, you may commit. This does not apply to files you wrote and/or maintain. + 6. We refuse source indentation and other cosmetic changes if they are mixed with functional changes, such commits will be rejected and removed. Every developer has his own indentation style, you should not change it. Of course @@ -198,10 +215,12 @@ NOTE: If you had to put if(){ .. } over a large (> 5 lines) chunk of code, do NOT change the indentation of the inner part (don't move it to the right)! + 7. Always fill out the commit log message. Describe in a few lines what you changed and why. You can refer to mailing list postings if you fix a particular bug. Comments such as "fixed!" or "Changed it." are unacceptable. + 8. If you apply a patch by someone else, include the name and email address in the log message. Since the mplayer-cvslog mailing list is publicly archived you should add some spam protection to the email address. Send an @@ -209,18 +228,22 @@ you applied the patch. If the patch contains a documentation change, commit that as well; do not leave it to the documentation maintainers. + 9. Do NOT commit to code actively maintained by others without permission. Send a patch to mplayer-dev-eng instead. + 10. Subscribe to the mplayer-cvslog mailing list. The diffs of all commits are sent there and reviewed by all the other developers. Bugs and possible improvements or general questions regarding commits are discussed there. We expect you to react if problems with your code are uncovered. + 11. Update the documentation if you change behavior or add features. If you are unsure how best to do this, send a patch to mplayer-docs, the documentation maintainers will review and commit your stuff. + Also read DOCS/tech/patches.txt !!!! We think our rules are not too hard. If you have comments, contact us. @@ -236,8 +259,10 @@ svn checkout svn://svn.mplayerhq.hu/mplayer/trunk/ devel + 2. Make your changes. + 3. Create a patch: Run 'svn diff' from the root of the source tree, like this: @@ -250,6 +275,7 @@ svn diff mplayer.c > ../major_cleanup.patch + 4. Check the patch: Check out another, clean source tree and verify your patch: @@ -267,16 +293,19 @@ section II, specifically rules 1 to 6, before you continue submitting the patch. + 5. Submit the patch: Send an e-mail to the mplayer-dev-eng mailing list. Describe what your patch does and why, and attach the patch file for review by others. + 6. During the review process, incorporate all suggested fixes. Go to step 2 repeatedly until there is nothing more to do for step 6. Of course, if you don't agree with certain suggestions, things can be discussed on the mailing list in a polite manner. + 7. Commit the patch: If your patch is accepted, double check if your source tree contains the @@ -287,6 +316,7 @@ Go to step 2 ad infinitum until MPlayer is the perfect media player ;) + Note: If you are listed as the maintainer for a particular piece of code, you can skip step 5 and 6 if your patch _only_ applies to the code you maintain. If it touches other code or is otherwise very intrusive, please

1 0

r18841 - trunk/libmpdemux/librtsp/rtsp_rtp.c
by ben 27 Jun '06

27 Jun '06

Author: ben Date: Tue Jun 27 23:39:48 2006 New Revision: 18841 Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c Log: includes before checking for defines (thanks Reimar for watching me) Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp_rtp.c (original) +++ trunk/libmpdemux/librtsp/rtsp_rtp.c Tue Jun 27 23:39:48 2006 @@ -25,6 +25,8 @@ #include <stdlib.h> #include <sys/types.h> +#include "config.h" + #ifndef HAVE_WINSOCK2 #include <netdb.h> #include <netinet/in.h> @@ -35,7 +37,6 @@ #include <ws2tcpip.h> #endif -#include "config.h" #include "mp_msg.h" #include "rtsp.h" #include "rtsp_rtp.h"

1 0

r18839 - in trunk/libmpdemux/librtsp: rtsp_rtp.c rtsp_rtp.h
by ben 27 Jun '06

27 Jun '06

Author: ben Date: Tue Jun 27 21:16:43 2006 New Revision: 18839 Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c trunk/libmpdemux/librtsp/rtsp_rtp.h Log: avoid messing up with includes Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp_rtp.c (original) +++ trunk/libmpdemux/librtsp/rtsp_rtp.c Tue Jun 27 21:16:43 2006 @@ -18,8 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <pthread.h> -#include <netdb.h> #include <unistd.h> #include <stdio.h> #include <string.h> @@ -28,15 +26,16 @@ #include <sys/types.h> #ifndef HAVE_WINSOCK2 +#include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> #include <arpa/inet.h> -#define closesocket close #else #include <winsock2.h> #include <ws2tcpip.h> #endif +#include "config.h" #include "mp_msg.h" #include "rtsp.h" #include "rtsp_rtp.h" Modified: trunk/libmpdemux/librtsp/rtsp_rtp.h ============================================================================== --- trunk/libmpdemux/librtsp/rtsp_rtp.h (original) +++ trunk/libmpdemux/librtsp/rtsp_rtp.h Tue Jun 27 21:16:43 2006 @@ -21,8 +21,6 @@ #ifndef _HAVE_RTSP_RTP_H_ #define _HAVE_RTSP_RTP_H_ -#include <pthread.h> - #include "rtsp.h" #define MAX_PREVIEW_SIZE 4096

2 1

r18840 - trunk/libmpdemux/librtsp/rtsp_rtp.c
by ben 27 Jun '06

27 Jun '06

Author: ben Date: Tue Jun 27 21:18:52 2006 New Revision: 18840 Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c Log: network code portability for win32 Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp_rtp.c (original) +++ trunk/libmpdemux/librtsp/rtsp_rtp.c Tue Jun 27 21:18:52 2006 @@ -381,8 +381,17 @@ return -1; sin.sin_family = AF_INET; - inet_pton (AF_INET, addr, &sin.sin_addr); +#ifndef HAVE_WINSOCK2 +#ifdef USE_ATON + inet_aton (addr, &sin.sin_addr); +#else + inet_pton (AF_INET, addr, &sin.sin_addr); +#endif +#else + sin.sin_addr.s_addr = htonl (INADDR_ANY); +#endif + if ((ntohl (sin.sin_addr.s_addr) >> 28) == 0xe) return 1;

1 0

r18833 - in trunk: cfg-common.h libmpdemux/Makefile libmpdemux/librtsp/rtsp_rtp.c libmpdemux/librtsp/rtsp_rtp.h libmpdemux/librtsp/rtsp_session.c libmpdemux/librtsp/rtsp_session.h libmpdemux/rtp.c libmpdemux/rtp.h
by ben 27 Jun '06

27 Jun '06

Author: ben Date: Mon Jun 26 23:27:57 2006 New Revision: 18833 Added: trunk/libmpdemux/librtsp/rtsp_rtp.c trunk/libmpdemux/librtsp/rtsp_rtp.h Modified: trunk/cfg-common.h trunk/libmpdemux/Makefile trunk/libmpdemux/librtsp/rtsp_session.c trunk/libmpdemux/librtsp/rtsp_session.h trunk/libmpdemux/rtp.c trunk/libmpdemux/rtp.h Log: added new native rtsp demuxer code for mpeg-ts over rtp (now both real and non-real servers should be handled) Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h (original) +++ trunk/cfg-common.h Mon Jun 26 23:27:57 2006 @@ -70,12 +70,11 @@ {"sdp", "-sdp is obsolete, 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}, - {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, #else {"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"rtsp-port", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif - + {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, + // ------------------------- demuxer options -------------------- // number of frames to play/convert @@ -415,8 +414,8 @@ #ifdef STREAMING_LIVE555 extern int rtspStreamOverTCP; -extern int rtsp_port; #endif +extern int rtsp_port; extern int audio_stream_cache; Modified: trunk/libmpdemux/Makefile ============================================================================== --- trunk/libmpdemux/Makefile (original) +++ trunk/libmpdemux/Makefile Mon Jun 26 23:27:57 2006 @@ -139,6 +139,7 @@ realrtsp/xbuffer.c \ SRCS += librtsp/rtsp.c \ + librtsp/rtsp_rtp.c \ librtsp/rtsp_session.c \ SRCS += freesdp/common.c \ Added: trunk/libmpdemux/librtsp/rtsp_rtp.c ============================================================================== --- (empty file) +++ trunk/libmpdemux/librtsp/rtsp_rtp.c Mon Jun 26 23:27:57 2006 @@ -0,0 +1,685 @@ +/* + * Copyright (C) 2006 Benjamin Zores + * based on the Freebox patch for xine by Vincent Mussard + * but with many enhancements for better RTSP RFC compliance. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <pthread.h> +#include <netdb.h> +#include <unistd.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> +#include <sys/types.h> + +#ifndef HAVE_WINSOCK2 +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif + +#include "mp_msg.h" +#include "rtsp.h" +#include "rtsp_rtp.h" +#include "rtsp_session.h" +#include "../freesdp/common.h" +#include "../freesdp/parser.h" + +#define RTSP_DEFAULT_PORT 31336 +#define MAX_LENGTH 256 + +#define RTSP_ACCEPT_SDP "Accept: application/sdp" +#define RTSP_CONTENT_LENGTH "Content-length" +#define RTSP_CONTENT_TYPE "Content-Type" +#define RTSP_APPLICATION_SDP "application/sdp" +#define RTSP_RANGE "Range: " +#define RTSP_NPT_NOW "npt=now-" +#define RTSP_MEDIA_CONTAINER_MPEG_TS "33" +#define RTSP_TRANSPORT_REQUEST "Transport: RTP/AVP;%s;%s%i-%i;mode=\"PLAY\"" + +#define RTSP_TRANSPORT_MULTICAST "multicast" +#define RTSP_TRANSPORT_UNICAST "unicast" + +#define RTSP_MULTICAST_PORT "port=" +#define RTSP_UNICAST_CLIENT_PORT "client_port=" +#define RTSP_UNICAST_SERVER_PORT "server_port=" +#define RTSP_SETUP_DESTINATION "destination=" + +#define RTSP_SESSION "Session" +#define RTSP_TRANSPORT "Transport" + +/* hardcoded RTCP RR - this is _NOT_ RFC compliant */ +#define RTCP_RR_SIZE 32 +#define RTCP_RR "\201\311\0\7(.JD\31+\306\343\0\0\0\0\0\0/E\0\0\2&\0\0\0\0\0\0\0\0\201" +#define RTCP_SEND_FREQUENCY 1024 + +int rtsp_port = 0; + +void +rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st) +{ + if (st->rtcp_socket == -1) + return; + + /* send RTCP RR every RTCP_SEND_FREQUENCY packets + * FIXME : NOT CORRECT, HARDCODED, BUT MAKES SOME SERVERS HAPPY + * not rfc compliant + * http://www.faqs.org/rfcs/rfc1889.html chapter 6 for RTCP + */ + + if (st->count == RTCP_SEND_FREQUENCY) + { + char rtcp_content[RTCP_RR_SIZE]; + strcpy (rtcp_content, RTCP_RR); + send (st->rtcp_socket, rtcp_content, RTCP_RR_SIZE, 0); + + /* ping RTSP server to keep connection alive. + we use OPTIONS instead of PING as not all servers support it */ + rtsp_request_options (s, "*"); + st->count = 0; + } + else + st->count++; +} + +static struct rtp_rtsp_session_t * +rtp_session_new (void) +{ + struct rtp_rtsp_session_t *st = NULL; + + st = malloc (sizeof (struct rtp_rtsp_session_t)); + + st->rtp_socket = -1; + st->rtcp_socket = -1; + st->control_url = NULL; + st->count = 0; + + return st; +} + +void +rtp_session_free (struct rtp_rtsp_session_t *st) +{ + if (!st) + return; + + if (st->rtp_socket != -1) + close (st->rtp_socket); + if (st->rtcp_socket != -1) + close (st->rtcp_socket); + + if (st->control_url) + free (st->control_url); + free (st); +} + +static void +rtp_session_set_fd (struct rtp_rtsp_session_t *st, + int rtp_sock, int rtcp_sock) +{ + if (!st) + return; + + st->rtp_socket = rtp_sock; + st->rtcp_socket = rtcp_sock; +} + +static int +parse_port (const char *line, const char *param, + int *rtp_port, int *rtcp_port) +{ + char *parse1; + char *parse2; + char *parse3; + + char *line_copy = strdup (line); + + parse1 = strstr (line_copy, param); + + if (parse1) + { + parse2 = strstr (parse1, "-"); + + if (parse2) + { + parse3 = strstr (parse2, ";"); + + if (parse3) + parse3[0] = 0; + + parse2[0] = 0; + } + else + { + free (line_copy); + return 0; + } + } + else + { + free (line_copy); + return 0; + } + + *rtp_port = atoi (parse1 + strlen (param)); + *rtcp_port = atoi (parse2 + 1); + + free (line_copy); + + return 1; +} + +static char * +parse_destination (const char *line) +{ + char *parse1; + char *parse2; + + char *dest = NULL; + char *line_copy = strdup (line); + int len; + + parse1 = strstr (line_copy, RTSP_SETUP_DESTINATION); + if (!parse1) + { + free (line_copy); + return NULL; + } + + parse2 = strstr (parse1, ";"); + if (!parse2) + { + free (line_copy); + return NULL; + } + + len = strlen (parse1) - strlen (parse2) + - strlen (RTSP_SETUP_DESTINATION) + 1; + dest = (char *) malloc (len + 1); + snprintf (dest, len, parse1 + strlen (RTSP_SETUP_DESTINATION)); + free (line_copy); + + return dest; +} + +static int +rtcp_connect (int client_port, int server_port, const char* server_hostname) +{ + struct sockaddr_in sin; + struct hostent *hp; + int s; + + if (client_port <= 1023) + return -1; + + s = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (s == -1) + return -1; + + hp = gethostbyname (server_hostname); + if (!hp) + { + close (s); + return -1; + } + + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = INADDR_ANY; + sin.sin_port = htons (client_port); + + if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) + { +#ifndef HAVE_WINSOCK2 + if (errno != EINPROGRESS) +#else + if (WSAGetLastError() != WSAEINPROGRESS) +#endif + { + close (s); + return -1; + } + } + + sin.sin_family = AF_INET; + memcpy (&(sin.sin_addr.s_addr), hp->h_addr, sizeof (hp->h_addr)); + sin.sin_port = htons (server_port); + + /* datagram socket */ + if (connect (s, (struct sockaddr *) &sin, sizeof (sin)) < 0) + { + close (s); + return -1; + } + + return s; +} + +static int +rtp_connect (char *hostname, int port) +{ + struct sockaddr_in sin; + struct timeval tv; + int err, err_len; + int rxsockbufsz; + int s; + fd_set set; + + if (port <= 1023) + return -1; + + s = socket (PF_INET, SOCK_DGRAM, 0); + if (s == -1) + return -1; + + sin.sin_family = AF_INET; + if (!hostname || !strcmp (hostname, "0.0.0.0")) + sin.sin_addr.s_addr = htonl (INADDR_ANY); + else +#ifndef HAVE_WINSOCK2 +#ifdef USE_ATON + inet_aton (hostname, &sin.sin_addr); +#else + inet_pton (AF_INET, hostname, &sin.sin_addr); +#endif +#else + sin.sin_addr.s_addr = htonl (INADDR_ANY); +#endif + sin.sin_port = htons (port); + + /* Increase the socket rx buffer size to maximum -- this is UDP */ + rxsockbufsz = 240 * 1024; + if (setsockopt (s, SOL_SOCKET, SO_RCVBUF, + &rxsockbufsz, sizeof (rxsockbufsz))) + mp_msg (MSGT_OPEN, MSGL_ERR, "Couldn't set receive socket buffer size\n"); + + /* if multicast address, add membership */ + if ((ntohl (sin.sin_addr.s_addr) >> 28) == 0xe) + { + struct ip_mreq mcast; + mcast.imr_multiaddr.s_addr = sin.sin_addr.s_addr; + mcast.imr_interface.s_addr = 0; + + if (setsockopt (s, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mcast, sizeof (mcast))) + { + mp_msg (MSGT_OPEN, MSGL_ERR, "IP_ADD_MEMBERSHIP failed\n"); + close (s); + return -1; + } + } + + /* datagram socket */ + if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) + { +#ifndef HAVE_WINSOCK2 + if (errno != EINPROGRESS) +#else + if (WSAGetLastError() != WSAEINPROGRESS) +#endif + { + mp_msg (MSGT_OPEN, MSGL_ERR, "bind: %s\n", strerror (errno)); + close (s); + return -1; + } + } + + tv.tv_sec = 0; + tv.tv_usec = (1 * 1000000); /* 1 second timeout */ + + FD_ZERO (&set); + FD_SET (s, &set); + + err = select (s + 1, &set, NULL, NULL, &tv); + if (err < 0) + { + mp_msg (MSGT_OPEN, MSGL_ERR, "Select failed: %s\n", strerror (errno)); + close (s); + return -1; + } + else if (err == 0) + { + mp_msg (MSGT_OPEN, MSGL_ERR, "Timeout! No data from host %s\n", hostname); + close (s); + return -1; + } + + err_len = sizeof (err); + getsockopt (s, SOL_SOCKET, SO_ERROR, &err, (socklen_t *) &err_len); + if (err) + { + mp_msg (MSGT_OPEN, MSGL_ERR, "Socket error: %d\n", err); + close (s); + return -1; + } + + return s; +} + +static int +is_multicast_address (char *addr) +{ + struct sockaddr_in sin; + + if (!addr) + return -1; + + sin.sin_family = AF_INET; + inet_pton (AF_INET, addr, &sin.sin_addr); + + if ((ntohl (sin.sin_addr.s_addr) >> 28) == 0xe) + return 1; + + return 0; +} + +struct rtp_rtsp_session_t * +rtp_setup_and_play (rtsp_t *rtsp_session) +{ + struct rtp_rtsp_session_t* rtp_session = NULL; + const fsdp_media_description_t *med_dsc = NULL; + char temp_buf[MAX_LENGTH + 1]; + char npt[256]; + + char* answer; + char* sdp; + char *server_addr = NULL; + char *destination = NULL; + + int statut; + int content_length = 0; + int is_multicast = 0; + + fsdp_description_t *dsc = NULL; + fsdp_error_t result; + + int client_rtp_port = -1; + int client_rtcp_port = -1; + int server_rtp_port = -1; + int server_rtcp_port = -1; + int rtp_sock = -1; + int rtcp_sock = -1; + + /* 1. send a RTSP DESCRIBE request to server */ + rtsp_schedule_field (rtsp_session, RTSP_ACCEPT_SDP); + statut = rtsp_request_describe (rtsp_session, NULL); + if (statut < 200 || statut > 299) + return NULL; + + answer = rtsp_search_answers (rtsp_session, RTSP_CONTENT_LENGTH); + if (answer) + content_length = atoi (answer); + else + return NULL; + + answer = rtsp_search_answers (rtsp_session, RTSP_CONTENT_TYPE); + if (!answer || !strstr (answer, RTSP_APPLICATION_SDP)) + return NULL; + + /* 2. read SDP message from server */ + sdp = (char *) malloc (content_length + 1); + if (rtsp_read_data (rtsp_session, sdp, content_length) <= 0) + { + free (sdp); + return NULL; + } + sdp[content_length] = 0; + + /* 3. parse SDP message */ + dsc = fsdp_description_new (); + result = fsdp_parse (sdp, dsc); + if (result != FSDPE_OK) + { + free (sdp); + fsdp_description_delete (dsc); + return NULL; + } + mp_msg (MSGT_OPEN, MSGL_V, "SDP:\n%s\n", sdp); + free (sdp); + + /* 4. check for number of media streams: only one is supported */ + if (fsdp_get_media_count (dsc) != 1) + { + mp_msg (MSGT_OPEN, MSGL_ERR, + "A single media stream only is supported atm.\n"); + fsdp_description_delete (dsc); + return NULL; + } + + /* 5. set the Normal Play Time parameter + * use range provided by server in SDP or start now if empty */ + sprintf (npt, RTSP_RANGE); + if (fsdp_get_range (dsc)) + strcat (npt, fsdp_get_range (dsc)); + else + strcat (npt, RTSP_NPT_NOW); + + /* 5. check for a valid media stream */ + med_dsc = fsdp_get_media (dsc, 0); + if (!med_dsc) + { + fsdp_description_delete (dsc); + return NULL; + } + + /* 6. parse the `m=<media> <port> <transport> <fmt list>' line */ + + /* check for an A/V media */ + if (fsdp_get_media_type (med_dsc) != FSDP_MEDIA_VIDEO && + fsdp_get_media_type (med_dsc) != FSDP_MEDIA_AUDIO) + { + fsdp_description_delete (dsc); + return NULL; + } + + /* only RTP/AVP transport method is supported right now */ + if (fsdp_get_media_transport_protocol (med_dsc) != FSDP_TP_RTP_AVP) + { + fsdp_description_delete (dsc); + return NULL; + } + + /* only MPEG-TS is supported at the moment */ + if (!strstr (fsdp_get_media_format (med_dsc, 0), + RTSP_MEDIA_CONTAINER_MPEG_TS)) + { + fsdp_description_delete (dsc); + return NULL; + } + + /* get client port (if any) advised by server */ + client_rtp_port = fsdp_get_media_port (med_dsc); + if (client_rtp_port == -1) + { + fsdp_description_delete (dsc); + return NULL; + } + + /* if client_rtp_port = 0 => let client randomly pick one */ + if (client_rtp_port == 0) + { + /* TODO: we should check if the port is in use first */ + if (rtsp_port) + client_rtp_port = rtsp_port; + else + client_rtp_port = RTSP_DEFAULT_PORT; + } + + /* RTCP port generally is RTP port + 1 */ + client_rtcp_port = client_rtp_port + 1; + + mp_msg (MSGT_OPEN, MSGL_V, + "RTP Port from SDP appears to be: %d\n", client_rtp_port); + mp_msg (MSGT_OPEN, MSGL_V, + "RTCP Port from SDP appears to be: %d\n", client_rtcp_port); + + /* 7. parse the `c=<network type> <addr type> <connection address>' line */ + + /* check for a valid media network type (inet) */ + if (fsdp_get_media_network_type (med_dsc) != FSDP_NETWORK_TYPE_INET) + { + /* no control for media: try global one instead */ + if (fsdp_get_global_conn_network_type (dsc) != FSDP_NETWORK_TYPE_INET) + { + fsdp_description_delete (dsc); + return NULL; + } + } + + /* only IPv4 is supported atm. */ + if (fsdp_get_media_address_type (med_dsc) != FSDP_ADDRESS_TYPE_IPV4) + { + /* no control for media: try global one instead */ + if (fsdp_get_global_conn_address_type (dsc) != FSDP_ADDRESS_TYPE_IPV4) + { + fsdp_description_delete (dsc); + return NULL; + } + } + + /* get the media server address to connect to */ + if (fsdp_get_media_address (med_dsc)) + server_addr = strdup (fsdp_get_media_address (med_dsc)); + else if (fsdp_get_global_conn_address (dsc)) + { + /* no control for media: try global one instead */ + server_addr = strdup (fsdp_get_global_conn_address (dsc)); + } + + if (!server_addr) + { + fsdp_description_delete (dsc); + return NULL; + } + + /* check for a UNICAST or MULTICAST address to connect to */ + is_multicast = is_multicast_address (server_addr); + + /* 8. initiate an RTP session */ + rtp_session = rtp_session_new (); + if (!rtp_session) + { + free (server_addr); + fsdp_description_delete (dsc); + return NULL; + } + + /* get the media control URL */ + if (fsdp_get_media_control (med_dsc, 0)) + rtp_session->control_url = strdup (fsdp_get_media_control (med_dsc, 0)); + fsdp_description_delete (dsc); + if (!rtp_session->control_url) + { + free (server_addr); + rtp_session_free (rtp_session); + return NULL; + } + + /* 9. create the payload for RTSP SETUP request */ + memset (temp_buf, '\0', MAX_LENGTH); + snprintf (temp_buf, MAX_LENGTH, + RTSP_TRANSPORT_REQUEST, + is_multicast ? RTSP_TRANSPORT_MULTICAST : RTSP_TRANSPORT_UNICAST, + is_multicast ? RTSP_MULTICAST_PORT : RTSP_UNICAST_CLIENT_PORT, + client_rtp_port, client_rtcp_port); + mp_msg (MSGT_OPEN, MSGL_V, "RTSP Transport: %s\n", temp_buf); + + rtsp_unschedule_field (rtsp_session, RTSP_SESSION); + rtsp_schedule_field (rtsp_session, temp_buf); + + /* 10. check for the media control URL type and initiate RTSP SETUP */ + if (!strncmp (rtp_session->control_url, "rtsp://", 7)) /* absolute URL */ + statut = rtsp_request_setup (rtsp_session, + rtp_session->control_url, NULL); + else /* relative URL */ + statut = rtsp_request_setup (rtsp_session, + NULL, rtp_session->control_url); + + if (statut < 200 || statut > 299) + { + free (server_addr); + rtp_session_free (rtp_session); + return NULL; + } + + /* 11. parse RTSP SETUP response: we need it to actually determine + * the real address and port to connect to */ + answer = rtsp_search_answers (rtsp_session, RTSP_TRANSPORT); + if (!answer) + { + free (server_addr); + rtp_session_free (rtp_session); + return NULL; + } + + /* check for RTP and RTCP ports to bind according to how request was done */ + is_multicast = 0; + if (strstr (answer, RTSP_TRANSPORT_MULTICAST)) + is_multicast = 1; + + if (is_multicast) + parse_port (answer, RTSP_MULTICAST_PORT, + &client_rtp_port, &client_rtcp_port); + else + { + parse_port (answer, RTSP_UNICAST_CLIENT_PORT, + &client_rtp_port, &client_rtcp_port); + parse_port (answer, RTSP_UNICAST_SERVER_PORT, + &server_rtp_port, &server_rtcp_port); + } + + /* now check network settings as determined by server */ + destination = parse_destination (answer); + if (!destination) + destination = strdup (server_addr); + free (server_addr); + + mp_msg (MSGT_OPEN, MSGL_V, "RTSP Destination: %s\n", destination); + mp_msg (MSGT_OPEN, MSGL_V, "Client RTP port : %d\n", client_rtp_port); + mp_msg (MSGT_OPEN, MSGL_V, "Client RTCP port : %d\n", client_rtcp_port); + mp_msg (MSGT_OPEN, MSGL_V, "Server RTP port : %d\n", server_rtp_port); + mp_msg (MSGT_OPEN, MSGL_V, "Server RTCP port : %d\n", server_rtcp_port); + + /* 12. performs RTSP PLAY request */ + rtsp_schedule_field (rtsp_session, npt); + statut = rtsp_request_play (rtsp_session, NULL); + if (statut < 200 || statut > 299) + { + rtp_session_free (rtp_session); + return NULL; + } + + /* 13. create RTP and RTCP connections */ + rtp_sock = rtp_connect (destination, client_rtp_port); + rtcp_sock = rtcp_connect (client_rtcp_port, server_rtcp_port, destination); + rtp_session_set_fd (rtp_session, rtp_sock, rtcp_sock); + free (destination); + + mp_msg (MSGT_OPEN, MSGL_V, "RTP Sock : %d\nRTCP Sock : %d\n", + rtp_session->rtp_socket, rtp_session->rtcp_socket); + + if (rtp_session->rtp_socket == -1) + { + rtp_session_free (rtp_session); + return NULL; + } + + return rtp_session; +} Added: trunk/libmpdemux/librtsp/rtsp_rtp.h ============================================================================== --- (empty file) +++ trunk/libmpdemux/librtsp/rtsp_rtp.h Mon Jun 26 23:27:57 2006 @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2006 Benjamin Zores + * heavily base on the Freebox patch for xine by Vincent Mussard + * but with many enhancements for better RTSP RFC compliance. + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _HAVE_RTSP_RTP_H_ +#define _HAVE_RTSP_RTP_H_ + +#include <pthread.h> + +#include "rtsp.h" + +#define MAX_PREVIEW_SIZE 4096 + +struct rtp_rtsp_session_t { + int rtp_socket; + int rtcp_socket; + char *control_url; + int count; +}; + +struct rtp_rtsp_session_t *rtp_setup_and_play (rtsp_t* rtsp_session); +off_t rtp_read (struct rtp_rtsp_session_t* st, char *buf, off_t length); +void rtp_session_free (struct rtp_rtsp_session_t *st); +void rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st); + +#endif /* _HAVE_RTSP_RTP_H_ */ + Modified: trunk/libmpdemux/librtsp/rtsp_session.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp_session.c (original) +++ trunk/libmpdemux/librtsp/rtsp_session.c Mon Jun 26 23:27:57 2006 @@ -23,6 +23,9 @@ * * * high level interface to rtsp servers. + * + * 2006, Benjamin Zores and Vincent Mussard + * Support for MPEG-TS streaming through RFC compliant RTSP servers */ #include <sys/types.h> @@ -42,7 +45,9 @@ #include <inttypes.h> #include "mp_msg.h" +#include "../rtp.h" #include "rtsp.h" +#include "rtsp_rtp.h" #include "rtsp_session.h" #include "../realrtsp/real.h" #include "../realrtsp/rmff.h" @@ -53,6 +58,7 @@ #define LOG */ +#define RTSP_OPTIONS_PUBLIC "Public" #define RTSP_OPTIONS_SERVER "Server" #define RTSP_OPTIONS_LOCATION "Location" #define RTSP_OPTIONS_REAL "RealChallenge1" @@ -63,6 +69,7 @@ struct rtsp_session_s { rtsp_t *s; struct real_rtsp_session_t* real_session; + struct rtp_rtsp_session_t* rtp_session; }; //rtsp_session_t *rtsp_session_start(char *mrl) { @@ -76,6 +83,7 @@ rtsp_session = malloc (sizeof (rtsp_session_t)); rtsp_session->s = NULL; rtsp_session->real_session = NULL; + rtsp_session->rtp_session = NULL; //connect: *redir = 0; @@ -141,13 +149,52 @@ rtsp_session->real_session->recv_size = rtsp_session->real_session->header_len; rtsp_session->real_session->recv_read = 0; - } else + } else /* not a Real server : try RTP instead */ { - mp_msg (MSGT_OPEN, MSGL_ERR,"rtsp_session: Not a Real server. Server type is '%s'.\n",server); - rtsp_close(rtsp_session->s); - free(server); - free(rtsp_session); - return NULL; + char *public = NULL; + + /* look for the Public: field in response to RTSP OPTIONS */ + public = strdup (rtsp_search_answers (rtsp_session->s, + RTSP_OPTIONS_PUBLIC)); + if (!public) + { + rtsp_close (rtsp_session->s); + free (server); + free (mrl_line); + free (rtsp_session); + return NULL; + } + + /* check for minimalistic RTSP RFC compliance */ + if (!strstr (public, RTSP_METHOD_DESCRIBE) + || !strstr (public, RTSP_METHOD_SETUP) + || !strstr (public, RTSP_METHOD_PLAY) + || !strstr (public, RTSP_METHOD_TEARDOWN)) + { + free (public); + mp_msg (MSGT_OPEN, MSGL_ERR, + "Remote server does not meet minimal RTSP 1.0 compliance.\n"); + rtsp_close (rtsp_session->s); + free (server); + free (mrl_line); + free (rtsp_session); + return NULL; + } + + free (public); + rtsp_session->rtp_session = rtp_setup_and_play (rtsp_session->s); + + /* neither a Real or an RTP server */ + if (!rtsp_session->rtp_session) + { + mp_msg (MSGT_OPEN, MSGL_ERR, "rtsp_session: unsupported RTSP server. "); + mp_msg (MSGT_OPEN, MSGL_ERR, "Server type is '%s'.\n", server); + rtsp_close (rtsp_session->s); + free (server); + free (mrl_line); + free (rtsp_session); + return NULL; + } } free(server); @@ -194,6 +241,19 @@ return len; } + else if (this->rtp_session) + { + int l = 0; + + l = read_rtp_from_server (this->rtp_session->rtp_socket, data, len); + /* send RTSP and RTCP keepalive */ + rtcp_send_rr (this->s, this->rtp_session); + + if (l == 0) + rtsp_session_end (this); + + return l; + } return 0; } @@ -203,5 +263,7 @@ rtsp_close(session->s); if (session->real_session) free_real_rtsp_session (session->real_session); + if (session->rtp_session) + rtp_session_free (session->rtp_session); free(session); } Modified: trunk/libmpdemux/librtsp/rtsp_session.h ============================================================================== --- trunk/libmpdemux/librtsp/rtsp_session.h (original) +++ trunk/libmpdemux/librtsp/rtsp_session.h Mon Jun 26 23:27:57 2006 @@ -23,6 +23,9 @@ * * * high level interface to rtsp servers. + * + * 2006, Benjamin Zores and Vincent Mussard + * Support for MPEG-TS streaming through RFC compliant RTSP servers */ #ifndef HAVE_RTSP_SESSION_H Modified: trunk/libmpdemux/rtp.c ============================================================================== --- trunk/libmpdemux/rtp.c (original) +++ trunk/libmpdemux/rtp.c Mon Jun 26 23:27:57 2006 @@ -189,7 +189,7 @@ // Read next rtp packet using cache -static int read_rtp_from_server(int fd, char *buffer, int length) { +int read_rtp_from_server(int fd, char *buffer, int length) { // Following test is ASSERT (i.e. uneuseful if code is correct) if(buffer==NULL || length<STREAM_BUFFER_SIZE) { mp_msg(MSGT_NETWORK, MSGL_ERR, "RTP buffer invalid; no data return from network\n"); Modified: trunk/libmpdemux/rtp.h ============================================================================== --- trunk/libmpdemux/rtp.h (original) +++ trunk/libmpdemux/rtp.h Mon Jun 26 23:27:57 2006 @@ -33,5 +33,6 @@ static int getrtp2(int fd, struct rtpheader *rh, char** data, int* lengthData); +int read_rtp_from_server(int fd, char *buffer, int length); #endif

4 6

r18838 - trunk/mp3lib/dct64_k7.c
by gpoirier 27 Jun '06

27 Jun '06

Author: gpoirier Date: Tue Jun 27 07:58:46 2006 New Revision: 18838 Modified: trunk/mp3lib/dct64_k7.c Log: remove MMX2 dependency (replace pshufw $78 with pswapd) so it can be used on a K6-2/3+. Patch by Zuxy Meng < zuxy PP meng AH gmail PP com > Original thread: Date: Jun 21, 2006 2:50 PM Subject: [MPlayer-dev-eng] [PATCH] Saturation & PSWAPD bugfix in mp3lib/dct64_3dnow.c & mp3lib/dct64_k7.c Modified: trunk/mp3lib/dct64_k7.c ============================================================================== --- trunk/mp3lib/dct64_k7.c (original) +++ trunk/mp3lib/dct64_k7.c Tue Jun 27 07:58:46 2006 @@ -32,8 +32,8 @@ " movq 8(%%eax), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 120(%%eax), %%mm1\n\t" -" pshufw $78, 112(%%eax), %%mm5\n\t" +" pswapd 120(%%eax), %%mm1\n\t" +" pswapd 112(%%eax), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, (%%edx)\n\t" @@ -51,8 +51,8 @@ " movq 24(%%eax), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 104(%%eax), %%mm1\n\t" -" pshufw $78, 96(%%eax), %%mm5\n\t" +" pswapd 104(%%eax), %%mm1\n\t" +" pswapd 96(%%eax), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 16(%%edx)\n\t" @@ -70,8 +70,8 @@ " movq 40(%%eax), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 88(%%eax), %%mm1\n\t" -" pshufw $78, 80(%%eax), %%mm5\n\t" +" pswapd 88(%%eax), %%mm1\n\t" +" pswapd 80(%%eax), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 32(%%edx)\n\t" @@ -89,8 +89,8 @@ " movq 56(%%eax), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 72(%%eax), %%mm1\n\t" -" pshufw $78, 64(%%eax), %%mm5\n\t" +" pswapd 72(%%eax), %%mm1\n\t" +" pswapd 64(%%eax), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 48(%%edx)\n\t" @@ -110,8 +110,8 @@ " movq 8(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 56(%%edx), %%mm1\n\t" -" pshufw $78, 48(%%edx), %%mm5\n\t" +" pswapd 56(%%edx), %%mm1\n\t" +" pswapd 48(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, (%%ecx)\n\t" @@ -129,8 +129,8 @@ " movq 24(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 40(%%edx), %%mm1\n\t" -" pshufw $78, 32(%%edx), %%mm5\n\t" +" pswapd 40(%%edx), %%mm1\n\t" +" pswapd 32(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 16(%%ecx)\n\t" @@ -150,8 +150,8 @@ " movq 72(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 120(%%edx), %%mm1\n\t" -" pshufw $78, 112(%%edx), %%mm5\n\t" +" pswapd 120(%%edx), %%mm1\n\t" +" pswapd 112(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 64(%%ecx)\n\t" @@ -169,8 +169,8 @@ " movq 88(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 104(%%edx), %%mm1\n\t" -" pshufw $78, 96(%%edx), %%mm5\n\t" +" pswapd 104(%%edx), %%mm1\n\t" +" pswapd 96(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 80(%%ecx)\n\t" @@ -193,8 +193,8 @@ " movq 8(%%ecx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 24(%%ecx), %%mm1\n\t" -" pshufw $78, 16(%%ecx), %%mm5\n\t" +" pswapd 24(%%ecx), %%mm1\n\t" +" pswapd 16(%%ecx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, (%%edx)\n\t" @@ -212,8 +212,8 @@ " movq 40(%%ecx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 56(%%ecx), %%mm1\n\t" -" pshufw $78, 48(%%ecx), %%mm5\n\t" +" pswapd 56(%%ecx), %%mm1\n\t" +" pswapd 48(%%ecx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 32(%%edx)\n\t" @@ -231,8 +231,8 @@ " movq 72(%%ecx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 88(%%ecx), %%mm1\n\t" -" pshufw $78, 80(%%ecx), %%mm5\n\t" +" pswapd 88(%%ecx), %%mm1\n\t" +" pswapd 80(%%ecx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 64(%%edx)\n\t" @@ -250,8 +250,8 @@ " movq 104(%%ecx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 120(%%ecx), %%mm1\n\t" -" pshufw $78, 112(%%ecx), %%mm5\n\t" +" pswapd 120(%%ecx), %%mm1\n\t" +" pswapd 112(%%ecx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 96(%%edx)\n\t" @@ -273,8 +273,8 @@ " movq 16(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 8(%%edx), %%mm1\n\t" -" pshufw $78, 24(%%edx), %%mm5\n\t" +" pswapd 8(%%edx), %%mm1\n\t" +" pswapd 24(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, (%%ecx)\n\t" @@ -292,8 +292,8 @@ " movq 48(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 40(%%edx), %%mm1\n\t" -" pshufw $78, 56(%%edx), %%mm5\n\t" +" pswapd 40(%%edx), %%mm1\n\t" +" pswapd 56(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 32(%%ecx)\n\t" @@ -311,8 +311,8 @@ " movq 80(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 72(%%edx), %%mm1\n\t" -" pshufw $78, 88(%%edx), %%mm5\n\t" +" pswapd 72(%%edx), %%mm1\n\t" +" pswapd 88(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 64(%%ecx)\n\t" @@ -330,8 +330,8 @@ " movq 112(%%edx), %%mm4\n\t" " movq %%mm0, %%mm3\n\t" " movq %%mm4, %%mm7\n\t" -" pshufw $78, 104(%%edx), %%mm1\n\t" -" pshufw $78, 120(%%edx), %%mm5\n\t" +" pswapd 104(%%edx), %%mm1\n\t" +" pswapd 120(%%edx), %%mm5\n\t" " pfadd %%mm1, %%mm0\n\t" " pfadd %%mm5, %%mm4\n\t" " movq %%mm0, 96(%%ecx)\n\t"

1 0

r18837 - in trunk/mp3lib: dct64_3dnow.c dct64_k7.c
by gpoirier 27 Jun '06

27 Jun '06

Author: gpoirier Date: Tue Jun 27 07:51:45 2006 New Revision: 18837 Modified: trunk/mp3lib/dct64_3dnow.c trunk/mp3lib/dct64_k7.c Log: fix conversion float to int to use saturated ops, Patch by Zuxy Meng < zuxy PP meng AH gmail PP com > Original thread: Date: Jun 21, 2006 2:50 PM Subject: [MPlayer-dev-eng] [PATCH] Saturation & PSWAPD bugfix in mp3lib/dct64_3dnow.c & mp3lib/dct64_k7.c Modified: trunk/mp3lib/dct64_3dnow.c ============================================================================== --- trunk/mp3lib/dct64_3dnow.c (original) +++ trunk/mp3lib/dct64_3dnow.c Tue Jun 27 07:51:45 2006 @@ -746,21 +746,23 @@ " pfacc %%mm1, %%mm0\n\t" " pfmul %%mm6, %%mm0\n\t" " pf2id %%mm0, %%mm0\n\t" +" packssdw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " movw %%ax, 512(%%esi)\n\t" -" psrlq $32, %%mm0\n\t" -" movd %%mm0, %%eax\n\t" +" shrl $16, %%eax\n\t" " movw %%ax, (%%esi)\n\t" " movd 12(%%ecx), %%mm0\n\t" " pfsub 8(%%ecx), %%mm0\n\t" " pfmul 120(%%ebx), %%mm0\n\t" " pf2id %%mm0, %%mm7\n\t" +" packssdw %%mm7, %%mm7\n\t" " movd %%mm7, %%eax\n\t" " movw %%ax, 256(%%edi)\n\t" " pfadd 12(%%ecx), %%mm0\n\t" " pfadd 8(%%ecx), %%mm0\n\t" " pf2id %%mm0, %%mm0\n\t" +" packssdw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " movw %%ax, 256(%%esi)\n\t" @@ -775,6 +777,7 @@ " movq %%mm2, %%mm1\n\t" " pf2id %%mm2, %%mm7\n\t" +" packssdw %%mm7, %%mm7\n\t" " movd %%mm7, %%eax\n\t" " movw %%ax, 384(%%edi)\n\t" @@ -785,14 +788,17 @@ " pfadd 16(%%ecx), %%mm0\n\t" " pfadd 20(%%ecx), %%mm0\n\t" " pf2id %%mm0, %%mm0\n\t" +" packssdw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " movw %%ax, 384(%%esi)\n\t" " pfadd %%mm3, %%mm1\n\t" " pf2id %%mm1, %%mm1\n\t" +" packssdw %%mm1, %%mm1\n\t" " movd %%mm1, %%eax\n\t" " movw %%ax, 128(%%esi)\n\t" " pfadd %%mm3, %%mm2\n\t" " pf2id %%mm2, %%mm2\n\t" +" packssdw %%mm2, %%mm2\n\t" " movd %%mm2, %%eax\n\t" " movw %%ax, 128(%%edi)\n\t" @@ -804,14 +810,14 @@ " pfadd 40(%%edx), %%mm1\n\t" " pf2id %%mm0, %%mm0\n\t" " pf2id %%mm1, %%mm1\n\t" +" packssdw %%mm0, %%mm0\n\t" +" packssdw %%mm1, %%mm1\n\t" " movd %%mm0, %%eax\n\t" " movd %%mm1, %%ecx\n\t" " movw %%ax, 448(%%esi)\n\t" " movw %%cx, 320(%%esi)\n\t" -" psrlq $32, %%mm0\n\t" -" psrlq $32, %%mm1\n\t" -" movd %%mm0, %%eax\n\t" -" movd %%mm1, %%ecx\n\t" +" shrl $16, %%eax\n\t" +" shrl $16, %%ecx\n\t" " movw %%ax, 64(%%edi)\n\t" " movw %%cx, 192(%%edi)\n\t" @@ -829,28 +835,30 @@ " pfadd %%mm4, %%mm3\n\t" " pf2id %%mm0, %%mm1\n\t" " pf2id %%mm3, %%mm3\n\t" +" packssdw %%mm0, %%mm0\n\t" +" packssdw %%mm3, %%mm3\n\t" " pfadd 88(%%edx), %%mm5\n\t" " movd %%mm1, %%eax\n\t" " movd %%mm3, %%ecx\n\t" " movw %%ax, 448(%%edi)\n\t" " movw %%cx, 192(%%esi)\n\t" " pf2id %%mm5, %%mm5\n\t" -" psrlq $32, %%mm1\n\t" -" psrlq $32, %%mm3\n\t" +" packssdw %%mm5, %%mm5\n\t" +" shrl $16, %%eax\n\t" +" shrl $16, %%ecx\n\t" " movd %%mm5, %%ebx\n\t" -" movd %%mm1, %%eax\n\t" -" movd %%mm3, %%ecx\n\t" " movw %%bx, 96(%%esi)\n\t" " movw %%ax, 480(%%edi)\n\t" " movw %%cx, 64(%%esi)\n\t" " pfadd %%mm2, %%mm0\n\t" " pf2id %%mm0, %%mm0\n\t" +" packssdw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " pfadd 68(%%edx), %%mm6\n\t" " movw %%ax, 320(%%edi)\n\t" -" psrlq $32, %%mm0\n\t" +" shr $16, %%eax\n\t" " pf2id %%mm6, %%mm6\n\t" -" movd %%mm0, %%eax\n\t" +" packssdw %%mm6, %%mm6\n\t" " movd %%mm6, %%ebx\n\t" " movw %%ax, 416(%%edi)\n\t" " movw %%bx, 32(%%esi)\n\t" @@ -870,18 +878,18 @@ " pf2id %%mm0, %%mm0\n\t" " pf2id %%mm2, %%mm2\n\t" " pf2id %%mm4, %%mm4\n\t" +" packssdw %%mm0, %%mm0\n\t" +" packssdw %%mm2, %%mm2\n\t" +" packssdw %%mm4, %%mm4\n\t" " movd %%mm0, %%eax\n\t" " movd %%mm2, %%ecx\n\t" " movd %%mm4, %%ebx\n\t" " movw %%ax, 480(%%esi)\n\t" " movw %%cx, 352(%%esi)\n\t" " movw %%bx, 224(%%esi)\n\t" -" psrlq $32, %%mm0\n\t" -" psrlq $32, %%mm2\n\t" -" psrlq $32, %%mm4\n\t" -" movd %%mm0, %%eax\n\t" -" movd %%mm2, %%ecx\n\t" -" movd %%mm4, %%ebx\n\t" +" shrl $16, %%eax\n\t" +" shrl $16, %%ecx\n\t" +" shrl $16, %%ebx\n\t" " movw %%ax, 32(%%edi)\n\t" " movw %%cx, 160(%%edi)\n\t" " movw %%bx, 288(%%edi)\n\t" @@ -891,15 +899,18 @@ " pf2id %%mm1, %%mm1\n\t" " pf2id %%mm3, %%mm3\n\t" " pf2id %%mm5, %%mm5\n\t" +" packssdw %%mm1, %%mm1\n\t" +" packssdw %%mm3, %%mm3\n\t" +" packssdw %%mm5, %%mm5\n\t" " movd %%mm1, %%eax\n\t" " movd %%mm3, %%ecx\n\t" " movd %%mm5, %%ebx\n\t" " movw %%ax, 416(%%esi)\n\t" " movw %%cx, 288(%%esi)\n\t" " movw %%bx, 160(%%esi)\n\t" -" psrlq $32, %%mm1\n\t" -" psrlq $32, %%mm3\n\t" -" psrlq $32, %%mm5\n\t" +" shrl $16, %%eax\n\t" +" shrl $16, %%ecx\n\t" +" shrl $16, %%ebx\n\t" " movd %%mm1, %%eax\n\t" " movd %%mm3, %%ecx\n\t" " movd %%mm5, %%ebx\n\t" Modified: trunk/mp3lib/dct64_k7.c ============================================================================== --- trunk/mp3lib/dct64_k7.c (original) +++ trunk/mp3lib/dct64_k7.c Tue Jun 27 07:51:45 2006 @@ -591,7 +591,7 @@ " pxor %%mm7, %%mm1\n\t" " pfacc %%mm1, %%mm0\n\t" " pfmul %%mm6, %%mm0\n\t" -" pf2id %%mm0, %%mm0\n\t" +" pf2iw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " movw %%ax, 512(%%esi)\n\t" " psrlq $32, %%mm0\n\t" @@ -601,12 +601,12 @@ " movd 12(%%ecx), %%mm0\n\t" " pfsub 8(%%ecx), %%mm0\n\t" " pfmul 120(%%ebx), %%mm0\n\t" -" pf2id %%mm0, %%mm7\n\t" +" pf2iw %%mm0, %%mm7\n\t" " movd %%mm7, %%eax\n\t" " movw %%ax, 256(%%edi)\n\t" " pfadd 12(%%ecx), %%mm0\n\t" " pfadd 8(%%ecx), %%mm0\n\t" -" pf2id %%mm0, %%mm0\n\t" +" pf2iw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " movw %%ax, 256(%%esi)\n\t" @@ -620,7 +620,7 @@ " pfmul 120(%%ebx), %%mm2\n\t" " movq %%mm2, %%mm1\n\t" -" pf2id %%mm2, %%mm7\n\t" +" pf2iw %%mm2, %%mm7\n\t" " movd %%mm7, %%eax\n\t" " movw %%ax, 384(%%edi)\n\t" @@ -630,15 +630,15 @@ " pfadd 16(%%ecx), %%mm0\n\t" " pfadd 20(%%ecx), %%mm0\n\t" -" pf2id %%mm0, %%mm0\n\t" +" pf2iw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " movw %%ax, 384(%%esi)\n\t" " pfadd %%mm3, %%mm1\n\t" -" pf2id %%mm1, %%mm1\n\t" +" pf2iw %%mm1, %%mm1\n\t" " movd %%mm1, %%eax\n\t" " movw %%ax, 128(%%esi)\n\t" " pfadd %%mm3, %%mm2\n\t" -" pf2id %%mm2, %%mm2\n\t" +" pf2iw %%mm2, %%mm2\n\t" " movd %%mm2, %%eax\n\t" " movw %%ax, 128(%%edi)\n\t" @@ -648,8 +648,8 @@ " movq 48(%%edx), %%mm1\n\t" " pfadd 48(%%edx), %%mm0\n\t" " pfadd 40(%%edx), %%mm1\n\t" -" pf2id %%mm0, %%mm0\n\t" -" pf2id %%mm1, %%mm1\n\t" +" pf2iw %%mm0, %%mm0\n\t" +" pf2iw %%mm1, %%mm1\n\t" " movd %%mm0, %%eax\n\t" " movd %%mm1, %%ecx\n\t" " movw %%ax, 448(%%esi)\n\t" @@ -673,14 +673,14 @@ " punpckldq 92(%%edx), %%mm2\n\t" " movq %%mm5, %%mm6\n\t" " pfadd %%mm4, %%mm3\n\t" -" pf2id %%mm0, %%mm1\n\t" -" pf2id %%mm3, %%mm3\n\t" +" pf2iw %%mm0, %%mm1\n\t" +" pf2iw %%mm3, %%mm3\n\t" " pfadd 88(%%edx), %%mm5\n\t" " movd %%mm1, %%eax\n\t" " movd %%mm3, %%ecx\n\t" " movw %%ax, 448(%%edi)\n\t" " movw %%cx, 192(%%esi)\n\t" -" pf2id %%mm5, %%mm5\n\t" +" pf2iw %%mm5, %%mm5\n\t" " psrlq $32, %%mm1\n\t" " psrlq $32, %%mm3\n\t" " movd %%mm5, %%ebx\n\t" @@ -690,12 +690,12 @@ " movw %%ax, 480(%%edi)\n\t" " movw %%cx, 64(%%esi)\n\t" " pfadd %%mm2, %%mm0\n\t" -" pf2id %%mm0, %%mm0\n\t" +" pf2iw %%mm0, %%mm0\n\t" " movd %%mm0, %%eax\n\t" " pfadd 68(%%edx), %%mm6\n\t" " movw %%ax, 320(%%edi)\n\t" " psrlq $32, %%mm0\n\t" -" pf2id %%mm6, %%mm6\n\t" +" pf2iw %%mm6, %%mm6\n\t" " movd %%mm0, %%eax\n\t" " movd %%mm6, %%ebx\n\t" " movw %%ax, 416(%%edi)\n\t" @@ -713,9 +713,9 @@ " pfadd 64(%%edx), %%mm0\n\t" " pfadd 80(%%edx), %%mm2\n\t" " pfadd 72(%%edx), %%mm4\n\t" -" pf2id %%mm0, %%mm0\n\t" -" pf2id %%mm2, %%mm2\n\t" -" pf2id %%mm4, %%mm4\n\t" +" pf2iw %%mm0, %%mm0\n\t" +" pf2iw %%mm2, %%mm2\n\t" +" pf2iw %%mm4, %%mm4\n\t" " movd %%mm0, %%eax\n\t" " movd %%mm2, %%ecx\n\t" " movd %%mm4, %%ebx\n\t" @@ -734,9 +734,9 @@ " pfadd 80(%%edx), %%mm1\n\t" " pfadd 72(%%edx), %%mm3\n\t" " pfadd 88(%%edx), %%mm5\n\t" -" pf2id %%mm1, %%mm1\n\t" -" pf2id %%mm3, %%mm3\n\t" -" pf2id %%mm5, %%mm5\n\t" +" pf2iw %%mm1, %%mm1\n\t" +" pf2iw %%mm3, %%mm3\n\t" +" pf2iw %%mm5, %%mm5\n\t" " movd %%mm1, %%eax\n\t" " movd %%mm3, %%ecx\n\t" " movd %%mm5, %%ebx\n\t"

1 0

r18836 - trunk/libmpdemux/demux_rtp.cpp
by ben 26 Jun '06

26 Jun '06

Author: ben Date: Tue Jun 27 00:00:44 2006 New Revision: 18836 Modified: trunk/libmpdemux/demux_rtp.cpp Log: don't declare same global var twice (break live555 compilation) Modified: trunk/libmpdemux/demux_rtp.cpp ============================================================================== --- trunk/libmpdemux/demux_rtp.cpp (original) +++ trunk/libmpdemux/demux_rtp.cpp Tue Jun 27 00:00:44 2006 @@ -90,7 +90,7 @@ } int rtspStreamOverTCP = 0; -int rtsp_port = 0; +extern int rtsp_port; extern "C" int audio_id, video_id, dvdsub_id; extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {

1 0

r18834 - trunk/ChangeLog
by ben 26 Jun '06

26 Jun '06

Author: ben Date: Mon Jun 26 23:29:47 2006 New Revision: 18834 Modified: trunk/ChangeLog Log: mention new rtsp demuxer in changelog file Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog (original) +++ trunk/ChangeLog Mon Jun 26 23:29:47 2006 @@ -13,6 +13,7 @@ * it's possible to switch to any of the available audio tracks in MPEG TS/PS, MKV and streams supported by libavformat * lavf demuxer now honors -alang + * new native RTSP demuxer (handles MPEG-TS over RTP) from generic RTSP servers. pre8: "NeuTeam strikes back" June 11, 2006

1 0

r18832 - trunk/DOCS/tech/svn-howto.txt
by ivo 26 Jun '06

26 Jun '06

Author: ivo Date: Mon Jun 26 21:04:59 2006 New Revision: 18832 Modified: trunk/DOCS/tech/svn-howto.txt Log: Add new Subversion beginners guide Modified: trunk/DOCS/tech/svn-howto.txt ============================================================================== --- trunk/DOCS/tech/svn-howto.txt (original) +++ trunk/DOCS/tech/svn-howto.txt Mon Jun 26 21:04:59 2006 @@ -201,3 +201,65 @@ III. Beginners Guide ==================== + +The typical flow of development would be: + +1. Check out the source: + + svn checkout svn://svn.mplayerhq.hu/mplayer/trunk/ devel + +2. Make your changes. + +3. Create a patch: + + Run svn diff from the root of the source tree, like this: + + cd devel + svn diff > ../my_changes.patch + + If you have made several changes, but only want to submit one for review + by other developers, you can specify the filename(s), for example: + + svn diff mplayer.c > ../major_cleanup.patch + +4. Check the patch: + + Check out another, clean source tree and verify your patch: + + svn checkout svn://svn.mplayerhq.hu/mplayer/trunk/ clean + cd clean + patch -p0 --dry-run < ../my_changes.patch + + If there are no errors, you can apply your patch: + + patch -p0 < ../my_changes.patch + + After that, verify that MPlayer still builds correctly with your patch + applied. Also, be sure that your patch meets our policy as described in + section II, specifically rules 1 to 6, before you continue submitting + the patch. + +5. Submit the patch: + + Send an e-mail to the mplayer-dev-eng mailing list. Describe what your + patch does and why, and attach the patch file for review by others. + +6. During the review process, incorporate all suggested fixes. Go to step 2 + repeatedly until there is nothing more to do for step 6. Of course, if + you don't agree with certain suggestions, things can be discussed on + the mailing list in a polite manner. + +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: + + svn commit filename(s) + + Go to step 2 ad infinitum until MPlayer is the perfect media player ;) + +Note: If you are listed as the maintainer for a particular piece of code, +you can skip step 5 and 6 if your patch _only_ applies to the code you +maintain. If it touches other code or is otherwise very intrusive, please +post it to mplayer-dev-eng first.

1 0