March 2004 - MPlayer-cvslog - lists.mplayerhq.hu

[Mplayer-cvslog] CVS: main/libmpdemux cddb.c, 1.14, 1.15 demux_avi.c, 1.58, 1.59 network.c, 1.89, 1.90 network.h, 1.18, 1.19 stream.c, 1.70, 1.71 stream.h, 1.66, 1.67
by syncmail＠mplayerhq.hu 04 Aug '04

04 Aug '04

CVS change done by Attila Kinali CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv2821/libmpdemux Modified Files: cddb.c demux_avi.c network.c network.h stream.c stream.h Log Message: enable seeking in http streams patch by Valentine Zaretsky <valik+mplayerdev(a)email.dp.ua> Index: cddb.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cddb.c 17 May 2003 12:24:01 -0000 1.14 +++ cddb.c 17 Feb 2004 12:30:44 -0000 1.15 @@ -204,7 +204,7 @@ return -1; } - fd = http_send_request(url); + fd = http_send_request(url,0); if( fd<0 ) { printf("failed to send the http request\n"); return -1; Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- demux_avi.c 22 Oct 2003 19:01:37 -0000 1.58 +++ demux_avi.c 17 Feb 2004 12:30:44 -0000 1.59 @@ -214,7 +214,7 @@ } pos = priv->idx_offset + (unsigned long)idx->dwChunkOffset; - if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->type!=STREAMTYPE_STREAM)){ + if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos); continue; } @@ -246,7 +246,7 @@ if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0; } else { demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->type!=STREAMTYPE_STREAM)){ + if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & STREAM_SEEK)){ demux->stream->eof=1; return 0; } @@ -449,7 +449,7 @@ demuxer->priv=(void*)priv; //---- AVI header: - read_avi_header(demuxer,(demuxer->stream->type!=STREAMTYPE_STREAM)?index_mode:-2); + read_avi_header(demuxer,(demuxer->stream->flags & STREAM_SEEK)?index_mode:-2); if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){ mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id); Index: network.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- network.c 8 Dec 2003 13:25:32 -0000 1.89 +++ network.c 17 Feb 2004 12:30:44 -0000 1.90 @@ -428,7 +428,7 @@ } int -http_send_request( URL_t *url ) { +http_send_request( URL_t *url, off_t pos ) { HTTP_header_t *http_hdr; URL_t *server_url; char str[256]; @@ -455,6 +455,12 @@ } else http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION); + + if(pos>0) { + // Extend http_send_request with possibility to do partial content retrieval + snprintf(str, 256, "Range: bytes=%d-", pos); + http_set_field(http_hdr, str); + } if (network_cookies_enabled) cookies_set( http_hdr, server_url->hostname, server_url->url ); @@ -572,6 +578,50 @@ return 0; } +int +http_seek( stream_t *stream, off_t pos ) { + HTTP_header_t *http_hdr = NULL; + int fd; + if( stream==NULL ) return 0; + + if( stream->fd>0 ) closesocket(stream->fd); // need to reconnect to seek in http-stream + fd = http_send_request( stream->streaming_ctrl->url, pos ); + if( fd<0 ) return 0; + + http_hdr = http_read_response( fd ); + + if( http_hdr==NULL ) return 0; + + switch( http_hdr->status_code ) { + case 200: + case 206: // OK + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); + if( http_hdr->body_size>0 ) { + if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { + http_free( http_hdr ); + return -1; + } + } + break; + default: + mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); + close( fd ); + fd = -1; + } + stream->fd = fd; + + if( http_hdr ) { + http_free( http_hdr ); + stream->streaming_ctrl->data = NULL; + } + + stream->pos=pos; + + return 1; +} + + // By using the protocol, the extension of the file or the content-type // we might be able to guess the streaming type. int @@ -581,6 +631,7 @@ int fd=-1; int redirect; int auth_retry=0; + int seekable=0; char *extension; char *content_type; char *next_url; @@ -683,7 +734,7 @@ // HTTP based protocol if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "http_proxy") ) { - fd = http_send_request( url ); + fd = http_send_request( url, 0 ); if( fd<0 ) { return -1; } @@ -701,7 +752,10 @@ } streaming_ctrl->data = (void*)http_hdr; - + + // Check if we can make partial content requests and thus seek in http-streams + seekable=(http_hdr!=NULL && http_hdr->status_code==200 && strncmp(http_get_field(http_hdr,"Accept-Ranges"),"bytes",5)==0); + // Check if the response is an ICY status_code reason_phrase if( !strcasecmp(http_hdr->protocol, "ICY") ) { switch( http_hdr->status_code ) { @@ -756,13 +810,13 @@ for( i=0 ; i<(sizeof(mime_type_table)/sizeof(mime_type_table[0])) ; i++ ) { if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { *file_format = mime_type_table[i].demuxer_type; - return 0; + return seekable; // for streaming_start } } } // Not found in the mime type table, don't fail, // we should try raw HTTP - return 0; + return seekable; // for streaming_start // Redirect case 301: // Permanently case 302: // Temporarily @@ -857,7 +911,7 @@ fd = stream->fd; if( fd<0 ) { - fd = http_send_request( stream->streaming_ctrl->url ); + fd = http_send_request( stream->streaming_ctrl->url, 0 ); if( fd<0 ) return -1; http_hdr = http_read_response( fd ); if( http_hdr==NULL ) return -1; @@ -1121,6 +1175,11 @@ if( ret<0 ) { return -1; } + if( ret==1 ) { + stream->flags |= STREAM_SEEK; + stream->seek = http_seek; + } + ret = -1; // Get the bandwidth available Index: network.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- network.h 15 Aug 2003 19:13:23 -0000 1.18 +++ network.h 17 Feb 2004 12:30:45 -0000 1.19 @@ -53,7 +53,7 @@ int connect2Server(char *host, int port,int verb); -int http_send_request(URL_t *url); +int http_send_request(URL_t *url, off_t pos); HTTP_header_t *http_read_response(int fd); int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry); Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- stream.c 31 Aug 2003 18:51:05 -0000 1.70 +++ stream.c 17 Feb 2004 12:30:45 -0000 1.71 @@ -314,6 +314,14 @@ // A function call that return -1 can tell that the protocol // doesn't support seeking. #ifdef MPLAYER_NETWORK + if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one + if(!s->seek(s,newpos)) { + mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); + return 1; + } + break; + } + if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) { mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); Index: stream.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- stream.h 19 Jan 2004 19:16:10 -0000 1.66 +++ stream.h 17 Feb 2004 12:30:45 -0000 1.67 @@ -229,7 +229,7 @@ } inline static int stream_skip(stream_t *s,off_t len){ - if(len<0 || (len>2*STREAM_BUFFER_SIZE && s->type!=STREAMTYPE_STREAM)){ + if(len<0 || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK))) { // negative or big skip! return stream_seek(s,stream_tell(s)+len); }

