oggz_read.c 19.2 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"

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;

84 85 86
  reader->read_page = NULL;
  reader->read_page_user_data = NULL;

andre's avatar
andre committed
87 88
  reader->current_unit = 0;

89 90
  reader->current_page_bytes = 0;

andre's avatar
andre committed
91 92 93 94 95 96 97 98
  return oggz;
}

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

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

  return oggz;
}

int
oggz_set_read_callback (OGGZ * oggz, long serialno,
107
                        OggzReadPacket read_packet, void * user_data)
andre's avatar
andre committed
108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124
{
  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
125 126
    if (stream == NULL)
      stream = oggz_add_stream (oggz, serialno);
127 128
    if (stream == NULL)
      return OGGZ_ERR_OUT_OF_MEMORY;
andre's avatar
andre committed
129 130 131 132 133 134 135 136

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

  return 0;
}

137
int
138
oggz_set_read_page (OGGZ * oggz, long serialno, OggzReadPage read_page,
139
                    void * user_data)
140 141
{
  OggzReader * reader;
142
  oggz_stream_t * stream;
143 144 145 146 147 148 149 150 151

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

  reader =  &oggz->x.reader;

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

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);
159 160
    if (stream == NULL)
      return OGGZ_ERR_OUT_OF_MEMORY;
161 162 163 164

    stream->read_page = read_page;
    stream->read_page_user_data = user_data;
  }
165 166 167 168

  return 0;
}

andre's avatar
andre committed
169
/*
170
 * oggz_read_get_next_page (oggz, og, do_read)
andre's avatar
andre committed
171
 *
172 173
 * 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
174 175 176 177 178 179
 *
 * 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
180
static oggz_off_t
181
oggz_read_get_next_page (OGGZ * oggz, ogg_page * og)
andre's avatar
andre committed
182 183 184
{
  OggzReader * reader = &oggz->x.reader;
  long bytes = 0, more;
conrad's avatar
conrad committed
185
  oggz_off_t page_offset = 0, ret;
andre's avatar
andre committed
186 187
  int found = 0;

188 189 190
  /* Increment oggz->offset by length of the last page processed */
  oggz->offset += reader->current_page_bytes;

andre's avatar
andre committed
191 192 193 194
  do {
    more = ogg_sync_pageseek (&reader->ogg_sync, og);

    if (more == 0) {
195
      /* No page available */
andre's avatar
andre committed
196 197 198
      page_offset = 0;
      return -2;
    } else if (more < 0) {
199
#ifdef DEBUG_VERBOSE
andre's avatar
andre committed
200 201
      printf ("get_next_page: skipped %ld bytes\n", -more);
#endif
202 203
      page_offset += (-more);
      oggz->offset += (-more);
andre's avatar
andre committed
204
    } else {
205
#ifdef DEBUG_VERBOSE
andre's avatar
andre committed
206 207
      printf ("get_next_page: page has %ld bytes\n", more);
#endif
208
      reader->current_page_bytes = more;
andre's avatar
andre committed
209 210 211 212 213
      found = 1;
    }

  } while (!found);

214
#if 0 /* This is now done by the increment at the top of the file */
andre's avatar
andre committed
215 216
  /* Calculate the byte offset of the page which was found */
  if (bytes > 0) {
217
    oggz->offset = oggz_io_tell (oggz) - bytes + page_offset;
andre's avatar
andre committed
218 219 220 221 222 223 224 225
    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;
226 227 228
#else
  return oggz->offset;
#endif
andre's avatar
andre committed
229 230
}

231 232 233 234 235 236 237 238 239 240
typedef struct {
  ogg_packet      packet;
  ogg_int64_t     calced_granulepos;
  oggz_stream_t * stream;
  OggzReader    * reader;
  OGGZ          * oggz;
  long            serialno;
} OggzBufferedPacket;

OggzBufferedPacket *
241 242
oggz_read_new_pbuffer_entry(OGGZ *oggz, ogg_packet *packet, 
            ogg_int64_t granulepos, long serialno, oggz_stream_t * stream, 
243 244
            OggzReader *reader) {

245
  OggzBufferedPacket *p = oggz_malloc(sizeof(OggzBufferedPacket));
246 247
  if (p == NULL) return NULL;

248
  memcpy(&(p->packet), packet, sizeof(ogg_packet));
249
  p->packet.packet = oggz_malloc(packet->bytes);
250 251 252 253 254 255 256 257 258 259 260 261 262
  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) {
263
  
264 265
  oggz_free(p->packet.packet);
  oggz_free(p);
266 267 268 269 270 271 272 273 274 275

}

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);
276
    p->calced_granulepos = 
