[Mplayer-cvslog] CVS: main/libmpdemux demux_ogg.c,1.26,1.27
Moritz Bunkus CVS
mosu at mplayerhq.hu
Sun May 11 18:39:44 CEST 2003
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv24486
Modified Files:
demux_ogg.c
Log Message:
Preliminary Theora support. Patch by David Kuehling.
Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- demux_ogg.c 29 Jan 2003 21:53:56 -0000 1.26
+++ demux_ogg.c 11 May 2003 16:39:16 -0000 1.27
@@ -6,6 +6,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <assert.h>
+#include <math.h>
#include "../mp_msg.h"
#include "../help_mp.h"
@@ -21,6 +23,10 @@
#include <vorbis/codec.h>
#endif
+#ifdef HAVE_OGGTHEORA
+#include <theora/theora.h>
+#endif
+
#define BLOCK_SIZE 4096
/// Vorbis decoder context : we need the vorbis_info for vorbis timestamping
@@ -37,6 +43,17 @@
#endif
} ov_struct_t;
+/* Theora decoder context : we won't be able to interpret granule positions
+ * without using theora_granule_time with the theora_state of the stream.
+ * This is duplicated in `vd_theora.c'; put this in a common header?
+ */
+#ifdef HAVE_OGGTHEORA
+typedef struct theora_struct_st {
+ theora_state st;
+ theora_info inf;
+} theora_struct_t;
+#endif
+
//// OggDS headers
// Header for the new header format
typedef struct stream_header_video
@@ -93,6 +110,7 @@
ogg_stream_state stream;
int hdr_packets;
int vorbis;
+ int theora;
} ogg_stream_t;
typedef struct ogg_demuxer {
@@ -279,7 +297,7 @@
}
-static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,vorbis_info* vi,float* pts,int* flags) {
+static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,void *context,float* pts,int* flags) {
unsigned char* data;
*pts = 0;
@@ -289,19 +307,47 @@
data = pack->packet;
if(*pack->packet & PACKET_TYPE_HEADER)
os->hdr_packets++;
- else if(vi) {
- // When we dump the audio, there is no vi, but we dont care of timestamp in this case
- int32_t blocksize = vorbis_packet_blocksize(vi,pack) / vi->channels;
- // Calculate the timestamp if the packet don't have any
- if(pack->granulepos == -1) {
- pack->granulepos = os->lastpos;
- if(os->lastsize > 0)
- pack->granulepos += os->lastsize;
- }
- *pts = pack->granulepos / (float)vi->rate;
- os->lastsize = blocksize;
- os->lastpos = pack->granulepos;
+ else if (context )
+ {
+ vorbis_info *vi = &((ov_struct_t*)context)->vi;
+
+ // When we dump the audio, there is no vi, but we dont care of timestamp in this case
+ int32_t blocksize = vorbis_packet_blocksize(vi,pack) / vi->channels;
+ // Calculate the timestamp if the packet don't have any
+ if(pack->granulepos == -1) {
+ pack->granulepos = os->lastpos;
+ if(os->lastsize > 0)
+ pack->granulepos += os->lastsize;
+ }
+ *pts = pack->granulepos / (float)vi->rate;
+ os->lastsize = blocksize;
+ os->lastpos = pack->granulepos;
}
+# ifdef HAVE_OGGTHEORA
+ } else if (os->theora) {
+ /* we pass complete packets to theora, mustn't strip the header! */
+ data = pack->packet;
+ os->lastsize = 1;
+
+ if (context != NULL)
+ {
+ theora_state *st;
+ int64_t usable_granulepos;
+
+ st = &((theora_struct_t*)context)->st;
+ *pts = theora_granule_time (st, pack->granulepos);
+ if (*pts >= 0)
+ {
+ usable_granulepos = (int64_t)ceil (*pts * os->samplerate - 0.5);
+ os->lastpos = usable_granulepos;
+ }
+ else
+ {
+ os->lastpos++;
+ *pts = (double)os->lastpos / (double)os->samplerate;
+ }
+ }
+#endif /* HAVE_OGGTHEORA */
} else {
// Find data start
int16_t hdrlen = (*pack->packet & PACKET_LEN_BITS01)>>6;
@@ -334,22 +380,26 @@
unsigned char* data;
float pts = 0;
int flags = 0;
+ void *context = NULL;
if (ds == d->sub) { // don't want to add subtitles to the demuxer for now
demux_ogg_add_sub(os,pack);
return 0;
}
- // If packet is an header we jump it except for vorbis
+ // If packet is an header we jump it except for vorbis and theora
+ // (PACKET_TYPE_HEADER bit doesn't even exist for theora ?!)
if((*pack->packet & PACKET_TYPE_HEADER) &&
- (ds == d->video || (ds == d->audio && ( ((sh_audio_t*)ds->sh)->format != 0xFFFE || os->hdr_packets >= NUM_VORBIS_HDR_PACKETS ) ) ))
+ (ds != d->audio || ( ((sh_audio_t*)ds->sh)->format != 0xFFFE || os->hdr_packets >= NUM_VORBIS_HDR_PACKETS ) ) &&
+ (ds != d->video || (((sh_video_t*)ds->sh)->format != 0xFFFC)))
return 0;
- // For vorbis packet the packet is the data, for other codec we must jump the header
+ // For vorbis packet the packet is the data, for other codec we must jump
+ // the header
if(ds == d->audio && ((sh_audio_t*)ds->sh)->format == 0xFFFE)
- data = demux_ogg_read_packet(os,pack,&((ov_struct_t*)((sh_audio_t*)ds->sh)->context)->vi,
- &pts,&flags);
- else
- data = demux_ogg_read_packet(os,pack,NULL,&pts,&flags);
+ context = ((sh_audio_t *)ds->sh)->context;
+ if (ds == d->video && ((sh_audio_t*)ds->sh)->format == 0xFFFC)
+ context = ((sh_video_t *)ds->sh)->context;
+ data = demux_ogg_read_packet(os,pack,context,&pts,&flags);
/// Clear subtitles if necessary (for broken files)
if ((clear_sub > 0) && (pts >= clear_sub)) {
@@ -379,7 +429,7 @@
ogg_stream_t* os;
ogg_packet op;
int np,sid,p;
- vorbis_info* vi = NULL;
+ void *context = NULL;
off_t pos, last_pos;
pos = last_pos = demuxer->movi_start;
@@ -388,12 +438,17 @@
ogg_sync_reset(sync);
// Get the serial number of the stream we use
- if(demuxer->video->id >= 0)
+ if(demuxer->video->id >= 0) {
sid = demuxer->video->id;
+ /* demux_ogg_read_packet needs decoder context for Theora streams */
+ if (((sh_video_t*)demuxer->video->sh)->format == 0xFFFC)
+ context = ((sh_video_t*)demuxer->video->sh)->context;
+ }
else {
sid = demuxer->audio->id;
+ /* demux_ogg_read_packet needs decoder context for Vorbis streams */
if(((sh_audio_t*)demuxer->audio->sh)->format == 0xFFFE)
- vi = &((ov_struct_t*)((sh_audio_t*)demuxer->audio->sh)->context)->vi;
+ context = ((sh_audio_t*)demuxer->audio->sh)->context;
}
os = &ogg_d->subs[sid];
oss = &os->stream;
@@ -428,7 +483,7 @@
while(ogg_stream_packetout(oss,&op) == 1) {
float pts;
int flags;
- demux_ogg_read_packet(os,&op,vi,&pts,&flags);
+ demux_ogg_read_packet(os,&op,context,&pts,&flags);
if(flags || (os->vorbis && op.granulepos >= 0)) {
ogg_d->syncpoints = (ogg_syncpoint_t*)realloc(ogg_d->syncpoints,(ogg_d->num_syncpoint+1)*sizeof(ogg_syncpoint_t));
ogg_d->syncpoints[ogg_d->num_syncpoint].granulepos = op.granulepos;
@@ -563,6 +618,48 @@
n_audio++;
mp_msg(MSGT_DEMUX,MSGL_V,"OGG : stream %d is vorbis\n",ogg_d->num_sub);
+ // check for Theora
+# ifdef HAVE_OGGTHEORA
+ } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
+ int errorCode = 0;
+ theora_info inf;
+ errorCode = theora_decode_header (&inf, &pack);
+ if (errorCode)
+ mp_msg(MSGT_DEMUX,MSGL_ERR,"Theora header parsing failed: %i \n",
+ errorCode);
+ else
+ {
+ sh_v = new_sh_video(demuxer,ogg_d->num_sub);
+
+ sh_v->context = NULL;
+ sh_v->bih = (BITMAPINFOHEADER*)calloc(1,sizeof(BITMAPINFOHEADER));
+ sh_v->bih->biSize=sizeof(BITMAPINFOHEADER);
+ sh_v->bih->biCompression= sh_v->format = 0xFFFC;
+ sh_v->fps = ((double)inf.fps_numerator)/
+ (double)inf.fps_denominator;
+ sh_v->frametime = ((double)inf.fps_denominator)/
+ (double)inf.fps_numerator;
+ sh_v->disp_w = sh_v->bih->biWidth = inf.width;
+ sh_v->disp_h = sh_v->bih->biHeight = inf.height;
+ sh_v->bih->biBitCount = 24;
+ 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;
+ 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,
+ (int)inf.version_minor,
+ (int)inf.version_subminor,
+ inf.width, inf.height,
+ sh_v->fps,
+ inf.aspect_numerator, inf.aspect_denominator);
+ if(verbose>0) print_video_header(sh_v->bih);
+ }
+# endif /* HAVE_OGGTHEORA */
/// Check for old header
} else if(pack.bytes >= 142 && ! strncmp(&pack.packet[1],"Direct Show Samples embedded in Ogg",35) ) {
@@ -1025,7 +1122,13 @@
break;
}
- if( ((*op.packet & PACKET_IS_SYNCPOINT) || os->vorbis ) &&
+ /* the detection of keyframes for theora is somewhat a hack: granulepos
+ for theora packets is `keyframeNumber<<shift | iframeNumber'; `shift'
+ is *variable*, with its excact value encoded in the theora header.
+ This code just hopes that it is greater than 9 and that keyframes
+ distance will never overflow 512. */
+ if( (((*op.packet & PACKET_IS_SYNCPOINT) && !os->theora) ||
+ os->vorbis || (os->theora && (op.granulepos&0x1FF) == 0)) &&
(!ogg_d->syncpoints || op.granulepos >= gp) ) {
ogg_sub.lines = 0;
vo_sub = &ogg_sub;
More information about the MPlayer-cvslog
mailing list