4 3

CVS: main/libmpdemux demux_mkv.c,1.9,1.10
by syncmail＠mplayerhq.hu 20 Jul '04

20 Jul '04

CVS change done by Moritz Bunkus CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv3236 Modified Files: demux_mkv.c Log Message: Parse comma separated language lists instead of comparing the complete language string. Patch by Loren Merritt <lorenm at u dot washington dot edu> Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- demux_mkv.c 9 Feb 2004 19:21:08 -0000 1.9 +++ demux_mkv.c 18 Mar 2004 08:37:21 -0000 1.10 @@ -236,12 +236,19 @@ static mkv_track_t * demux_mkv_find_track_by_language (mkv_demuxer_t *d, char *language, int type) { - int i; + int i, len; - for (i=0; i < d->num_tracks; i++) - if (d->tracks[i] != NULL && d->tracks[i]->language != NULL && - d->tracks[i]->type == type && !strcmp(d->tracks[i]->language,language)) - return d->tracks[i]; + language += strspn(language,","); + while((len = strcspn(language,",")) > 0) + { + for (i=0; i < d->num_tracks; i++) + if (d->tracks[i] != NULL && d->tracks[i]->language != NULL && + d->tracks[i]->type == type && + !strncmp(d->tracks[i]->language, language, len)) + return d->tracks[i]; + language += len; + language += strspn(language,","); + } return NULL; }

3 2

CVS: main/libdha/sysdep AsmMacros_x86.h, 1.4, 1.5 pci_linux.c, 1.8, 1.9
by syncmail＠mplayerhq.hu 31 Mar '04