277 278
      oggz_auto_calculate_gp_backwards(content, p->stream->last_granulepos,
      p->stream, &(p->packet), p->stream->last_packet);
279
      
280 281 282 283 284 285 286 287 288 289 290 291 292
    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;
293
  ogg_int64_t unit_stored;
294 295 296 297 298 299 300 301 302 303 304 305 306 307

  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) {
308
    p->stream->read_packet(p->oggz, &(p->packet), p->serialno, 
309 310
            p->stream->read_user_data);
  } else if (p->reader->read_packet) {
311
    p->reader->read_packet(p->oggz, &(p->packet), p->serialno, 
312 313 314 315 316 317 318 319 320 321 322
            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;
}

323
static int
andre's avatar
andre committed
324 325 326 327 328 329 330 331 332 333 334 335
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;

336 337
  int cb_ret = 0;

andre's avatar
andre committed
338 339 340 341 342
  /*os = &reader->ogg_stream;*/
  op = &packet;

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

    if (reader->current_serialno != -1) {
346 347
    /* process a packet if we can.  If the machine isn't loaded,
       neither is a page */
348 349 350
      while(cb_ret == 0) {
        ogg_int64_t granulepos;
        int result;
andre's avatar
andre committed
351

352
        serialno = reader->current_serialno;
andre's avatar
andre committed
353

354
        stream = oggz_get_stream (oggz, serialno);
355

356
        if (stream == NULL) {
357 358 359
          /* new stream ... check bos etc. */
          if ((stream = oggz_add_stream (oggz, serialno)) == NULL) {
            /* error -- could not add stream */
360
            return OGGZ_ERR_OUT_OF_MEMORY;
361
          }
362 363
        }
        os = &stream->ogg_stream;
364

365
        result = ogg_stream_packetout(os, op);
andre's avatar
andre committed
366

367 368 369 370
        /*
         * libogg flags "holes in the data" (which are really inconsistencies
         * in the page sequence number) by returning -1.
         */
371
        if(result == -1) {
372
#ifdef DEBUG
373
          printf ("oggz_read_sync: hole in the data\n");
374
#endif
375 376 377 378
          /* We can't tolerate holes in headers, so bail out. NB. as stream->packetno
           * has not yet been incremented, the current value refers to how many packets
           * have been processed prior to this one. */
          if (stream->packetno < 2) return OGGZ_ERR_HOLE_IN_DATA;
379 380 381 382

          /* Holes in content occur in some files and pretty much don't matter,
           * so we silently swallow the notification and reget the packet.
           */
383 384
          result = ogg_stream_packetout(os, op);
          if (result == -1) {
385 386
            /* If the result is *still* -1 then something strange is
             * happening.
387
             */
388 389
#ifdef DEBUG
            printf ("Multiple holes in data!");
390
#endif
391
            return OGGZ_ERR_HOLE_IN_DATA;
392 393
          }
        }
andre's avatar
andre committed
394

395 396
        if(result > 0){
          int content;
397 398

          stream->packetno++;
399
          
400 401
          /* got a packet.  process it */
          granulepos = op->granulepos;
andre's avatar
andre committed
402

403
          content = oggz_stream_get_content(oggz, serialno);
404
  
405 406
          /*
           * if we have no metrics for this stream yet, then generate them
407 408
           */      
          if 
409
          (
410 411
            (!stream->metric || (content == OGGZ_CONTENT_SKELETON)) 
            && 
412
            (oggz->flags & OGGZ_AUTO)
413
          ) 
414
          {
415
            oggz_auto_read_bos_packet (oggz, op, serialno, NULL);
416
          }
417 418 419

          /* attempt to determine granulepos for this packet */
          if (oggz->flags & OGGZ_AUTO) {
420 421
            reader->current_granulepos = 
              oggz_auto_calculate_granulepos (content, granulepos, stream, op); 
422 423 424 425 426
            /* make sure that we accept any "real" gaps in the granulepos
             */
            if (granulepos != -1 && reader->current_granulepos < granulepos) {
              reader->current_granulepos = granulepos;
            }
427 428 429 430
          } else {
            reader->current_granulepos = granulepos;
          }
          stream->last_granulepos = reader->current_granulepos;
431
        
432
          /* set unit on last packet of page */
433
          if 
434 435
          (
            (oggz->metric || stream->metric) && reader->current_granulepos != -1
436
          ) 
437
          {
438 439 440 441
            reader->current_unit =
              oggz_get_unit (oggz, serialno, reader->current_granulepos);
          }

442 443 444
          if (stream->packetno == 1) {
            oggz_auto_read_comments (oggz, stream, serialno, op);
          }
445
          
446
          if (oggz->flags & OGGZ_AUTO) {
447
          
448
            /*
449
             * while we are getting invalid granulepos values, store the 
450 451
             * incoming packets in a dlist */
            if (reader->current_granulepos == -1) {
452
              OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
453
                                oggz, &packet, reader->current_granulepos, 
454
                                serialno, stream, reader);
455 456 457

              oggz_dlist_append(oggz->packet_buffer, p);
              continue;
458 459 460 461 462 463 464 465 466 467 468 469 470
            } 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);

              /*
471
               * fix up the stream granulepos 
472 473 474 475 476
               */
              stream->last_granulepos = gp_stored;

              if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
                OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
477
                                oggz, &packet, reader->current_granulepos, 
478 479 480 481 482
                                serialno, stream, reader);

                oggz_dlist_append(oggz->packet_buffer, p);
                continue;
              }
483 484 485
            }
          }

