[Mplayer-cvslog] CVS: main/libmpdemux asf_mmst_streaming.c,1.3,1.4 asf_streaming.c,1.32,1.33 audio_in.c,1.3,1.4 cache2.c,1.16,1.17 demux_asf.c,1.22,1.23 demux_avi.c,1.44,1.45 demux_mov.c,1.72,1.73 demux_nuv.c,1.9,1.10 demux_pva.c,1.1,1.2 demux_real.c,1.25,1.26 demux_viv.c,1.22,1.23 open.c,1.58,1.59 rtp.c,1.4,1.5 tv.c,1.33,1.34 tvi_v4l.c,1.29,1.30

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv24466/libmpdemux

Modified Files:
	asf_mmst_streaming.c asf_streaming.c audio_in.c cache2.c 
	demux_asf.c demux_avi.c demux_mov.c demux_nuv.c demux_pva.c 
	demux_real.c demux_viv.c open.c rtp.c tv.c tvi_v4l.c 
Log Message:
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug


Index: asf_mmst_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- asf_mmst_streaming.c	7 Sep 2002 20:37:09 -0000	1.3
+++ asf_mmst_streaming.c	22 Sep 2002 02:33:25 -0000	1.4
@@ -290,7 +290,7 @@
 int interp_header (uint8_t *header, int header_len) 
 {
   int i;
-  int packet_length;
+  int packet_length=-1;
 
   /*
    * parse header
@@ -459,7 +459,7 @@
 		to_skip = a;
 			
 }
-
+return 0; // is this ok?
 }
 
 int

Index: asf_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- asf_streaming.c	7 Sep 2002 20:38:44 -0000	1.32
+++ asf_streaming.c	22 Sep 2002 02:33:25 -0000	1.33
@@ -312,7 +312,7 @@
 asf_http_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *streaming_ctrl ) {
   static ASF_stream_chunck_t chunk;
   int read,chunk_size = 0;
-  static int rest = 0, drop_chunk = 0, waiting = 0,eof= 0;
+  static int rest = 0, drop_chunk = 0, waiting = 0;
   asf_http_streaming_ctrl_t *asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data;
 
   while(1) {
@@ -612,7 +612,6 @@
 int
 asf_http_streaming_start( stream_t *stream ) {
 	HTTP_header_t *http_hdr=NULL;
-	URL_t *url_next=NULL;
 	URL_t *url = stream->streaming_ctrl->url;
 	asf_http_streaming_ctrl_t *asf_http_ctrl;
 	ASF_StreamType_e streaming_type;

Index: audio_in.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/audio_in.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- audio_in.c	31 Aug 2002 22:41:29 -0000	1.3
+++ audio_in.c	22 Sep 2002 02:33:25 -0000	1.4
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "config.h"
 
@@ -41,7 +42,6 @@
 
 int audio_in_setup(audio_in_t *ai)
 {
-    int err;
     
     switch (ai->type) {
 #ifdef HAVE_ALSA9	  
@@ -141,10 +141,9 @@
 	    close(ai->oss.audio_fd);
 	    ai->setup = 0;
 	    return 0;
-	default:
-	    return -1;
 	}
     }
+    return -1;
 }
 
 int audio_in_start_capture(audio_in_t *ai)

Index: cache2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cache2.c	31 Aug 2002 15:59:10 -0000	1.16
+++ cache2.c	22 Sep 2002 02:33:25 -0000	1.17
@@ -50,13 +50,12 @@
 } cache_vars_t;
 
 static int min_fill=0;
-static int sleep_flag=0;
 
 int cache_fill_status=0;
 
 void cache_stats(cache_vars_t* s){
   int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
-  printf("0x%06X  [0x%06X]  0x%06X   ",s->min_filepos,s->read_filepos,s->max_filepos);
+  printf("0x%06X  [0x%06X]  0x%06X   ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos);
   printf("%3d %%  (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
 }
 
@@ -107,7 +106,7 @@
 }
 
 int cache_fill(cache_vars_t* s){
-  int back,back2,newb,space,len,pos,endpos;
+  int back,back2,newb,space,len,pos;
   off_t read=s->read_filepos;
   
   if(read<s->min_filepos || read>s->max_filepos){

Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demux_asf.c	7 Jul 2002 20:06:55 -0000	1.22
+++ demux_asf.c	22 Sep 2002 02:33:26 -0000	1.23
@@ -181,6 +181,8 @@
 	    case 3: plen=LOAD_LE32(p);p+=4;break;	// dword
 	    case 2: plen=LOAD_LE16(p);p+=2;break;	// word
 	    case 1: plen=p[0];p++;break;		// byte
+	    default: plen=0;
+		mp_msg(MSGT_DEMUX,MSGL_V,"Invalid plen type! assuming plen=0\n");
 	    }
 
             // Read sequence:
@@ -284,6 +286,7 @@
 		    p+=rlen-4;
 		} else {
             	    mp_msg(MSGT_DEMUX,MSGL_V,"unknown segment type (rlen): 0x%02X  \n",rlen);
+		    time2=0; // unknown
 		    p+=rlen;
 		}
               }

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- demux_avi.c	14 Aug 2002 21:25:01 -0000	1.44
+++ demux_avi.c	22 Sep 2002 02:33:26 -0000	1.45
@@ -633,8 +633,6 @@
 
       if(sh_audio){
         int i;
-//        int apos=0;
-        int last=0;
         int len=0;
 	int skip_audio_bytes=0;
 	int curr_audio_pos=-1;

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- demux_mov.c	18 Sep 2002 19:09:11 -0000	1.72
+++ demux_mov.c	22 Sep 2002 02:33:26 -0000	1.73
@@ -524,7 +524,6 @@
 		int temp=stream_read_dword(demuxer->stream);
 		int len=stream_read_dword(demuxer->stream);
 		int i;
-		int x=0;
 		unsigned int pts=0;
 		mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*sSample duration table! (%d blocks)\n",level,"",len);
 		trak->durmap=malloc(sizeof(mov_durmap_t)*len);
@@ -1416,7 +1415,6 @@
     int frame=trak->pos;
     // editlist support:
     if(trak->type == MOV_TRAK_VIDEO && trak->editlist_size>=1){
-	int t;
 	// find the right editlist entry:
 	if(frame<trak->editlist[trak->editlist_pos].start_frame)
 	    trak->editlist_pos=0;

Index: demux_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_nuv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- demux_nuv.c	10 Sep 2002 20:42:45 -0000	1.9
+++ demux_nuv.c	22 Sep 2002 02:33:26 -0000	1.10
@@ -197,9 +197,6 @@
 	sh_video_t *sh_video = NULL;
 	sh_audio_t *sh_audio = NULL;
 	struct rtfileheader rtjpeg_fileheader;
-	struct rtframeheader rtjpeg_frameheader;
-	unsigned long int tbls[128];
-	int bytes_read;
 	nuv_priv_t* priv = (nuv_priv_t*) malloc ( sizeof ( nuv_priv_t) );
 	demuxer->priv = priv;
 	priv->current_audio_frame = 0;

Index: demux_pva.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_pva.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demux_pva.c	10 Sep 2002 21:50:03 -0000	1.1
+++ demux_pva.c	22 Sep 2002 02:33:26 -0000	1.2
@@ -18,7 +18,9 @@
  */
 
 
-
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "config.h"
 #include "mp_msg.h"
@@ -124,9 +126,6 @@
 	sh_video_t *sh_video = new_sh_video(demuxer,0);
 	sh_audio_t * sh_audio = new_sh_audio(demuxer,0);
 	pva_priv_t * priv;
-	unsigned char * buffer;
-
-		
 	
 	stream_reset(demuxer->stream);
 	stream_seek(demuxer->stream,0);
@@ -172,6 +171,8 @@
 	return demuxer;
 }
 
