oggz_read.c 18.3 KB
Newer Older
andre's avatar
andre committed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
/*
   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
   Organisation (CSIRO) Australia

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:

   - Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.

   - Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.

   - Neither the name of CSIRO Australia nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.

   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/*
 * oggz_read.c
 *
 * Conrad Parker <conrad@annodex.net>
 */

#include "config.h"

#if OGGZ_CONFIG_READ

#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
48

49
#ifdef HAVE_UNISTD_H
andre's avatar
andre committed
50
#include <unistd.h>
51 52
#endif

andre's avatar
andre committed
53 54 55 56 57 58 59
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <time.h>

#include <ogg/ogg.h>

60
#include "oggz_compat.h"
andre's avatar
andre committed
61 62
#include "oggz_private.h"

johnf's avatar
johnf committed
63 64
#include <oggz/oggz_stream.h>

65 66
/* #define DEBUG */
/* #define DEBUG_VERBOSE */
andre's avatar
andre committed
67

68
#define CHUNKSIZE 65536
andre's avatar
andre committed
69

70
#define OGGZ_READ_EMPTY (-404)
71

andre's avatar
andre committed
72 73 74 75 76 77 78 79 80 81 82 83
OGGZ *
oggz_read_init (OGGZ * oggz)
{
  OggzReader * reader = &oggz->x.reader;

  ogg_sync_init (&reader->ogg_sync);
  ogg_stream_init (&reader->ogg_stream, (int)-1);
  reader->current_serialno = -1;

  reader->read_packet = NULL;
  reader->read_user_data = NULL;

conrad's avatar
conrad committed
84 85 86
  reader->read_page = NULL;
  reader->read_page_user_data = NULL;

andre's avatar
andre committed
87 88 89 90 91 92 93 94 95 96
  reader->current_unit = 0;

  return oggz;
}

OGGZ *
oggz_read_close (OGGZ * oggz)
{
  OggzReader * reader = &oggz->x.reader;

97
  ogg_stream_clear (&reader->ogg_stream);
andre's avatar
andre committed
98 99 100 101 102 103 104
  ogg_sync_clear (&reader->ogg_sync);

  return oggz;
}

int
oggz_set_read_callback (OGGZ * oggz, long serialno,
conrad's avatar
conrad committed
105
                        OggzReadPacket read_packet, void * user_data)
andre's avatar
andre committed
106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
{
  OggzReader * reader;
  oggz_stream_t * stream;

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

  reader =  &oggz->x.reader;

  if (oggz->flags & OGGZ_WRITE) {
    return OGGZ_ERR_INVALID;
  }

  if (serialno == -1) {
    reader->read_packet = read_packet;
    reader->read_user_data = user_data;
  } else {
    stream = oggz_get_stream (oggz, serialno);
conrad's avatar
conrad committed
123 124
    if (stream == NULL)
      stream = oggz_add_stream (oggz, serialno);
andre's avatar
andre committed
125 126 127 128 129 130 131 132

    stream->read_packet = read_packet;
    stream->read_user_data = user_data;
  }

  return 0;
}

133
int
134
oggz_set_read_page (OGGZ * oggz, long serialno, OggzReadPage read_page,
conrad's avatar
conrad committed
135
                    void * user_data)
136 137
{
  OggzReader * reader;
138
  oggz_stream_t * stream;
139 140 141 142 143 144 145 146 147

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

  reader =  &oggz->x.reader;

  if (oggz->flags & OGGZ_WRITE) {
    return OGGZ_ERR_INVALID;
  }

148 149 150 151 152 153 154 155 156 157 158
  if (serialno == -1) {
    reader->read_page = read_page;
    reader->read_page_user_data = user_data;
  } else {
    stream = oggz_get_stream (oggz, serialno);
    if (stream == NULL)
      stream = oggz_add_stream (oggz, serialno);

    stream->read_page = read_page;
    stream->read_page_user_data = user_data;
  }
159 160 161 162

  return 0;
}