486 487 488 489 490 491 492
          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);
          }
493 494 495 496 497 498

          /* 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;
499 500
        }
        else
501
          break;
andre's avatar
andre committed
502 503
      }
    }
504

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

508
    if(oggz_read_get_next_page (oggz, &og) < 0)
509
      return OGGZ_READ_EMPTY; /* eof. leave uninitialized */
andre's avatar
andre committed
510

511 512 513 514
    serialno = ogg_page_serialno (&og);
    reader->current_serialno = serialno; /* XXX: maybe not necessary */

    stream = oggz_get_stream (oggz, serialno);
515

516 517 518
    if (stream == NULL) {
      /* new stream ... check bos etc. */
      if ((stream = oggz_add_stream (oggz, serialno)) == NULL) {
519
        /* error -- could not add stream */
520
        return OGGZ_ERR_OUT_OF_MEMORY;
andre's avatar
andre committed
521
      }
522

523
      /* identify stream type */
524
      oggz_auto_identify_page (oggz, &og, serialno);
525 526 527 528

      /* read bos data */
      if (oggz->flags & OGGZ_AUTO)
        oggz_auto_read_bos_page (oggz, &og, serialno, NULL);
529 530 531 532 533 534
    }
    else if (oggz_stream_get_content(oggz, serialno) == OGGZ_CONTENT_ANXDATA)
    {
      /*
       * re-identify ANXDATA streams as these are now content streams
       */
535
      oggz_auto_identify_page (oggz, &og, serialno);
536
    }
537
    
538
    os = &stream->ogg_stream;
andre's avatar
andre committed
539

540
    {
541 542 543
      ogg_int64_t granulepos;

      granulepos = ogg_page_granulepos (&og);
544
      stream->page_granulepos = granulepos;
545

546
      if ((oggz->metric || stream->metric) && granulepos != -1) {
547
       reader->current_unit = oggz_get_unit (oggz, serialno, granulepos);
548
      } else if (granulepos == 0) {
549
       reader->current_unit = 0;
andre's avatar
andre committed
550
      }
551
    }
552

553 554
    if (stream->read_page) {
      cb_ret =
555
        stream->read_page (oggz, &og, serialno, stream->read_page_user_data);
556
    } else if (reader->read_page) {
557 558
      cb_ret =
        reader->read_page (oggz, &og, serialno, reader->read_page_user_data);
559
    }
andre's avatar
andre committed
560

561
    ogg_stream_pagein(os, &og);
andre's avatar
andre committed
562 563
  }

564
  return cb_ret;
andre's avatar
andre committed
565 566 567 568 569 570 571 572
}

long
oggz_read (OGGZ * oggz, long n)
{
  OggzReader * reader;
  char * buffer;
  long bytes, bytes_read = 1, remaining = n, nread = 0;
573
  int cb_ret = 0;
andre's avatar
andre committed
574 575 576 577 578 579 580

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

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

581 582
  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
    oggz->cb_next = 0;
583
    return oggz_map_return_value_to_error (cb_ret);
584 585
  }