31 Mar '04

CVS change done by Atmosfear Update of /cvsroot/mplayer/main/libdha/sysdep In directory mail:/var2/tmp/cvs-serv25842 Modified Files: AsmMacros_x86.h pci_linux.c Log Message: svgalib 1.9.18 compile fix, still wont work for me though... Index: AsmMacros_x86.h =================================================================== RCS file: /cvsroot/mplayer/main/libdha/sysdep/AsmMacros_x86.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AsmMacros_x86.h 2 Oct 2003 14:48:17 -0000 1.4 +++ AsmMacros_x86.h 28 Mar 2004 16:30:08 -0000 1.5 @@ -25,6 +25,16 @@ #include <sys/ioctl.h> #include <svgalib_helper.h> +#ifndef SVGALIB_HELPER_IOC_MAGIC +/* svgalib 1.9.18+ compatibility ::atmos */ +#define SVGALIB_HELPER_IOCSOUTB SVGAHELPER_OUTB +#define SVGALIB_HELPER_IOCSOUTW SVGAHELPER_OUTW +#define SVGALIB_HELPER_IOCSOUTL SVGAHELPER_OUTL +#define SVGALIB_HELPER_IOCGINB SVGAHELPER_INB +#define SVGALIB_HELPER_IOCGINW SVGAHELPER_INW +#define SVGALIB_HELPER_IOCGINL SVGAHELPER_INL +#endif + extern int svgahelper_fd; extern int svgahelper_initialized; Index: pci_linux.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/sysdep/pci_linux.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pci_linux.c 13 Nov 2003 20:53:09 -0000 1.8 +++ pci_linux.c 28 Mar 2004 16:30:08 -0000 1.9 @@ -26,6 +26,10 @@ #include <linux/ioctl.h> #endif #include <fcntl.h> +#ifndef SVGALIB_HELPER_IOC_MAGIC +/* svgalib 1.9.18+ compatibility ::atmos */ +#define SVGALIB_HELPER_IOCGPCIINL SVGAHELPER_PCIINL +#endif int svgahelper_initialized = 0; int svgahelper_fd = 0;

4 4

CVS: main/libao2 ao_alsa9.c,1.42,1.43
by syncmail＠mplayerhq.hu 31 Mar '04

31 Mar '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libao2 In directory mail:/home/alex/main/libao2 Modified Files: ao_alsa9.c Log Message: 10l (some broken compilers take this serious) Index: ao_alsa9.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_alsa9.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- ao_alsa9.c 27 Feb 2004 17:03:08 -0000 1.42 +++ ao_alsa9.c 31 Mar 2004 07:40:36 -0000 1.43 @@ -97,7 +97,7 @@ snd_mixer_elem_t *elem; snd_mixer_selem_id_t *sid; - static const char *mix_name = NULL; + static char *mix_name = NULL; static char *card = NULL; long pmin, pmax;

1 0

CVS: main/libmpdemux demux_viv.c,1.26,1.27
by syncmail＠mplayerhq.hu 31 Mar '04

31 Mar '04

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv23769/libmpdemux Modified Files: demux_viv.c Log Message: make stupid gcc versions happy Index: demux_viv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- demux_viv.c 15 Dec 2003 22:39:32 -0000 1.26 +++ demux_viv.c 31 Mar 2004 05:40:31 -0000 1.27 @@ -714,6 +714,7 @@ sh->ds=demuxer->audio; demuxer->audio->id=1; nosound: + return; } }

1 0

CVS: 0_90/libmpdemux http.c,1.17,1.18
by syncmail＠mplayerhq.hu 30 Mar '04

30 Mar '04