andre's avatar
andre committed
163
/*
conrad's avatar
conrad committed
164
 * oggz_read_get_next_page (oggz, og, do_read)
andre's avatar
andre committed
165
 *
conrad's avatar
conrad committed
166 167
 * This differs from oggz_get_next_page() in oggz_seek.c in that it
 * does not attempt to call oggz_io_read() if the sync buffer is empty.
andre's avatar
andre committed
168 169 170 171 172 173
 *
 * retrieves the next page.
 * returns >= 0 if found; return value is offset of page start
 * returns -1 on error
 * returns -2 if EOF was encountered
 */
conrad's avatar
conrad committed
174
static oggz_off_t
conrad's avatar
conrad committed
175
oggz_read_get_next_page (OGGZ * oggz, ogg_page * og)
andre's avatar
andre committed
176 177 178
{
  OggzReader * reader = &oggz->x.reader;
  long bytes = 0, more;
conrad's avatar
conrad committed
179
  oggz_off_t page_offset = 0, ret;
andre's avatar
andre committed
180 181 182 183 184 185 186 187 188
  int found = 0;

  do {
    more = ogg_sync_pageseek (&reader->ogg_sync, og);

    if (more == 0) {
      page_offset = 0;
      return -2;
    } else if (more < 0) {
189
#ifdef DEBUG_VERBOSE
andre's avatar
andre committed
190 191 192 193
      printf ("get_next_page: skipped %ld bytes\n", -more);
#endif
      page_offset -= more;
    } else {
194
#ifdef DEBUG_VERBOSE
andre's avatar
andre committed
195 196 197 198 199 200 201 202 203
      printf ("get_next_page: page has %ld bytes\n", more);
#endif
      found = 1;
    }

  } while (!found);

  /* Calculate the byte offset of the page which was found */
  if (bytes > 0) {
204
    oggz->offset = oggz_io_tell (oggz) - bytes + page_offset;
andre's avatar
andre committed
205 206 207 208 209 210 211 212 213 214
    ret = oggz->offset;
  } else {
    /* didn't need to do any reading -- accumulate the page_offset */
    ret = oggz->offset + page_offset;
    oggz->offset += page_offset + more;
  }

  return ret;
}

215 216 217 218 219 220 221 222 223 224
typedef struct {
  ogg_packet      packet;
  ogg_int64_t     calced_granulepos;
  oggz_stream_t * stream;
  OggzReader    * reader;
  OGGZ          * oggz;
  long            serialno;
} OggzBufferedPacket;

OggzBufferedPacket *
conrad's avatar
conrad committed
225 226
oggz_read_new_pbuffer_entry(OGGZ *oggz, ogg_packet *packet, 
            ogg_int64_t granulepos, long serialno, oggz_stream_t * stream, 
227 228
            OggzReader *reader) {

229
  OggzBufferedPacket *p = oggz_malloc(sizeof(OggzBufferedPacket));
230 231
  if (p == NULL) return NULL;

232
  memcpy(&(p->packet), packet, sizeof(ogg_packet));
233
  p->packet.packet = oggz_malloc(packet->bytes);
234 235 236 237 238 239 240 241 242 243 244 245 246
  memcpy(p->packet.packet, packet->packet, packet->bytes);

  p->calced_granulepos = granulepos;
  p->stream = stream;
  p->serialno = serialno;
  p->reader = reader;
  p->oggz = oggz;

  return p;
}

void
oggz_read_free_pbuffer_entry(OggzBufferedPacket *p) {
conrad's avatar
conrad committed
247
  
248 249
  oggz_free(p->packet.packet);
  oggz_free(p);
250 251 252 253 254 255 256 257 258 259

}

OggzDListIterResponse
oggz_read_update_gp(void *elem) {

  OggzBufferedPacket *p = (OggzBufferedPacket *)elem;

  if (p->calced_granulepos == -1 && p->stream->last_granulepos != -1) {
    int content = oggz_stream_get_content(p->oggz, p->serialno);
conrad's avatar
conrad committed
260
    p->calced_granulepos = 
261 262
      oggz_auto_calculate_gp_backwards(content, p->stream->last_granulepos,
      p->stream, &(p->packet), p->stream->last_packet);
conrad's avatar
conrad committed
263
      
264 265 266 267 268 269 270 271 272 273 274 275 276
    p->stream->last_granulepos = p->calced_granulepos;
    p->stream->last_packet = &(p->packet);
  }

  return DLIST_ITER_CONTINUE;

}