andre's avatar
andre committed
586 587
  reader = &oggz->x.reader;

588
  cb_ret = oggz_read_sync (oggz);
589 590
  if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
    return cb_ret;
andre's avatar
andre committed
591

592
  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK &&
593
         bytes_read > 0 && remaining > 0) {
594
    bytes = MIN (remaining, CHUNKSIZE);
andre's avatar
andre committed
595
    buffer = ogg_sync_buffer (&reader->ogg_sync, bytes);
596
    bytes_read = (long) oggz_io_read (oggz, buffer, bytes);
597 598
    if (bytes_read == OGGZ_ERR_SYSTEM) {
      return OGGZ_ERR_SYSTEM;
andre's avatar
andre committed
599 600
    }

601 602
    if (bytes_read > 0) {
      ogg_sync_wrote (&reader->ogg_sync, bytes_read);
603
      
604 605
      remaining -= bytes_read;
      nread += bytes_read;
606
      
607
      cb_ret = oggz_read_sync (oggz);
608 609
      if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
        return cb_ret;
610
    }
andre's avatar
andre committed
611 612
  }

613
  if (cb_ret == OGGZ_STOP_ERR) oggz_purge (oggz);
614

615
  /* Don't return 0 unless it's actually an EOF condition */
616
  if (nread == 0) {
conrad's avatar
conrad committed
617 618 619 620 621 622 623
    switch (bytes_read) {
    case OGGZ_ERR_IO_AGAIN:
    case OGGZ_ERR_SYSTEM:
      return bytes_read; break;
    default: break;
    }

624 625 626 627 628
    if (cb_ret == OGGZ_READ_EMPTY) {
      return 0;
    } else {
      return oggz_map_return_value_to_error (cb_ret);
    }
629 630 631 632

  } else {
    if (cb_ret == OGGZ_READ_EMPTY) cb_ret = OGGZ_CONTINUE;
    oggz->cb_next = cb_ret;
633
  }
634

andre's avatar
andre committed
635 636 637 638 639 640 641 642 643 644
  return nread;
}

/* generic */
long
oggz_read_input (OGGZ * oggz, unsigned char * buf, long n)
{
  OggzReader * reader;
  char * buffer;
  long bytes, remaining = n, nread = 0;
645
  int cb_ret = 0;
andre's avatar
andre committed
646 647 648 649 650 651 652

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

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

653 654
  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
    oggz->cb_next = 0;
655
    return oggz_map_return_value_to_error (cb_ret);
656 657
  }

andre's avatar
andre committed
658 659
  reader = &oggz->x.reader;

660
  cb_ret = oggz_read_sync (oggz);
661 662
  if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
    return cb_ret;
663

664
  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK  &&
665
         /* !oggz->eos && */ remaining > 0) {
andre's avatar
andre committed
666 667 668 669 670 671 672 673 674
    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;

675
    cb_ret = oggz_read_sync (oggz);
676 677
    if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
      return cb_ret;
andre's avatar
andre committed
678 679
  }

680
  if (cb_ret == OGGZ_STOP_ERR) oggz_purge (oggz);
681

682
  if (nread == 0) {
683 684
    /* Don't return 0 unless it's actually an EOF condition */
    if (cb_ret == OGGZ_READ_EMPTY) {
685
      return OGGZ_ERR_STOP_OK;
686
    } else {
687
      return oggz_map_return_value_to_error (cb_ret);
688
    }
689 690 691
  } else {
    if (cb_ret == OGGZ_READ_EMPTY) cb_ret = OGGZ_CONTINUE;
    oggz->cb_next = cb_ret;
692
  }
693

andre's avatar
andre committed
694 695 696 697 698 699 700 701 702
  return nread;
}


#else /* OGGZ_CONFIG_READ */

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

703 704 705 706 707 708 709 710 711 712 713 714
OGGZ *
oggz_read_init (OGGZ * oggz)
{
  return NULL;
}

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

andre's avatar
andre committed
715 716
int
oggz_set_read_callback (OGGZ * oggz, long serialno,
717
                        OggzReadPacket read_packet, void * user_data)
andre's avatar
andre committed
718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734
{
  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