[MPlayer-dev-eng] [PATCH] split out parts of lschunks function
Reimar Döffinger
Reimar.Doeffinger at stud.uni-karlsruhe.de
Mon Aug 20 23:19:11 CEST 2007
Hello,
there is a huge part of lschunks (> 2*330 lines) that just fills the
sh_* structs.
Is it okay to apply this patch that splits these out? This IMO makes the
code more readable, but more importantly I hopefully makes it possible
to create a separate "virtual" stream for each different fourcc of the
stream, so that those files with a single jpeg can be played by just
adding the right -vid. In the long term, selecting the -vid would make
the demuxer also not output the parts that belong to a different fourcc,
but that is not part of the first step.
It's probably also a good idea to reindent those new functions as a next
step...
Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libmpdemux/demux_mov.c
===================================================================
--- libmpdemux/demux_mov.c (revision 24107)
+++ libmpdemux/demux_mov.c (working copy)
@@ -579,58 +579,7 @@
static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id,
off_t pos, off_t len, mov_track_t* trak);
-static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){
- mov_priv_t* priv=demuxer->priv;
-// printf("lschunks (level=%d,endpos=%x)\n", level, endpos);
- while(1){
- off_t pos;
- off_t len;
- unsigned int id;
- //
- pos=stream_tell(demuxer->stream);
-// printf("stream_tell==%d\n",pos);
- if(pos>=endpos) return; // END
- len=stream_read_dword(demuxer->stream);
-// printf("len==%d\n",len);
- if(len<8) return; // error
- len-=8;
- id=stream_read_dword(demuxer->stream);
- //
- mp_msg(MSGT_DEMUX,MSGL_DBG2,"lschunks %.4s %d\n",(char *)&id,(int)len);
- //
- if(trak){
- if (lschunks_intrak(demuxer, level, id, pos, len, trak) < 0)
- return;
- } else { /* not in track */
- switch(id) {
- case MOV_FOURCC('m','v','h','d'): {
- int version = stream_read_char(demuxer->stream);
- stream_skip(demuxer->stream, (version == 1) ? 19 : 11);
- priv->timescale=stream_read_dword(demuxer->stream);
- if (version == 1)
- priv->duration=stream_read_qword(demuxer->stream);
- else
- priv->duration=stream_read_dword(demuxer->stream);
- mp_msg(MSGT_DEMUX, MSGL_V,"MOV: %*sMovie header (%d bytes): tscale=%d dur=%d\n",level,"",(int)len,
- (int)priv->timescale,(int)priv->duration);
- break;
- }
- case MOV_FOURCC('t','r','a','k'): {
-// if(trak) printf("MOV: Warning! trak in trak?\n");
- if(priv->track_db>=MOV_MAX_TRACKS){
- mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVtooManyTrk);
- return;
- }
- if(!priv->track_db) mp_msg(MSGT_DEMUX, MSGL_V, "--------------\n");
- trak=malloc(sizeof(mov_track_t));
- memset(trak,0,sizeof(mov_track_t));
- mp_msg(MSGT_DEMUX,MSGL_V,"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);
- mov_build_index(trak,priv->timescale);
- switch(trak->type){
- case MOV_TRAK_AUDIO: {
+static int gen_sh_audio(sh_audio_t* sh, mov_track_t* trak, int timescale) {
#if 0
struct {
int16_t version; // 0 or 1 (version 1 is qt3.0+)
@@ -658,14 +607,12 @@
#endif
int version, adjust;
int is_vorbis = 0;
- sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db);
- mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "mov", priv->track_db);
sh->format=trak->fourcc;
// crude audio delay from editlist0 hack ::atm
if(trak->editlist_size>=1) {
if(trak->editlist[0].pos == -1) {
- sh->stream_delay = (float)trak->editlist[0].dur/(float)priv->timescale;
+ sh->stream_delay = (float)trak->editlist[0].dur/(float)timescale;
mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Initial Audio-Delay: %.3f sec\n", sh->stream_delay);
}
}
@@ -975,21 +922,20 @@
// demuxer->audio->id=priv->track_db;
// demuxer->audio->sh=sh; sh->ds=demuxer->audio;
// }
- break;
- }
- case MOV_TRAK_VIDEO: {
+ return 1;
+}
+
+static int gen_sh_video(sh_video_t* sh, mov_track_t* trak, int timescale) {
int depth, i, entry;
int flag, start, count_flag, end, palette_count, gray;
int hdr_ptr = 76; // the byte just after depth
unsigned char *palette_map;
- sh_video_t* sh=new_sh_video(demuxer,priv->track_db);
- mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "mov", priv->track_db);
sh->format=trak->fourcc;
// crude video delay from editlist0 hack ::atm
if(trak->editlist_size>=1) {
if(trak->editlist[0].pos == -1) {
- sh->stream_delay = (float)trak->editlist[0].dur/(float)priv->timescale;
+ sh->stream_delay = (float)trak->editlist[0].dur/(float)timescale;
mp_msg(MSGT_DEMUX,MSGL_V,"MOV: Initial Video-Delay: %.3f sec\n", sh->stream_delay);
}
}
@@ -999,7 +945,7 @@
mp_msg(MSGT_DEMUXER, MSGL_WARN,
"MOV: Invalid (%d bytes instead of >= 78) video trak desc\n",
trak->stdata_len);
- break;
+ return 0;
}
depth = trak->stdata[75] | (trak->stdata[74] << 8);
// stdata[]:
@@ -1305,8 +1251,72 @@
// demuxer->video->id=priv->track_db;
// demuxer->video->sh=sh; sh->ds=demuxer->video;
// }
+ return 1;
+}
+
+static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){
+ mov_priv_t* priv=demuxer->priv;
+// printf("lschunks (level=%d,endpos=%x)\n", level, endpos);
+ while(1){
+ off_t pos;
+ off_t len;
+ unsigned int id;
+ //
+ pos=stream_tell(demuxer->stream);
+// printf("stream_tell==%d\n",pos);
+ if(pos>=endpos) return; // END
+ len=stream_read_dword(demuxer->stream);
+// printf("len==%d\n",len);
+ if(len<8) return; // error
+ len-=8;
+ id=stream_read_dword(demuxer->stream);
+ //
+ mp_msg(MSGT_DEMUX,MSGL_DBG2,"lschunks %.4s %d\n",(char *)&id,(int)len);
+ //
+ if(trak){
+ if (lschunks_intrak(demuxer, level, id, pos, len, trak) < 0)
+ return;
+ } else { /* not in track */
+ switch(id) {
+ case MOV_FOURCC('m','v','h','d'): {
+ int version = stream_read_char(demuxer->stream);
+ stream_skip(demuxer->stream, (version == 1) ? 19 : 11);
+ priv->timescale=stream_read_dword(demuxer->stream);
+ if (version == 1)
+ priv->duration=stream_read_qword(demuxer->stream);
+ else
+ priv->duration=stream_read_dword(demuxer->stream);
+ mp_msg(MSGT_DEMUX, MSGL_V,"MOV: %*sMovie header (%d bytes): tscale=%d dur=%d\n",level,"",(int)len,
+ (int)priv->timescale,(int)priv->duration);
break;
}
+ case MOV_FOURCC('t','r','a','k'): {
+// if(trak) printf("MOV: Warning! trak in trak?\n");
+ if(priv->track_db>=MOV_MAX_TRACKS){
+ mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVtooManyTrk);
+ return;
+ }
+ if(!priv->track_db) mp_msg(MSGT_DEMUX, MSGL_V, "--------------\n");
+ trak=malloc(sizeof(mov_track_t));
+ memset(trak,0,sizeof(mov_track_t));
+ mp_msg(MSGT_DEMUX,MSGL_V,"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);
+ mov_build_index(trak,priv->timescale);
+ switch(trak->type){
+ case MOV_TRAK_AUDIO: {
+ sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "mov", priv->track_db);
+ gen_sh_audio(sh, trak, priv->timescale);
+ break;
+ }
+ case MOV_TRAK_VIDEO: {
+ sh_video_t* sh=new_sh_video(demuxer,priv->track_db);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "mov", priv->track_db);
+ gen_sh_video(sh, trak, priv->timescale);
+ break;
+ }
case MOV_TRAK_GENERIC:
if (trak->fourcc == mmioFOURCC('m','p','4','s') ||
trak->fourcc == mmioFOURCC('t','x','3','g') ||
@@ -2181,7 +2191,6 @@
len -= 2;
if (len < 0) len = 0;
if (len > MOV_MAX_SUBLEN) len = MOV_MAX_SUBLEN;
- sub_utf8 = 1;
}
ds_read_packet(demuxer->sub, demuxer->stream, len, subpts, pos, 0);
priv->current_sub = samplenr;
More information about the MPlayer-dev-eng
mailing list