[Mplayer-cvslog] CVS: main/libmpdemux bswap.h,NONE,1.1 codec-cfg.h,NONE,1.1 config.h,NONE,1.1 help_mp.h,NONE,1.1 mp_msg.h,NONE,1.1 test.c,NONE,1.1 stheader.h,1.16,1.17 stream.c,1.19,1.20

[Arpi of Ize]

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

Modified Files:
	stheader.h stream.c 
Added Files:
	bswap.h codec-cfg.h config.h help_mp.h mp_msg.h test.c 
Log Message:
libdemuxer...

--- NEW FILE ---
/* Let it be for now*/
#include "../bswap.h"

--- NEW FILE ---

--- NEW FILE ---
/* Let it be for now*/
#include "../config.h"

--- NEW FILE ---
#include "../help_mp.h"

--- NEW FILE ---
/* Let it be for now*/
#include "../mp_msg.h"

--- NEW FILE ---

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "mp_msg.h"

#include "stream.h"
#include "demuxer.h"

#include "wine/mmreg.h"
#include "wine/avifmt.h"
#include "wine/vfw.h"
#include "codec-cfg.h"
#include "stheader.h"

//--------------------------

// audio stream skip/resync functions requires only for seeking.
// (they should be implemented in the audio codec layer)
void skip_audio_frame(sh_audio_t *sh_audio){
}
void resync_audio_stream(sh_audio_t *sh_audio){
}

// some globals:
int verbose=1;

// AVI demuxer parameters:
int index_mode=-1;  // -1=untouched  0=don't use index  1=use (geneate) index
int force_ni=0;     // force non-interleaved AVI parsing
int pts_from_bps=1; // PTS:  0=interleaved  1=BPS-based

//---------------

extern stream_t* open_stream(char* filename,int vcd_track,int* file_format);

int main(int argc,char* argv[]){

stream_t* stream=NULL;
demuxer_t* demuxer=NULL;
int file_format=DEMUXER_TYPE_UNKNOWN;

  mp_msg_init(verbose+MSGL_STATUS);

  if(argc>1)
    stream=open_stream(argv[1],0,&file_format);
  else
//  stream=open_stream("/3d/divx/405divx_sm_v2[1].avi",0,&file_format);
    stream=open_stream("/dev/cdrom",2,&file_format); // VCD track 2

  if(!stream){
	printf("Cannot open file/device\n");
	exit(1);
  }
  
  printf("success: format: %d  data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));

  demuxer=demux_open(stream,file_format,-1,-1,-1);
  if(!demuxer){
	printf("Cannot open demuxer\n");
	exit(1);
  }
  

}

Index: stheader.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stheader.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- stheader.h	1 Oct 2001 15:58:17 -0000	1.16
+++ stheader.h	20 Oct 2001 18:47:55 -0000	1.17
@@ -28,7 +28,7 @@
 typedef struct {
   demux_stream_t *ds;
   unsigned int format;
-  codecs_t *codec;
+  struct codecs_st *codec;
   int inited;
   // output format:
   float timer;		   // value of old a_frame
@@ -66,7 +66,7 @@
 typedef struct {
   demux_stream_t *ds;
   unsigned int format;
-  codecs_t *codec;
+  struct codecs_st *codec;
   int inited;
   // output format:
   float timer;		   // value of old v_frame

Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- stream.c	10 Oct 2001 00:47:17 -0000	1.19
+++ stream.c	20 Oct 2001 18:47:55 -0000	1.20
@@ -17,9 +17,9 @@
 extern int verbose; // defined in mplayer.c
 
 #ifdef __FreeBSD__
-#include "vcd_read_fbsd.c" 
+#include "vcd_read_fbsd.h" 
 #else
-#include "vcd_read.c"
+#include "vcd_read.h"
 #endif
 
 #ifdef USE_DVDREAD