+int pva_get_payload(demuxer_t * d,pva_payload_t * payload);
+
 // 0 = EOF or no stream found
 // 1 = successfully read a packet
 int demux_pva_fill_buffer (demuxer_t * demux)
@@ -340,7 +341,7 @@
 				if((buffer[0] & 0xf0)!=0x20)
 				{
 					mp_msg(MSGT_DEMUX,MSGL_ERR,"demux_pva: expected audio PTS but badly formatted... (read 0x%02X)\n",buffer[0]);
-					return;
+					return 0;
 				}
 				payload->pts=0LL;
 				payload->pts|=((uint64_t)(buffer[0] & 0x0e) << 29);
@@ -358,6 +359,7 @@
 				break;
 		}
 	}
+	return 1;
 }
 
 int demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags)

Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- demux_real.c	27 Aug 2002 23:01:54 -0000	1.25
+++ demux_real.c	22 Sep 2002 02:33:26 -0000	1.26
@@ -8,6 +8,9 @@
     TODO: fix the whole syncing mechanism
     
     $Log$
+    Revision 1.26  2002/09/22 02:33:26  arpi
+    tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
+
     Revision 1.25  2002/08/27 23:01:54  arpi
     - added matrix cracking/debugging code - disabled
     - use real codec headers for sipr