OggzDListIterResponse
oggz_read_deliver_packet(void *elem) {

  OggzBufferedPacket *p = (OggzBufferedPacket *)elem;
  ogg_int64_t gp_stored;
277
  ogg_int64_t unit_stored;
278 279 280 281 282 283 284 285 286 287 288 289 290 291

  if (p->calced_granulepos == -1) {
    return DLIST_ITER_CANCEL;
  }

  gp_stored = p->reader->current_granulepos;
  unit_stored = p->reader->current_unit;

  p->reader->current_granulepos = p->calced_granulepos;

  p->reader->current_unit =
    oggz_get_unit (p->oggz, p->serialno, p->calced_granulepos);

  if (p->stream->read_packet) {
conrad's avatar
conrad committed
292
    p->stream->read_packet(p->oggz, &(p->packet), p->serialno, 
293 294
            p->stream->read_user_data);
  } else if (p->reader->read_packet) {
conrad's avatar
conrad committed
295
    p->reader->read_packet(p->oggz, &(p->packet), p->serialno, 
296 297 298 299 300 301 302 303 304 305 306
            p->reader->read_user_data);
  }

  p->reader->current_granulepos = gp_stored;
  p->reader->current_unit = unit_stored;

  oggz_read_free_pbuffer_entry(p);

  return DLIST_ITER_CONTINUE;
}

