Mercurial > mplayer.hg

changeset 12434:aa7216363fd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" with "Ogg" as it is a name, not an abbreviation/acronym.
author mosu
date Fri, 07 May 2004 08:31:39 +0000
parents e7ed5efa4d10
children 8a14673b5d57
files libmpdemux/demux_ogg.c libmpdemux/demuxer.c
diffstat 2 files changed, 29 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_ogg.c	Fri May 07 02:34:22 2004 +0000
+++ b/libmpdemux/demux_ogg.c	Fri May 07 08:31:39 2004 +0000
@@ -270,7 +270,7 @@
     }
   }
 
-  mp_msg(MSGT_DEMUX,MSGL_DBG2,"ogg sub lines: %d  first: '%s'\n",
+  mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg sub lines: %d  first: '%s'\n",
       ogg_sub.lines, ogg_sub.text[0]);
 #ifdef USE_ICONV
   subcp_recode1(&ogg_sub);
@@ -440,7 +440,7 @@
       if (os->text && d->sub->id == -1 && demux_ogg_check_lang(val, dvdsub_lang))
       {
 	d->sub->id = id;
-        mp_msg(MSGT_DEMUX, MSGL_V, "OGG demuxer: Displaying the subtitle stream with the id %d which matched -slang %s\n", id, val);
+        mp_msg(MSGT_DEMUX, MSGL_V, "Ogg demuxer: Displaying subtitle stream id %d which matched -slang %s\n", id, val);
       }
       else
 	hdr = "Language";
@@ -682,7 +682,7 @@
     np = ogg_sync_pageseek(sync,page);
     /// Error
     if(np < 0) {
-      mp_msg(MSGT_DEMUX,MSGL_DBG2,"OGG demuxer : Bad page sync\n");
+      mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg demuxer : Bad page sync\n");
       free(ogg_d);
       return 0;
     }
@@ -707,7 +707,7 @@
       if(id >= 0)
 	ogg_stream_pagein(&ogg_d->subs[id].stream,page);
       else
-	mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG : Warning found none bos page from unknown stream %d\n",ogg_page_serialno(page));
+	mp_msg(MSGT_DEMUX,MSGL_ERR,"Ogg : Warning found none bos page from unknown stream %d\n",ogg_page_serialno(page));
       break;
     }
 
@@ -717,7 +717,7 @@
     /// Get the stream serial number
     s_no = ogg_page_serialno(page);
     ogg_stream_init(&ogg_d->subs[ogg_d->num_sub].stream,s_no);
-    mp_msg(MSGT_DEMUX,MSGL_DBG2,"OGG : Found a stream with serial=%d\n",s_no);
+    mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg : Found a stream with serial=%d\n",s_no);
     // Take the first page
     ogg_stream_pagein(&ogg_d->subs[ogg_d->num_sub].stream,page);
     // Get first packet of the page
@@ -733,7 +733,7 @@
       sh_a->format = 0xFFFE;
       ogg_d->subs[ogg_d->num_sub].vorbis = 1;
       n_audio++;
-      mp_msg(MSGT_DEMUX,MSGL_V,"OGG : stream %d is vorbis\n",ogg_d->num_sub);
+      mp_msg(MSGT_DEMUX,MSGL_V,"Ogg : stream %d is vorbis\n",ogg_d->num_sub);
 
       // check for Theora
 #   ifdef HAVE_OGGTHEORA
@@ -771,7 +771,7 @@
 	    ogg_d->subs[ogg_d->num_sub].theora = 1;
 	    n_video++;
 	    mp_msg(MSGT_DEMUX,MSGL_V,
-		   "OGG : stream %d is theora v%i.%i.%i %i:%i, %.3f FPS,"
+		   "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, 
 		   (int)inf.version_minor, 
@@ -789,7 +789,7 @@
 	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);
+	mp_msg(MSGT_DEMUX,MSGL_V,"Ogg : stream %d is FLAC\n",ogg_d->num_sub);
 #   endif /* HAVE_FLAC */
 
       /// Check for old header
@@ -814,7 +814,7 @@
 
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
 	n_video++;
-	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is video (old hdr)\n",ogg_d->num_sub);
+	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) {
@@ -835,10 +835,10 @@
 
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
 	n_audio++;
-	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (old hdr)\n",ogg_d->num_sub);
+	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);
+	mp_msg(MSGT_DEMUX,MSGL_WARN,"Ogg stream %d contains an old header but the header type is unknown\n",ogg_d->num_sub);
 
         // Check new header
     } else if ( (*pack.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER && 
@@ -863,7 +863,7 @@
 
 	ogg_d->subs[ogg_d->num_sub].samplerate= sh_v->fps;
 	n_video++;
-	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is video (new hdr)\n",ogg_d->num_sub);
+	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) {
@@ -886,12 +886,12 @@
 
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
 	n_audio++;
-	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (new hdr)\n",ogg_d->num_sub);
+	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);
+          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 (demuxer->sub->id == n_text)
@@ -900,10 +900,10 @@
           demux_ogg_init_sub();
 	//// Unknown header type
       } else
-	mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d has a header marker but is of an unknown type\n",ogg_d->num_sub);
+	mp_msg(MSGT_DEMUX,MSGL_ERR,"Ogg stream %d has a header marker but is of an unknown type\n",ogg_d->num_sub);
       /// Unknown (invalid ?) header
     } else
-      mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG stream %d is of an unknown type\n",ogg_d->num_sub);
+      mp_msg(MSGT_DEMUX,MSGL_ERR,"Ogg stream %d is of an unknown type\n",ogg_d->num_sub);
 
     if(sh_a || sh_v) {
       demux_stream_t* ds = NULL;
@@ -968,7 +968,7 @@
     demuxer->sub->id = -2;
   else if (text_id >= 0) {
     demuxer->sub->id = text_id;
-    mp_msg(MSGT_DEMUX, MSGL_V, "OGG demuxer: Displaying the subtitle stream with the id %d\n", text_id);
+    mp_msg(MSGT_DEMUX, MSGL_V, "Ogg demuxer: Displaying subtitle stream id %d\n", text_id);
   }
 
   ogg_d->final_granulepos=0;
@@ -981,7 +981,7 @@
     demux_ogg_scan_stream(demuxer);
   }
 
-  mp_msg(MSGT_DEMUX,MSGL_V,"OGG demuxer : found %d audio stream%s, %d video stream%s and %d text stream%s\n",n_audio,n_audio>1?"s":"",n_video,n_video>1?"s":"",n_text,n_text>1?"s":"");
+  mp_msg(MSGT_DEMUX,MSGL_V,"Ogg demuxer : found %d audio stream%s, %d video stream%s and %d text stream%s\n",n_audio,n_audio>1?"s":"",n_video,n_video>1?"s":"",n_text,n_text>1?"s":"");
  
   return 1;
 }
@@ -1004,7 +1004,7 @@
 
   /// Find the stream we are working on
   if ( (id = demux_ogg_get_page_stream(ogg_d,&os)) < 0) {
-      mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG demuxer : can't get current stream\n");
+      mp_msg(MSGT_DEMUX,MSGL_ERR,"Ogg demuxer : can't get current stream\n");
       return 0;
   }
 
