mplayer.hg: libmpdemux/demux

comparison libmpdemux/demux_ogg.c @ 14046:4802041ab8e3

Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>

author	mosu
date	Thu, 25 Nov 2004 22:24:00 +0000
parents	e69a40dc1a19
children	c920c525daa2

comparison

equal deleted inserted replaced

-:7a129428a408
+:4802041ab8e3
 int hdr_packets;
 int vorbis;
 int theora;
 int flac;
 int text;
+int id;
 } ogg_stream_t;
 typedef struct ogg_demuxer {
 /// Physical stream state
 ogg_sync_state sync;
 extern int index_mode;
 extern char *dvdsub_lang, *audio_lang;
 extern int dvdsub_id;
+extern int demux_aid_vid_mismatch;
 //-------- subtitle support - should be moved to decoder layer, and queue
 //                          - subtitles up in demuxer buffer...
 #include "../subreader.h"
 val = *cmt + 14;
 }
 else if (!strncasecmp(*cmt, "LANGUAGE=", 9))
 {
 val = *cmt + 9;
+if (identify)
+{
+if (ogg_d->subs[id].text)
+mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SID_%d_LANG=%s\n", ogg_d->subs[id].id, val);
+else if (id != d->video->id)
+mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AID_%d_LANG=%s\n", ogg_d->subs[id].id, val);
+}
 // copy this language name into the array
 index = demux_ogg_sub_reverse_id(d, id);
 if (index >= 0) {
 	// in case of malicious files with more than one lang per track:
 	if (ogg_d->text_langs[index]) free(ogg_d->text_langs[index]);
 // Reset our vars
 sh_a = NULL;
 sh_v = NULL;
+demux_aid_vid_mismatch = 1; // don't identify in new_sh_* since ids don't match
 // Check for Vorbis
 if(pack.bytes >= 7 && ! strncmp(&pack.packet[1],"vorbis", 6) ) {
 sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
 sh_a->format = 0xFFFE;
 ogg_d->subs[ogg_d->num_sub].vorbis = 1;
+if (identify)
+mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
+ogg_d->subs[ogg_d->num_sub].id = n_audio;
 n_audio++;
 mp_msg(MSGT_DEMUX,MSGL_V,"Ogg : stream %d is vorbis\n",ogg_d->num_sub);
 // check for Theora
 #   ifdef HAVE_OGGTHEORA
 	    sh_v->bih->biPlanes = 3;
 	    sh_v->bih->biSizeImage = ((sh_v->bih->biBitCount/8) *
 				      sh_v->bih->biWidth*sh_v->bih->biHeight);
 	    ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
 	    ogg_d->subs[ogg_d->num_sub].theora = 1;
+	    if (identify)
+	      mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
+	    ogg_d->subs[ogg_d->num_sub].id = n_video;
 	    n_video++;
 	    mp_msg(MSGT_DEMUX,MSGL_V,
 		   "Ogg : stream %d is theora v%i.%i.%i %i:%i, %.3f FPS,"
 		   " aspect %i:%i\n", ogg_d->num_sub,
 		   (int)inf.version_major,
 #   endif /* HAVE_OGGTHEORA */
 #   ifdef HAVE_FLAC
 } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) {
 	sh_a = new_sh_audio(demuxer,ogg_d->num_sub);
 	sh_a->format =  mmioFOURCC('f', 'L', 'a', 'C');
+	if (identify)
+	  mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
+	ogg_d->subs[ogg_d->num_sub].id = n_audio;
 	n_audio++;
 	ogg_d->subs[ogg_d->num_sub].flac = 1;
 	sh_a->wf = NULL;
 	mp_msg(MSGT_DEMUX,MSGL_V,"Ogg : stream %d is FLAC\n",ogg_d->num_sub);
 #   endif /* HAVE_FLAC */
 	if(!sh_v->bih->biBitCount) sh_v->bih->biBitCount=24; // hack, FIXME
 	sh_v->bih->biPlanes=1;
 	sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
+	if (identify)
+	  mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
+	ogg_d->subs[ogg_d->num_sub].id = n_video;
 	n_video++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"Ogg stream %d is video (old hdr)\n",ogg_d->num_sub);
 	if(verbose>0) print_video_header(sh_v->bih);
 	// Old audio header
 } else if(get_uint32(pack.packet+96) == 0x05589F81) {
 	sh_a->wf->cbSize = extra_size;
 	if(extra_size > 0)
 	  memcpy(sh_a->wf+sizeof(WAVEFORMATEX),pack.packet+142,extra_size);
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
+	if (identify)
+	  mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
+	ogg_d->subs[ogg_d->num_sub].id = n_audio;
 	n_audio++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"Ogg stream %d is audio (old hdr)\n",ogg_d->num_sub);
 	if(verbose>0) print_wave_header(sh_a->wf);
 } else
 	mp_msg(MSGT_DEMUX,MSGL_WARN,"Ogg stream %d contains an old header but the header type is unknown\n",ogg_d->num_sub);
 	if(!sh_v->bih->biBitCount) sh_v->bih->biBitCount=24; // hack, FIXME
 	sh_v->bih->biPlanes=1;
 	sh_v->bih->biSizeImage=(sh_v->bih->biBitCount>>3)*sh_v->bih->biWidth*sh_v->bih->biHeight;
 	ogg_d->subs[ogg_d->num_sub].samplerate= sh_v->fps;
+	if (identify)
+	  mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", n_video);
+	ogg_d->subs[ogg_d->num_sub].id = n_video;
 	n_video++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"Ogg stream %d is video (new hdr)\n",ogg_d->num_sub);
 	if(verbose>0) print_video_header(sh_v->bih);
 	/// New audio header
 } else if(strncmp(st->streamtype,"audio",5) == 0) {
 	sh_a->wf->cbSize = extra_size;
 	if(extra_size)
 	  memcpy(sh_a->wf+sizeof(WAVEFORMATEX),st+1,extra_size);
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
+	if (identify)
+	  mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", n_audio);
+	ogg_d->subs[ogg_d->num_sub].id = n_audio;
 	n_audio++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"Ogg stream %d is audio (new hdr)\n",ogg_d->num_sub);
 	if(verbose>0) print_wave_header(sh_a->wf);
 	/// Check for text (subtitles) header
 } else if (strncmp(st->streamtype, "text", 4) == 0) {
 mp_msg(MSGT_DEMUX, MSGL_V, "Ogg stream %d is text\n", ogg_d->num_sub);
 	  ogg_d->subs[ogg_d->num_sub].samplerate= get_uint64(&st->time_unit)/10;
 	  ogg_d->subs[ogg_d->num_sub].text = 1;
+	  if (identify)
+	    mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", ogg_d->n_text);
+ogg_d->subs[ogg_d->num_sub].id = ogg_d->n_text;
 if (demuxer->sub->id == ogg_d->n_text)
 text_id = ogg_d->num_sub;
 ogg_d->n_text++;
 ogg_d->text_ids = (int *)realloc(ogg_d->text_ids, sizeof(int) * ogg_d->n_text);
 ogg_d->text_ids[ogg_d->n_text - 1] = ogg_d->num_sub;

Mercurial > mplayer.hg

comparison libmpdemux/demux_ogg.c @ 14046:4802041ab8e3