307
static int
andre's avatar
andre committed
308 309 310 311 312 313 314 315 316 317 318 319
oggz_read_sync (OGGZ * oggz)
{
  OggzReader * reader = &oggz->x.reader;

  oggz_stream_t * stream;
  ogg_stream_state * os;
  ogg_packet * op;
  long serialno;

  ogg_packet packet;
  ogg_page og;

320 321
  int cb_ret = 0;

andre's avatar
andre committed
322 323 324 325 326
  /*os = &reader->ogg_stream;*/
  op = &packet;

  /* handle one packet.  Try to fetch it from current stream state */
  /* extract packets from page */
327
  while(cb_ret == 0) {
andre's avatar
andre committed
328 329

    if (reader->current_serialno != -1) {
330 331
    /* process a packet if we can.  If the machine isn't loaded,
       neither is a page */
332 333 334
      while(cb_ret == 0) {
        ogg_int64_t granulepos;
        int result;
andre's avatar
andre committed
335

336
        serialno = reader->current_serialno;
andre's avatar
andre committed
337

338
        stream = oggz_get_stream (oggz, serialno);
339

340
        if (stream == NULL) {
conrad's avatar
conrad committed
341 342 343 344 345
          /* new stream ... check bos etc. */
          if ((stream = oggz_add_stream (oggz, serialno)) == NULL) {
            /* error -- could not add stream */
            return -7;
          }
346 347
        }
        os = &stream->ogg_stream;
348

349
        result = ogg_stream_packetout(os, op);
andre's avatar
andre committed
350

351 352 353 354
        /*
         * libogg flags "holes in the data" (which are really inconsistencies
         * in the page sequence number) by returning -1.
         */
355
        if(result == -1) {
356
#ifdef DEBUG
conrad's avatar
conrad committed
357
          printf ("oggz_read_sync: hole in the data\n");
358
#endif
359 360 361 362 363 364
          /* We can't tolerate holes in headers, so bail out. */
          if (stream->packetno < 3) return OGGZ_ERR_HOLE_IN_DATA;

          /* Holes in content occur in some files and pretty much don't matter,
           * so we silently swallow the notification and reget the packet.
           */
365 366
          result = ogg_stream_packetout(os, op);
          if (result == -1) {
367 368
            /* If the result is *still* -1 then something strange is
             * happening.
369
             */
370 371
#ifdef DEBUG
            printf ("Multiple holes in data!");
372
#endif
373
            return OGGZ_ERR_HOLE_IN_DATA;
374 375
          }
        }
andre's avatar
andre committed
376

377 378
        if(result > 0){
          int content;
379 380

          stream->packetno++;
conrad's avatar
conrad committed
381
          
conrad's avatar
conrad committed
382 383
          /* got a packet.  process it */
          granulepos = op->granulepos;
andre's avatar
andre committed
384

385
          content = oggz_stream_get_content(oggz, serialno);
conrad's avatar
conrad committed
386
  
387 388
          /*
           * if we have no metrics for this stream yet, then generate them
conrad's avatar
conrad committed
389 390
           */      
          if 
391
          (
conrad's avatar
conrad committed
392 393
            (!stream->metric || (content == OGGZ_CONTENT_SKELETON)) 
            && 
394
            (oggz->flags & OGGZ_AUTO)
conrad's avatar
conrad committed
395
          ) 
396
          {
397
            oggz_auto_read_bos_packet (oggz, op, serialno, NULL);
conrad's avatar
conrad committed
398
          }
399 400 401

          /* attempt to determine granulepos for this packet */
          if (oggz->flags & OGGZ_AUTO) {
conrad's avatar
conrad committed
402 403
            reader->current_granulepos = 
              oggz_auto_calculate_granulepos (content, granulepos, stream, op); 
404 405 406 407 408
            /* make sure that we accept any "real" gaps in the granulepos
             */
            if (granulepos != -1 && reader->current_granulepos < granulepos) {
              reader->current_granulepos = granulepos;
            }
409 410 411 412
          } else {
            reader->current_granulepos = granulepos;
          }
          stream->last_granulepos = reader->current_granulepos;
conrad's avatar
conrad committed
413
        
conrad's avatar
conrad committed
414
          /* set unit on last packet of page */
conrad's avatar
conrad committed
415
          if 
416 417
          (
            (oggz->metric || stream->metric) && reader->current_granulepos != -1
conrad's avatar
conrad committed
418
          ) 
419
          {
conrad's avatar
conrad committed
420 421 422 423
            reader->current_unit =
              oggz_get_unit (oggz, serialno, reader->current_granulepos);
          }

424 425 426
          if (stream->packetno == 1) {
            oggz_auto_read_comments (oggz, stream, serialno, op);
          }
conrad's avatar
conrad committed
427
          
428
          if (oggz->flags & OGGZ_AUTO) {
conrad's avatar
conrad committed
429
          
430
            /*
conrad's avatar
conrad committed
431
             * while we are getting invalid granulepos values, store the 
432 433
             * incoming packets in a dlist */
            if (reader->current_granulepos == -1) {
434
              OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
conrad's avatar
conrad committed
435
                                oggz, &packet, reader->current_granulepos, 
436
                                serialno, stream, reader);
437 438 439

              oggz_dlist_append(oggz->packet_buffer, p);
              continue;
440 441 442 443 444 445 446 447 448 449 450 451 452
            } else if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
              /*
               * move backward through the list assigning gp values based upon
               * the granulepos we just recieved.  Then move forward through
               * the list delivering any packets at the beginning with valid
               * gp values
               */
              ogg_int64_t gp_stored = stream->last_granulepos;
              stream->last_packet = &packet;
              oggz_dlist_reverse_iter(oggz->packet_buffer, oggz_read_update_gp);
              oggz_dlist_deliter(oggz->packet_buffer, oggz_read_deliver_packet);

              /*
conrad's avatar
conrad committed
453
               * fix up the stream granulepos 
454 455 456 457 458
               */
              stream->last_granulepos = gp_stored;

              if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
                OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
conrad's avatar
conrad committed
459
                                oggz, &packet, reader->current_granulepos, 
460 461 462 463 464
                                serialno, stream, reader);

                oggz_dlist_append(oggz->packet_buffer, p);
                continue;
              }
465 466 467
            }
          }

conrad's avatar
conrad committed
468 469 470 471 472 473 474
          if (stream->read_packet) {
            cb_ret =
              stream->read_packet (oggz, op, serialno, stream->read_user_data);
          } else if (reader->read_packet) {
            cb_ret =
              reader->read_packet (oggz, op, serialno, reader->read_user_data);
          }
475 476 477 478 479 480

          /* Mark this stream as having delivered a non b_o_s packet if so.
           * In the case where there is no packet reading callback, this is
           * also valid as the page reading callback has already been called.
           */
          if (!op->b_o_s) stream->delivered_non_b_o_s = 1;
481 482
        }
        else
conrad's avatar
conrad committed
483
          break;
andre's avatar
andre committed
484 485
      }
    }
486

