- add buf->decoder_info_ptr: portability for systems where pointer has

  different sizeof than integer.
- add extra_info structure to pass informations from input/demuxers down
  to the output frame. this can be used, for example, to pass the frame
  number of a frame (when known by decoder). also, immediate benefict is
  that we now have a slider which really shows the current position of
  the playing stream. new fields can be added to extra_info keeping
  binary compatibility
- bumpy everybody's api versions

CVS patchset: 3603
CVS date: 2002/12/21 12:56:44

1 files changed, 6 insertions, 6 deletions

diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 2531b3fd8..809b1dc58 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ogg.c,v 1.55 2002/12/08 21:43:51 miguelfreitas Exp $
+ * $Id: demux_ogg.c,v 1.56 2002/12/21 12:56:45 miguelfreitas Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -250,8 +250,8 @@ static void send_ogg_buf (demux_ogg_t *this,
 	    op->granulepos, buf->pts);
 #endif
 
-    buf->input_pos     = this->input->get_current_pos (this->input);
-    buf->input_time    = buf->input_pos * 8 / this->avg_bitrate;
+    buf->extra_info->input_pos     = this->input->get_current_pos (this->input);
+    buf->extra_info->input_time    = buf->extra_info->input_pos * 8 / this->avg_bitrate;
     buf->type          = this->buf_types[stream_num] ;
     buf->decoder_flags = decoder_flags;
     
@@ -299,8 +299,8 @@ static void send_ogg_buf (demux_ogg_t *this,
       printf ("demux_ogg: video granulepos %lld, pts %lld\n", op->granulepos, buf->pts);
 #endif
       
-      buf->input_pos  = this->input->get_current_pos (this->input);
-      buf->input_time = 0;
+      buf->extra_info->input_pos  = this->input->get_current_pos (this->input);
+      buf->extra_info->input_time = 0;
       buf->type       = this->buf_types[stream_num] ;
 	
       done += buf->size;
@@ -1071,6 +1071,6 @@ static void *init_class (xine_t *xine, void *data) {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 18, "ogg", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_DEMUX, 19, "ogg", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };