MOV file support - not works yet

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

4 files changed, 215 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 618acf326d..345fc6c7f2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PRG_CFG = codec-cfg
 #prefix = /usr/local
 BINDIR = ${prefix}/bin
 # BINDIR = /usr/local/bin
-SRCS = open.c seek.c parse_es.c find_sub.c aviprint.c dec_audio.c dec_video.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
+SRCS = open.c seek.c parse_es.c find_sub.c aviprint.c dec_audio.c dec_video.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demux_mov.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
 OBJS = $(SRCS:.c=.o)
 CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) # -Wall
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)
diff --git a/demux_mov.c b/demux_mov.c
new file mode 100644
index 0000000000..227838e0d0
--- /dev/null
+++ b/demux_mov.c
@@ -0,0 +1,207 @@
+//  QuickTime MOV file parser
+//  based on TOOLS/movinfo.c by A'rpi & Al3x
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+extern int verbose; // defined in mplayer.c
+
+#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"
+
+typedef struct {
+    int id;
+    int type;
+    int timescale;
+    int width,height; // for video
+    unsigned int fourcc;
+    int data_len;
+    unsigned char* data;
+} mov_track_t;
+
+#define MOV_MAX_TRACKS 256
+
+#define MOV_TRAK_UNKNOWN 0
+#define MOV_TRAK_VIDEO 1
+#define MOV_TRAK_AUDIO 2
+
+typedef struct {
+    off_t moov_start;
+    off_t moov_end;
+    off_t mdat_start;
+    off_t mdat_end;
+    int track_db;
+    mov_track_t* tracks[MOV_MAX_TRACKS];
+} mov_priv_t;
+
+#define MOV_FOURCC(a,b,c,d) ((a<<24)|(b<<16)|(c<<8)|(d))
+
+int mov_check_file(demuxer_t* demuxer){
+    int flags=0;
+    mov_priv_t* priv=malloc(sizeof(mov_priv_t));
+    
+    printf("Checking for MOV\n");
+    
+    memset(priv,0,sizeof(mov_priv_t));
+    demuxer->priv=priv;
+    
+    while(1){
+	off_t len=stream_read_dword(demuxer->stream);
+	unsigned int id=stream_read_dword(demuxer->stream);
+	if(stream_eof(demuxer->stream)) break; // EOF
+	if(len<8) break; // invalid chunk
+	switch(id){
+	case MOV_FOURCC('m','o','o','v'):
+	  if(verbose)printf("MOV: Movie header found!\n");
+	  priv->moov_start=stream_tell(demuxer->stream);
+	  priv->moov_end=priv->moov_start+len-8;
+	  flags|=1;
+	  break;
+	case MOV_FOURCC('m','d','a','t'):
+	  if(verbose)printf("MOV: Movie DATA found!\n");
+	  priv->mdat_start=stream_tell(demuxer->stream);
+	  priv->mdat_end=priv->mdat_start+len-8;
+	  flags|=2;
+	  break;
+	default:
+	  if(verbose) printf("MOV: unknown chunk: %.4s %d\n",&id,(int)len);
+	}
+	if(!stream_skip(demuxer->stream,len-8)) break;
+    }
+
+return (flags==3);
+}
+
+static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){
+    mov_priv_t* priv=demuxer->priv;
+    while(1){
+	off_t pos;
+	off_t len;
+	unsigned int id;
+	//
+	pos=stream_tell(demuxer->stream);
+	if(pos>=endpos) return; // END
+	len=stream_read_dword(demuxer->stream);
+	if(len<8) return; // error
+	len-=8;
+	id=stream_read_dword(demuxer->stream);
+	//
+	if(verbose>1)printf("lschunks %.4s  %d\n",&id,(int)len);
+	//
+	if(trak){
+	  switch(id){
+	    case MOV_FOURCC('t','k','h','d'): {
+		if(verbose)printf("MOV: %*sTrack header!\n",level,"");
+		// read width x height
+		break;
+	    }
+	    case MOV_FOURCC('m','d','h','d'): {
+		if(verbose)printf("MOV: %*sMedia header!\n",level,"");
+		// read timescale
+		break;
+	    }
+	    case MOV_FOURCC('v','m','h','d'): {
+		if(verbose)printf("MOV: %*sVideo header!\n",level,"");
+		trak->type=MOV_TRAK_VIDEO;
+		// read video data
+		break;
+	    }
+	    case MOV_FOURCC('s','m','h','d'): {
+		if(verbose)printf("MOV: %*sSound header!\n",level,"");
+		trak->type=MOV_TRAK_AUDIO;
+		// read audio data
+		break;
+	    }
+	    case MOV_FOURCC('s','t','s','d'): {
+		int i=stream_read_dword(demuxer->stream); // temp!
+		int count=stream_read_dword(demuxer->stream);
+		if(verbose)printf("MOV: %*sDescription list! (cnt:%d)\n",level,"",count);
+		for(i=0;i<count;i++){
+		    off_t pos=stream_tell(demuxer->stream);
+		    off_t len=stream_read_dword(demuxer->stream);
+		    unsigned int fourcc=stream_read_dword_le(demuxer->stream);
+		    if(len<8) break; // error
+		    if(verbose)printf("MOV: %*s desc #%d: %.4s",level,"",i,&fourcc);
+		    if(!i){
+			trak->fourcc=fourcc;
+			// read codec data
+			trak->data_len=len-8;
+			trak->data=malloc(trak->data_len);
+			stream_read(demuxer->stream,trak->data,trak->data_len);
+			if(trak->type==MOV_TRAK_VIDEO && trak->data_len>43){
+			    printf(" '%.*s'",trak->data_len-43,trak->data+43);
+			}
+		    }
+		    if(verbose) printf("\n");
+		    if(fourcc!=trak->fourcc && i)
+			printf("MOV: Warning! variable FOURCC detected!?\n");
+		    if(!stream_seek(demuxer->stream,pos+len)) break;
+		}
+		break;
+	    }
+	    case MOV_FOURCC('m','d','i','a'): {
+		if(verbose)printf("MOV: %*sMedia stream!\n",level,"");
+		lschunks(demuxer,level+1,pos+len,trak);
+		break;
+	    }
+	    case MOV_FOURCC('m','i','n','f'): {
+		if(verbose)printf("MOV: %*sMedia info!\n",level,"");
+		lschunks(demuxer,level+1,pos+len,trak);
+		break;
+	    }
+	    case MOV_FOURCC('s','t','b','l'): {
+		if(verbose)printf("MOV: %*sSample info!\n",level,"");
+		lschunks(demuxer,level+1,pos+len,trak);
+		break;
+	    }
+	  }//switch(id)
+	} else
+	if(id==MOV_FOURCC('t','r','a','k')){
+//	    if(trak) printf("MOV: Warning! trak in trak?\n");
+	    if(priv->track_db>=MOV_MAX_TRACKS){
+		printf("MOV: Warning! too many tracks!");
+		return;
+	    }
+	    trak=malloc(sizeof(mov_track_t));
+	    memset(trak,0,sizeof(mov_track_t));
+	    if(verbose)printf("MOV: Track #%d:\n",priv->track_db);
+	    trak->id=priv->track_db;
+	    priv->tracks[priv->track_db++]=trak;
+	    lschunks(demuxer,level+1,pos+len,trak);
+	    trak=NULL;
+	} else
+	if(id==MOV_FOURCC('c','m','o','v')){
+	    printf("MOV: Compressed headers not (yet) supported!\n");
+	    return;
+	}
+	
+	pos+=len+8;
+	if(pos>=endpos) break;
+	if(!stream_seek(demuxer->stream,pos)) break;
+    }
+}
+
+int mov_read_header(demuxer_t* demuxer){
+    mov_priv_t* priv=demuxer->priv;
+    
+//    printf("mov_read_header!\n");
+
+    // Parse header:    
+    if(!stream_seek(demuxer->stream,priv->moov_start)) return 0; // ???
+    lschunks(demuxer, 0, priv->moov_end, NULL);
+
+    // Build tables:
+    // ...
+    
+    printf("\n****** Quicktime MOV format not yet supported!!!!!!! *******\n");
+
+    return 1;
+}
diff --git a/demuxer.c b/demuxer.c
index 7e5e83e6f1..bfaa530eba 100644
--- a/demuxer.c
+++ b/demuxer.c
@@ -391,11 +391,11 @@ if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above!
   }
 }
 //=============== Try to open as MOV file: =================
-#if 0
+#if 1
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
   stream_reset(stream);
   demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
-//  stream_seek(demuxer->stream,seek_to_byte);
+  stream_seek(demuxer->stream,seek_to_byte);
   if(mov_check_file(demuxer)){
       printf("Detected QuickTime/MOV file format!\n");
       file_format=DEMUXER_TYPE_MOV;
@@ -418,6 +418,10 @@ d_video=demuxer->video;
 demuxer->file_format=file_format;
 
 switch(file_format){
+ case DEMUXER_TYPE_MOV: {
+  mov_read_header(demuxer);
+  break;
+ }
  case DEMUXER_TYPE_AVI: {
   return demux_open_avi(demuxer);
 //  break;
diff --git a/demuxer.h b/demuxer.h
index 9b58977dc0..7a79144934 100644
--- a/demuxer.h
+++ b/demuxer.h
@@ -11,6 +11,7 @@
 #define DEMUXER_TYPE_AVI_NI 4
 #define DEMUXER_TYPE_AVI_NINI 5
 #define DEMUXER_TYPE_ASF 6
+#define DEMUXER_TYPE_MOV 7
 
 #define DEMUXER_TIME_NONE 0
 #define DEMUXER_TIME_PTS 1