487
    /* If we've got a stop already, don't read more data in */
488
    if (cb_ret == OGGZ_STOP_OK || cb_ret == OGGZ_STOP_ERR) return cb_ret;
andre's avatar
andre committed
489

conrad's avatar
conrad committed
490
    if(oggz_read_get_next_page (oggz, &og) < 0)
491
      return OGGZ_READ_EMPTY; /* eof. leave uninitialized */
andre's avatar
andre committed
492

493 494 495 496
    serialno = ogg_page_serialno (&og);
    reader->current_serialno = serialno; /* XXX: maybe not necessary */

    stream = oggz_get_stream (oggz, serialno);
497

498 499 500
    if (stream == NULL) {
      /* new stream ... check bos etc. */
      if ((stream = oggz_add_stream (oggz, serialno)) == NULL) {
conrad's avatar
conrad committed
501 502
        /* error -- could not add stream */
        return -7;
andre's avatar
andre committed
503
      }
504

505
      /* identify stream type */
506
      oggz_auto_identify_page (oggz, &og, serialno);
507 508 509 510

      /* read bos data */
      if (oggz->flags & OGGZ_AUTO)
        oggz_auto_read_bos_page (oggz, &og, serialno, NULL);
511 512 513 514 515 516
    }
    else if (oggz_stream_get_content(oggz, serialno) == OGGZ_CONTENT_ANXDATA)
    {
      /*
       * re-identify ANXDATA streams as these are now content streams
       */
517
      oggz_auto_identify_page (oggz, &og, serialno);
518
    }
conrad's avatar
conrad committed
519
    
520
    os = &stream->ogg_stream;
andre's avatar
andre committed
521

522
    {
523 524 525
      ogg_int64_t granulepos;

      granulepos = ogg_page_granulepos (&og);
526
      stream->page_granulepos = granulepos;
527

528
      if ((oggz->metric || stream->metric) && granulepos != -1) {
529
       reader->current_unit = oggz_get_unit (oggz, serialno, granulepos);
530
      } else if (granulepos == 0) {
531
       reader->current_unit = 0;
andre's avatar
andre committed
532
      }
533
    }
534

535 536
    if (stream->read_page) {
      cb_ret =
conrad's avatar
conrad committed
537
        stream->read_page (oggz, &og, serialno, stream->read_page_user_data);
538
    } else if (reader->read_page) {
conrad's avatar
conrad committed
539 540
      cb_ret =
        reader->read_page (oggz, &og, serialno, reader->read_page_user_data);
541
    }
andre's avatar
andre committed
542

543
    ogg_stream_pagein(os, &og);
andre's avatar
andre committed
544 545
  }

546
  return cb_ret;
andre's avatar
andre committed
547 548 549 550 551 552 553 554
}

long
oggz_read (OGGZ * oggz, long n)
{
  OggzReader * reader;
  char * buffer;
  long bytes, bytes_read = 1, remaining = n, nread = 0;
555
  int cb_ret = 0;
andre's avatar
andre committed
556 557 558 559 560 561 562

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

  if (oggz->flags & OGGZ_WRITE) {
    return OGGZ_ERR_INVALID;
  }

563 564
  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
    oggz->cb_next = 0;
565
    return oggz_map_return_value_to_error (cb_ret);
566 567
  }

andre's avatar
andre committed
568 569
  reader = &oggz->x.reader;

570
  cb_ret = oggz_read_sync (oggz);
andre's avatar
andre committed
571

572
  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK &&
conrad's avatar
conrad committed
573
         bytes_read > 0 && remaining > 0) {
574
    bytes = MIN (remaining, CHUNKSIZE);
andre's avatar
andre committed
575
    buffer = ogg_sync_buffer (&reader->ogg_sync, bytes);
conrad's avatar
conrad committed
576
    bytes_read = (long) oggz_io_read (oggz, buffer, bytes);
577 578
    if (bytes_read == OGGZ_ERR_SYSTEM) {
      return OGGZ_ERR_SYSTEM;
andre's avatar
andre committed
579 580
    }

conrad's avatar
 
conrad committed
581 582
    if (bytes_read > 0) {
      ogg_sync_wrote (&reader->ogg_sync, bytes_read);
conrad's avatar
conrad committed
583
      
conrad's avatar
 
conrad committed
584 585
      remaining -= bytes_read;
      nread += bytes_read;
conrad's avatar
conrad committed
586
      
conrad's avatar
 
conrad committed
587 588
      cb_ret = oggz_read_sync (oggz);
    }
andre's avatar
andre committed
589 590
  }