@@ -1023,7 +1023,7 @@
 	  while( (pa = ogg_sync_pageseek(sync,page)) <= 0) {
 	    /// Error : we skip some bytes
 	    if(pa < 0) {
-	      mp_msg(MSGT_DEMUX,MSGL_WARN,"OGG : Page out not synced, we skip some bytes\n");
+	      mp_msg(MSGT_DEMUX,MSGL_WARN,"Ogg : Page out not synced, we skip some bytes\n");
 	      ogg_d->pos -= pa;
 	      continue;
 	    }
@@ -1031,7 +1031,7 @@
 	    buf = ogg_sync_buffer(sync,BLOCK_SIZE);	    
 	    len = stream_read(s,buf,BLOCK_SIZE);
 	    if(len == 0 && s->eof) {
-	      mp_msg(MSGT_DEMUX,MSGL_DBG2,"OGG : Stream EOF !!!!\n");
+	      mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg : Stream EOF !!!!\n");
 	      return 0;
 	    }
 	    ogg_sync_wrote(sync,len);
@@ -1039,18 +1039,18 @@
 	  ogg_d->last_size = pa;
 	  /// Find the page's logical stream
 	  if( (id = demux_ogg_get_page_stream(ogg_d,&os)) < 0) {
-	    mp_msg(MSGT_DEMUX,MSGL_ERR,"OGG demuxer error : we met an unknown stream\n");
+	    mp_msg(MSGT_DEMUX,MSGL_ERR,"Ogg demuxer error : we met an unknown stream\n");
 	    return 0;
 	  }
 	  /// Take the page
 	  if(ogg_stream_pagein(os,page) == 0)
 	    break;
 	  /// Page was invalid => retry
-	  mp_msg(MSGT_DEMUX,MSGL_WARN,"OGG demuxer : got invalid page !!!!!\n");
+	  mp_msg(MSGT_DEMUX,MSGL_WARN,"Ogg demuxer : got invalid page !!!!!\n");
 	  ogg_d->pos += ogg_d->last_size;
 	}
       } else /// Packet was corrupted
-	mp_msg(MSGT_DEMUX,MSGL_WARN,"OGG : bad packet in stream %d\n",id);
+	mp_msg(MSGT_DEMUX,MSGL_WARN,"Ogg : bad packet in stream %d\n",id);
     } /// Packet loop
     
     /// Is the actual logical stream in use ?
@@ -1087,7 +1087,7 @@
 
   /// Check that the cbSize is enouth big for the following reads
   if(sh_audio->wf->cbSize < 22+3*sizeof(uint32_t)) {
-    mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI OGG : Initial audio header is too small !!!!!\n");
+    mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI Ogg : Initial audio header is too small !!!!!\n");
     goto fallback;
   }
   /// Get the size of the 3 header packet
@@ -1096,7 +1096,7 @@
 
   /// Check the size
   if(sh_audio->wf->cbSize < 22+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1] + hdrsizes[2]) {
-    mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI OGG : Audio header is too small !!!!!\n");
+    mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI Ogg : Audio header is too small !!!!!\n");
     goto fallback;
   }
 
@@ -1112,7 +1112,7 @@
   // Get the first page of the stream : we assume there only 1 logical stream
   while((np = ogg_sync_pageout(&ogg_d->sync,&ogg_d->page)) <= 0 ) {
     if(np < 0) {
-      mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI OGG error : Can't init using first stream packets\n");
+      mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI Ogg error : Can't init using first stream packets\n");
       free(ogg_d);
       goto fallback;
     }
@@ -1123,7 +1123,7 @@
     ogg_sync_wrote(&ogg_d->sync,plen);
   }
   // Init the logical stream
-  mp_msg(MSGT_DEMUX,MSGL_DBG2,"AVI OGG found page with serial %d\n",ogg_page_serialno(&ogg_d->page));
+  mp_msg(MSGT_DEMUX,MSGL_DBG2,"AVI Ogg found page with serial %d\n",ogg_page_serialno(&ogg_d->page));
   ogg_stream_init(&ogg_d->subs[0].stream,ogg_page_serialno(&ogg_d->page));
   // Write the page
   ogg_stream_pagein(&ogg_d->subs[0].stream,&ogg_d->page);
--- a/libmpdemux/demuxer.c	Fri May 07 02:34:22 2004 +0000
+++ b/libmpdemux/demuxer.c	Fri May 07 08:31:39 2004 +0000
@@ -900,7 +900,7 @@
 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){
   demuxer=new_demuxer(stream,DEMUXER_TYPE_OGG,audio_id,video_id,dvdsub_id);
   if(demux_ogg_open(demuxer)){
-      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"OGG");
+      mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"Ogg");
       file_format=DEMUXER_TYPE_OGG;
   } else {
       free_demuxer(demuxer);