@@ -578,10 +581,9 @@
 		// we need a more complicated demuxing
 		// a block may contain multiple packets
 		// as well as a packet may be contained in multiple blocks
-	        int vpkg_header, vpkg_blknum, vpkg_length, vpkg_offset;
-		int vpkg_seqnum=-1, vpkg_oldseqnum=0, vpkg_seqnumread=0;
+	        int vpkg_header, vpkg_length, vpkg_offset;
+		int vpkg_seqnum=-1;
 		int vpkg_subseq=0;
-		int vpkg_ofs;
 
 	    while(len>2){
 		dp_hdr_t* dp_hdr;
@@ -1169,7 +1171,7 @@
 		}
 //		break;
 //	    default:
-skip_this_chunk:
+//skip_this_chunk:
 		/* skip codec info */
 		tmp = stream_tell(demuxer->stream) - codec_pos;
 		mp_msg(MSGT_DEMUX,MSGL_V,"### skipping %d bytes of codec info\n", codec_data_size - tmp);
@@ -1235,7 +1237,6 @@
     demux_stream_t *d_video = demuxer->video;
     sh_audio_t *sh_audio = d_audio->sh;
     sh_video_t *sh_video = d_video->sh;
-    int video_chunk_pos = d_video->pos;
     int vid = d_video->id, aid = d_audio->id;
     int next_offset = 0;
     int rel_seek_frames = 0;

Index: demux_viv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demux_viv.c	20 May 2002 03:51:57 -0000	1.22
+++ demux_viv.c	22 Sep 2002 02:33:26 -0000	1.23
@@ -222,10 +222,8 @@
 }
 
 int vivo_check_file(demuxer_t* demuxer){
-    int flags=0;
     int i=0;
     int len;
-    int len2;
     int c;
     unsigned char buf[2048+256];
     vivo_priv_t* priv;
@@ -310,8 +308,8 @@
 #warning "Calculate PTS from picture header!"
       prefix = 1;
       c = stream_read_char(demux->stream);
-      printf("packet 0x82(pos=%lu) chunk=%x\n",
-        stream_tell(demux->stream), c);
+      printf("packet 0x82(pos=%u) chunk=%x\n",
+        (int)stream_tell(demux->stream), c);
   }
   switch(c&0xF0){
   case 0x00: // header - skip it!
@@ -618,7 +616,7 @@
 		/* disable seeking */
 		demuxer->seekable = 0;
 
-		printf("VIVO Video stream %d size: display: %dx%d, codec: %lux%lu\n",
+		printf("VIVO Video stream %d size: display: %dx%d, codec: %ux%u\n",
 		    demuxer->video->id, sh->disp_w, sh->disp_h, sh->bih->biWidth,
 		    sh->bih->biHeight);
 }

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- open.c	17 Sep 2002 19:52:27 -0000	1.58
+++ open.c	22 Sep 2002 02:33:26 -0000	1.59
@@ -455,7 +455,8 @@
 }
 
 int dvd_parse_chapter_range(struct config *conf, const char *range){
-  char *s, *t;
+  const char *s;
+  char *t;
   conf; /* prevent warning from GCC */
   s = range;
   dvd_chapter = 1;

Index: rtp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/rtp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rtp.c	25 Dec 2001 16:36:48 -0000	1.4
+++ rtp.c	22 Sep 2002 02:33:26 -0000	1.5
@@ -116,7 +116,6 @@
   static char buf[1600];
   int headerSize;
   int lengthPacket;
-  int i;
 
   lengthPacket=recv(fd,buf,1590,0);
   // FIXME: error handling to write here

Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- tv.c	15 Sep 2002 20:51:55 -0000	1.33
+++ tv.c	22 Sep 2002 02:33:26 -0000	1.34
@@ -77,12 +77,7 @@
 {
     tvi_handle_t *tvh=(tvi_handle_t*)(demux->priv);
     demux_packet_t* dp;
-
-    sh_video_t *sh_video = demux->video->sh;
-    u_int len;
-    int aframeswaiting;
-
-    len = 0;
+    u_int len=0;
 
     /* ================== ADD AUDIO PACKET =================== */
 
@@ -534,6 +529,7 @@
 	mp_msg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n",
 	    freq, (float)freq/16);
     }
