new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:

- multithreaded audio/video buffering (I know mplayer crew hates threads
  but it seems to me as the only way of doing reliable a/v capture)
- a/v timebase synchronization (sample count vs. gettimeofday)
- "immediate" mode support for mplayer
- fixed colorspace stuff - RGB?? and YUY2 modes now work as expected
- native ALSA audio capture
- separated audio input layer


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7059 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 11 insertions, 4 deletions

diff --git a/mplayer.c b/mplayer.c
index 70812eb91c..f634fa50c0 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -268,6 +268,8 @@ extern char *ao_subdevice;
 
 static stream_t* stream=NULL;
 
+static demuxer_t *demuxer=NULL;
+
 char* current_module=NULL; // for debugging
 
 int vo_gamma_brightness = 1000;
@@ -291,6 +293,7 @@ static unsigned int inited_flags=0;
 #define INITED_STREAM 64
 #define INITED_INPUT    128
 #define INITED_VOBSUB  256
+#define INITED_DEMUXER  512
 #define INITED_ALL 0xFFFF
 
 void uninit_player(unsigned int mask){
@@ -306,6 +309,12 @@ void uninit_player(unsigned int mask){
     stream=NULL;
   }
 
+  if(mask&INITED_DEMUXER){
+    current_module="uninit_demuxer";
+    if(demuxer) free_demuxer(demuxer);
+    demuxer=NULL;
+  }
+
   if(mask&INITED_VO){
     inited_flags&=~INITED_VO;
     current_module="uninit_vo";
@@ -489,8 +498,6 @@ static subtitle* subtitles=NULL;
 float sub_last_pts = -303;
 #endif
 
-static demuxer_t *demuxer=NULL;
-
 static demux_stream_t *d_audio=NULL;
 static demux_stream_t *d_video=NULL;
 static demux_stream_t *d_dvdsub=NULL;
@@ -565,9 +572,7 @@ int gui_no_filename=0;
 
 #endif
 
-#ifdef HAVE_TV_BSDBT848
   tv_param_immediate = 1;
-#endif
 
   if ( argv[0] )
     if(!strcmp(argv[0],"gmplayer") ||
@@ -1077,6 +1082,8 @@ current_module="demux_open";
 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
 if(!demuxer) goto goto_next_file; // exit_player(MSGTR_Exit_error); // ERROR
 
+inited_flags|=INITED_DEMUXER;
+
 current_module="demux_open2";
 
 //file_format=demuxer->file_format;