591
  if (cb_ret == OGGZ_STOP_ERR) oggz_purge (oggz);
592

593
  /* Don't return 0 unless it's actually an EOF condition */
594
  if (nread == 0) {
conrad's avatar
conrad committed
595 596 597 598 599 600 601
    switch (bytes_read) {
    case OGGZ_ERR_IO_AGAIN:
    case OGGZ_ERR_SYSTEM:
      return bytes_read; break;
    default: break;
    }

602 603 604 605 606
    if (cb_ret == OGGZ_READ_EMPTY) {
      return 0;
    } else {
      return oggz_map_return_value_to_error (cb_ret);
    }
607 608 609 610

  } else {
    if (cb_ret == OGGZ_READ_EMPTY) cb_ret = OGGZ_CONTINUE;
    oggz->cb_next = cb_ret;
611
  }
612

andre's avatar
andre committed
613 614 615 616 617 618 619 620 621 622
  return nread;
}

/* generic */
long
oggz_read_input (OGGZ * oggz, unsigned char * buf, long n)
{
  OggzReader * reader;
  char * buffer;
  long bytes, remaining = n, nread = 0;
623
  int cb_ret = 0;
andre's avatar
andre committed
624 625 626 627 628 629 630

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

  if (oggz->flags & OGGZ_WRITE) {
    return OGGZ_ERR_INVALID;
  }

631 632
  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
    oggz->cb_next = 0;
633
    return oggz_map_return_value_to_error (cb_ret);
634 635
  }

andre's avatar
andre committed
636 637
  reader = &oggz->x.reader;

638 639
  cb_ret = oggz_read_sync (oggz);

640
  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK  &&
conrad's avatar
conrad committed
641
         /* !oggz->eos && */ remaining > 0) {
andre's avatar
andre committed
642 643 644 645 646 647 648 649 650
    bytes = MIN (remaining, 4096);
    buffer = ogg_sync_buffer (&reader->ogg_sync, bytes);
    memcpy (buffer, buf, bytes);
    ogg_sync_wrote (&reader->ogg_sync, bytes);

    buf += bytes;
    remaining -= bytes;
    nread += bytes;

651
    cb_ret = oggz_read_sync (oggz);
andre's avatar
andre committed
652 653
  }

654
  if (cb_ret == OGGZ_STOP_ERR) oggz_purge (oggz);
655

656
  if (nread == 0) {
657 658
    /* Don't return 0 unless it's actually an EOF condition */
    if (cb_ret == OGGZ_READ_EMPTY) {
659
      return OGGZ_ERR_STOP_OK;
660
    } else {
661
      return oggz_map_return_value_to_error (cb_ret);
662
    }
663 664 665
  } else {
    if (cb_ret == OGGZ_READ_EMPTY) cb_ret = OGGZ_CONTINUE;
    oggz->cb_next = cb_ret;
666
  }
667

andre's avatar
andre committed
668 669 670 671 672 673 674 675 676
  return nread;
}


#else /* OGGZ_CONFIG_READ */

#include <ogg/ogg.h>
#include "oggz_private.h"

677 678 679 680 681 682 683 684 685 686 687 688
OGGZ *
oggz_read_init (OGGZ * oggz)
{
  return NULL;
}

OGGZ *
oggz_read_close (OGGZ * oggz)
{
  return NULL;
}

andre's avatar
andre committed
689 690
int
oggz_set_read_callback (OGGZ * oggz, long serialno,
conrad's avatar
conrad committed
691
                        OggzReadPacket read_packet, void * user_data)
andre's avatar
andre committed
692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708
{
  return OGGZ_ERR_DISABLED;
}

long
oggz_read (OGGZ * oggz, long n)
{
  return OGGZ_ERR_DISABLED;
}

long
oggz_read_input (OGGZ * oggz, unsigned char * buf, long n)
{
  return OGGZ_ERR_DISABLED;
}

#endif