+    return(1);
 }
 
 int tv_step_channel(tvi_handle_t *tvh, int direction)
@@ -561,13 +557,16 @@
 	    tv_set_freq(tvh, (unsigned long)(((float)cl.freq/1000)*16));
 	}	
     }
+    return(1);
 }
 
 int tv_step_norm(tvi_handle_t *tvh)
 {
+    return(1);
 }
 
 int tv_step_chanlist(tvi_handle_t *tvh)
 {
+    return(1);
 }
 #endif /* USE_TV */

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tvi_v4l.c	8 Sep 2002 16:04:21 -0000	1.29
+++ tvi_v4l.c	22 Sep 2002 02:33:26 -0000	1.30
@@ -235,8 +235,6 @@
 	   priv->audio_buffer_size, priv->audio_in.blocksize, priv->aud_skew_cnt);
 }
 
-static int one = 1, zero = 0;
-
 tvi_handle_t *tvi_init_v4l(char *device, char *adevice)
 {
     tvi_handle_t *h;
@@ -499,7 +497,6 @@
 
     /* audio init */
     if (!tv_param_noaudio) {
-	int err;
 	
 #ifdef HAVE_ALSA9
 	if (tv_param_alsa)
@@ -1144,7 +1141,7 @@
 {
     priv_t *priv = (priv_t*)data;
     struct timeval curtime;
-    double timestamp, skew, prev_skew, xskew, interval, prev_interval;
+    double skew, prev_skew, xskew, interval, prev_interval;
     int frame, nextframe;
     int fsize = priv->bytesperline * priv->height;
     int i;
@@ -1256,6 +1253,7 @@
 	}
 
     }
+    return NULL;
 }
 
 static double grab_video_frame(priv_t *priv, char *buffer, int len)
@@ -1287,9 +1285,8 @@
 {
     priv_t *priv = (priv_t*)data;
     struct timeval tv;
-    int ret;
     int i, audio_skew_ptr = 0;
-    double tmp, current_time, current_skew, prev_skew = 0.0;
+    double tmp, current_time, prev_skew = 0.0;
 
     pthread_mutex_lock(&priv->audio_starter);
 
@@ -1355,13 +1352,11 @@
 	    priv->audio_cnt++;
 	}
     }
+    return NULL;
 }
 
 static double grab_audio_frame(priv_t *priv, char *buffer, int len)
 {
-    int in_len = 0;
-    int max_tries = 2;
-
     mp_dbg(MSGT_TV, MSGL_DBG2, "grab_audio_frame(priv=%p, buffer=%p, len=%d)\n",
 	priv, buffer, len);