CVS change done by Michael Niedermayer CVS Update of /cvsroot/mplayer/0_90/libmpdemux In directory mail:/var2/tmp/cvs-serv25627 Modified Files: http.c Log Message: remote exploitable heap overflow fix by ("blexim" <blexim at hush dot com>) Index: http.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libmpdemux/http.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- http.c 13 Nov 2002 09:02:55 -0000 1.17 +++ http.c 30 Mar 2004 11:22:48 -0000 1.18 @@ -175,7 +175,7 @@ if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET"); if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/"); else { - uri = (char*)malloc(strlen(http_hdr->uri)*2); + uri = (char*)malloc((strlen(http_hdr->uri)*3) + 1); if( uri==NULL ) { mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n"); return NULL;

1 0

CVS: main/libmpdemux http.c,1.17,1.18
by syncmail＠mplayerhq.hu 30 Mar '04

30 Mar '04

CVS change done by Michael Niedermayer CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv342 Modified Files: http.c Log Message: remote exploitable heap overflow fix by ("blexim" <blexim at hush dot com>) Index: http.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/http.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- http.c 13 Nov 2002 09:02:55 -0000 1.17 +++ http.c 30 Mar 2004 10:58:41 -0000 1.18 @@ -175,7 +175,7 @@ if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET"); if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/"); else { - uri = (char*)malloc(strlen(http_hdr->uri)*2); + uri = (char*)malloc((strlen(http_hdr->uri)*3) + 1); if( uri==NULL ) { mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n"); return NULL;

1 0

CVS: main/libmpcodecs vf_phase.c, NONE, 1.1 Makefile, 1.124, 1.125 vf.c, 1.103, 1.104
by syncmail＠mplayerhq.hu 29 Mar '04

29 Mar '04

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv28061/libmpcodecs Modified Files: Makefile vf.c Added Files: vf_phase.c Log Message: vf_phase filter by Ville Saari (114263 at foo dot bar dot org) --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <string.h> #include <limits.h> #include "../config.h" #include "../mp_msg.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "../libvo/fastmemcpy.h" enum mode { PROGRESSIVE, TOP_FIRST, BOTTOM_FIRST, TOP_FIRST_ANALYZE, BOTTOM_FIRST_ANALYZE, ANALYZE, FULL_ANALYZE, AUTO, AUTO_ANALYZE }; #define fixed_mode(p) ((p)<=BOTTOM_FIRST) struct vf_priv_s { enum mode mode; int verbose; unsigned char *buf[3]; }; /* * Copy fields from either current or buffered previous frame to the * output and store the current frame unmodified to the buffer. */ static void do_plane(unsigned char *to, unsigned char *from, int w, int h, int ts, int fs, unsigned char **bufp, enum mode mode) { unsigned char *buf, *end; int top; if(!*bufp) { mode=PROGRESSIVE; if(!(*bufp=malloc(h*w))) return; } for(end=to+h*ts, buf=*bufp, top=1; to<end; from+=fs, to+=ts, buf+=w, top^=1) { memcpy(to, mode==(top?BOTTOM_FIRST:TOP_FIRST)?buf:from, w); memcpy(buf, from, w); } } /* * This macro interpolates the value of both fields at a point halfway * between lines and takes the squared difference. In field resolution * the point is a quarter pixel below a line in one field and a quarter * pixel above a line in other. * * (the result is actually multiplied by 25) */ #define diff(a, as, b, bs) (t=(*a-b[bs]<<2)+a[as<<1]-b[-bs], t*t) /* * Find which field combination has the smallest average squared difference * between the fields. */ static enum mode analyze_plane(unsigned char *old, unsigned char *new, int w, int h, int os, int ns, enum mode mode, int verbose, int fields) { double bdiff, pdiff, tdiff, scale; int bdif, tdif, pdif; int top, t; unsigned char *end, *rend; if(mode==AUTO) mode=fields&MP_IMGFIELD_ORDERED?fields&MP_IMGFIELD_TOP_FIRST? TOP_FIRST:BOTTOM_FIRST:PROGRESSIVE; else if(mode==AUTO_ANALYZE) mode=fields&MP_IMGFIELD_ORDERED?fields&MP_IMGFIELD_TOP_FIRST? TOP_FIRST_ANALYZE:BOTTOM_FIRST_ANALYZE:FULL_ANALYZE; if(fixed_mode(mode)) bdiff=pdiff=tdiff=65536.0; else { bdiff=pdiff=tdiff=0.0; for(end=new+(h-2)*ns, new+=ns, old+=os, top=0; new<end; new+=ns-w, old+=os-w, top^=1) { pdif=tdif=bdif=0; switch(mode) { case TOP_FIRST_ANALYZE: if(top) for(rend=new+w; new<rend; new++, old++) pdif+=diff(new, ns, new, ns), tdif+=diff(new, ns, old, os); else for(rend=new+w; new<rend; new++, old++) pdif+=diff(new, ns, new, ns), tdif+=diff(old, os, new, ns); break; case BOTTOM_FIRST_ANALYZE: if(top) for(rend=new+w; new<rend; new++, old++) pdif+=diff(new, ns, new, ns), bdif+=diff(old, os, new, ns); else for(rend=new+w; new<rend; new++, old++) pdif+=diff(new, ns, new, ns), bdif+=diff(new, ns, old, os); break; case ANALYZE: if(top) for(rend=new+w; new<rend; new++, old++) tdif+=diff(new, ns, old, os), bdif+=diff(old, os, new, ns); else for(rend=new+w; new<rend; new++, old++) bdif+=diff(new, ns, old, os), tdif+=diff(old, os, new, ns); break; default: /* FULL_ANALYZE */ if(top) for(rend=new+w; new<rend; new++, old++) pdif+=diff(new, ns, new, ns), tdif+=diff(new, ns, old, os), bdif+=diff(old, os, new, ns); else for(rend=new+w; new<rend; new++, old++) pdif+=diff(new, ns, new, ns), bdif+=diff(new, ns, old, os), tdif+=diff(old, os, new, ns); } pdiff+=(double)pdif; tdiff+=(double)tdif; bdiff+=(double)bdif; } scale=1.0/(w*(h-3))/25.0; pdiff*=scale; tdiff*=scale; bdiff*=scale; if(mode==TOP_FIRST_ANALYZE) bdiff=65536.0; else if(mode==BOTTOM_FIRST_ANALYZE) tdiff=65536.0; else if(mode==ANALYZE) pdiff=65536.0; if(bdiff<pdiff && bdiff<tdiff) mode=BOTTOM_FIRST; else if(tdiff<pdiff && tdiff<bdiff) mode=TOP_FIRST; else mode=PROGRESSIVE; } if(verbose) { printf("%c", mode==BOTTOM_FIRST?'b':mode==TOP_FIRST?'t':'p'); if(tdiff==65536.0) printf(" N/A "); else printf(" %8.2f", tdiff); if(bdiff==65536.0) printf(" N/A "); else printf(" %8.2f", bdiff); if(pdiff==65536.0) printf(" N/A "); else printf(" %8.2f", pdiff); printf(" \n"); } return mode; } static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) { mp_image_t *dmpi; int w; enum mode mode; if(!(dmpi=vf_get_image(vf->next, mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h))) return 0; w=dmpi->w; if(!(dmpi->flags&MP_IMGFLAG_PLANAR)) w*=dmpi->bpp/8; mode=vf->priv->mode; if(!vf->priv->buf[0]) mode=PROGRESSIVE; else mode=analyze_plane(vf->priv->buf[0], mpi->planes[0], w, dmpi->h, w, mpi->stride[0], mode, vf->priv->verbose, mpi->fields); do_plane(dmpi->planes[0], mpi->planes[0], w, dmpi->h, dmpi->stride[0], mpi->stride[0], &vf->priv->buf[0], mode); if(dmpi->flags&MP_IMGFLAG_PLANAR) { do_plane(dmpi->planes[1], mpi->planes[1], dmpi->chroma_width, dmpi->chroma_height, dmpi->stride[1], mpi->stride[1], &vf->priv->buf[1], mode); do_plane(dmpi->planes[2], mpi->planes[2], dmpi->chroma_width, dmpi->chroma_height, dmpi->stride[2], mpi->stride[2], &vf->priv->buf[2], mode); } return vf_next_put_image(vf, dmpi); } static void uninit(struct vf_instance_s* vf) { free(vf->priv->buf[0]); free(vf->priv->buf[1]); free(vf->priv->buf[2]); free(vf->priv); } static int open(vf_instance_t *vf, char* args) { vf->put_image = put_image; vf->uninit = uninit; vf->default_reqs = VFCAP_ACCEPT_STRIDE; if(!(vf->priv = calloc(1, sizeof(struct vf_priv_s)))) { uninit(vf); return 0; } vf->priv->mode=AUTO_ANALYZE; vf->priv->verbose=0; while(args && *args) { switch(*args) { case 't': vf->priv->mode=TOP_FIRST; break; case 'a': vf->priv->mode=AUTO; break; case 'b': vf->priv->mode=BOTTOM_FIRST; break; case 'u': vf->priv->mode=ANALYZE; break; case 'T': vf->priv->mode=TOP_FIRST_ANALYZE; break; case 'A': vf->priv->mode=AUTO_ANALYZE; break; case 'B': vf->priv->mode=BOTTOM_FIRST_ANALYZE; break; case 'U': vf->priv->mode=FULL_ANALYZE; break; case 'p': vf->priv->mode=PROGRESSIVE; break; case 'v': vf->priv->verbose=1; break; case ':': break; default: uninit(vf); return 0; /* bad args */ } if(args=strchr(args, ':')) args++; } return 1; } vf_info_t vf_info_phase = { "phase shift fields", "phase", "Ville Saari", "", open, NULL }; Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- Makefile 17 Feb 2004 12:43:07 -0000 1.124 +++ Makefile 29 Mar 2004 04:39:04 -0000 1.125 @@ -14,7 +14,7 @@ VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_zrmjpeg.c vd_xanim.c vd_xvid.c vd_xvid4.c vd_libdv.c vd_qtvideo.c vd_theora.c VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT) -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_noformat.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c vf_spp.c vf_yuvcsp.c vf_filmdint.c vf_kerndeint.c vf_rgbtest.c vf_qp.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_noformat.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c vf_spp.c vf_yuvcsp.c vf_filmdint.c vf_kerndeint.c vf_rgbtest.c vf_qp.c vf_phase.c ifeq ($(HAVE_FFPOSTPROCESS),yes) VFILTER_SRCS += vf_pp.c endif Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- vf.c 26 Feb 2004 14:41:42 -0000 1.103 +++ vf.c 29 Mar 2004 04:39:04 -0000 1.104 @@ -87,6 +87,7 @@ extern vf_info_t vf_info_kerndeint; extern vf_info_t vf_info_rgbtest; extern vf_info_t vf_info_qp; +extern vf_info_t vf_info_phase; // list of available filters: static vf_info_t* filter_list[]={ @@ -167,6 +168,7 @@ #ifdef USE_LIBAVCODEC &vf_info_qp, #endif + &vf_info_phase, NULL };

1 0

CVS: main/libmpcodecs ad_pcm.c,1.8,1.9
by syncmail＠mplayerhq.hu 28 Mar '04

28 Mar '04

CVS change done by Roberto Togni CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv7232 Modified Files: ad_pcm.c Log Message: Revert my old twos fix, it seems to break more files than it fixed. If your file sound wrong, please uncomment and test Index: ad_pcm.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_pcm.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ad_pcm.c 2 Dec 2003 22:44:17 -0000 1.8 +++ ad_pcm.c 28 Mar 2004 22:03:37 -0000 1.9 @@ -32,8 +32,13 @@ case 0x736F7774: // 'twos' case 0x74776F73: // 'swot' if(sh_audio->samplesize==1) sh_audio->sample_format=AFMT_S8; +// Uncomment this if twos audio is broken for you +// (typically with movies made on sgi machines) +// This is just a workaround, the real bug is elsewhere +#if 0 sh_audio->ds->ss_div= sh_audio->samplesize; sh_audio->ds->ss_mul= sh_audio->samplesize * sh_audio->channels; +#endif break; default: if(sh_audio->samplesize!=2) sh_audio->sample_format=AFMT_U8; }

1 0

CVS: main/libmpdemux asf_mmst_streaming.c, 1.17, 1.18
by syncmail＠mplayerhq.hu 28 Mar '04

28 Mar '04

CVS change done by Roberto Togni CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv21279 Modified Files: asf_mmst_streaming.c Log Message: Fix hanging at end of mms:// streams. Patch by adland Index: asf_mmst_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- asf_mmst_streaming.c 8 Nov 2003 00:26:48 -0000 1.17 +++ asf_mmst_streaming.c 28 Mar 2004 14:44:49 -0000 1.18 @@ -425,7 +425,8 @@ if( ret<0 ) { printf("get_media_packet error : %s\n",strerror(errno)); return -1; - } + } else if (ret==0) //EOF? + return ret; } len = stream_ctrl->buffer_size-stream_ctrl->buffer_pos;

1 0