oggz_read.c 21 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
#include "oggz/oggz_packet.h"
64
#include "oggz/oggz_stream.h"
65

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

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

71
#define OGGZ_READ_EMPTY (-404)
72

andre's avatar
andre committed
73 74 75 76 77 78 79 80 81 82 83 84
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;

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

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

90 91
  reader->current_page_bytes = 0;

92 93 94
  reader->current_packet_begin_page_offset = 0;
  reader->current_packet_pages = 0;

andre's avatar
andre committed
95 96 97 98 99 100 101 102
  return oggz;
}

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

103
  ogg_stream_clear (&reader->ogg_stream);
andre's avatar
andre committed
104 105 106 107 108 109 110
  ogg_sync_clear (&reader->ogg_sync);

  return oggz;
}

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

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

  return 0;
}

141
int
142
oggz_set_read_page (OGGZ * oggz, long serialno, OggzReadPage read_page,
143
                    void * user_data)
144 145
{
  OggzReader * reader;
146
  oggz_stream_t * stream;
147 148 149 150 151 152 153 154 155

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

  reader =  &oggz->x.reader;

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

156 157 158 159 160 161 162
  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);
163 164
    if (stream == NULL)
      return OGGZ_ERR_OUT_OF_MEMORY;
165 166 167 168

    stream->read_page = read_page;
    stream->read_page_user_data = user_data;
  }
169 170 171 172

  return 0;
}

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

191
  /* Increment oggz->offset by length of the last page processed */
192 193 194 195
#ifdef DEBUG_VERBOSE
  printf ("%s: incrementing oggz->offset (0x%llx) by 0x%lx\n", __func__,
          oggz->offset, reader->current_page_bytes);
#endif
196 197
  oggz->offset += reader->current_page_bytes;

andre's avatar
andre committed
198 199 200 201
  do {
    more = ogg_sync_pageseek (&reader->ogg_sync, og);

    if (more == 0) {
202
      /* No page available */
andre's avatar
andre committed
203 204
      return -2;
    } else if (more < 0) {
205
#ifdef DEBUG_VERBOSE
206
  printf ("%s: skipping; incrementing oggz->offset by 0x%lx bytes\n", __func__, -more);
andre's avatar
andre committed
207
#endif
208
      oggz->offset += (-more);
andre's avatar
andre committed
209
    } else {
210
#ifdef DEBUG_VERBOSE
andre's avatar
andre committed
211 212
      printf ("get_next_page: page has %ld bytes\n", more);
#endif
213
      reader->current_page_bytes = more;
andre's avatar
andre committed
214 215 216 217 218
      found = 1;
    }

  } while (!found);

219
  return oggz->offset;
andre's avatar
andre committed
220 221
}

222
typedef struct {
223
  oggz_packet     zp;
224 225 226 227 228 229 230
  oggz_stream_t * stream;
  OggzReader    * reader;
  OGGZ          * oggz;
  long            serialno;
} OggzBufferedPacket;

OggzBufferedPacket *
231
oggz_read_new_pbuffer_entry(OGGZ *oggz, oggz_packet * zp, 
232 233
                            long serialno, oggz_stream_t * stream, 
                            OggzReader *reader)
234 235 236
{
  OggzBufferedPacket *p;
  ogg_packet * op = &zp->op;
237

238 239 240
  if ((p = oggz_malloc(sizeof(OggzBufferedPacket))) == NULL)
    return NULL;
  memcpy(&(p->zp), zp, sizeof(oggz_packet));
241

242 243 244 245 246
  if ((p->zp.op.packet = oggz_malloc(op->bytes)) == NULL) {
    oggz_free (p);
    return NULL;
  }
  memcpy(p->zp.op.packet, op->packet, op->bytes);
247 248 249 250 251 252 253 254 255 256

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

  return p;
}

void
257 258 259
oggz_read_free_pbuffer_entry(OggzBufferedPacket *p)
{
  oggz_free(p->zp.op.packet);
260
  oggz_free(p);
261 262 263 264 265 266 267
}

OggzDListIterResponse
oggz_read_update_gp(void *elem) {

  OggzBufferedPacket *p = (OggzBufferedPacket *)elem;

268
  if (p->zp.pos.calc_granulepos == -1 && p->stream->last_granulepos != -1) {
269
    int content = oggz_stream_get_content(p->oggz, p->serialno);
270 271 272 273 274 275

    /* Cancel the iteration (backwards through buffered packets)
     * if we don't know the codec */
    if (content < 0 || content >= OGGZ_CONTENT_UNKNOWN)
      return DLIST_ITER_CANCEL;

276
    p->zp.pos.calc_granulepos = 
277
      oggz_auto_calculate_gp_backwards(content, p->stream->last_granulepos,
278 279
                                       p->stream, &(p->zp.op),
                                       p->stream->last_packet);
280
      
281
    p->stream->last_granulepos = p->zp.pos.calc_granulepos;
282
    p->stream->last_packet = &(p->zp.op);
283 284 285 286 287 288 289 290 291 292
  }

  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
  if (p->zp.pos.calc_granulepos == -1) {
296 297 298 299 300 301
    return DLIST_ITER_CANCEL;
  }

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

302
  p->reader->current_granulepos = p->zp.pos.calc_granulepos;
303 304

  p->reader->current_unit =
305
    oggz_get_unit (p->oggz, p->serialno, p->zp.pos.calc_granulepos);
306 307

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

  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
oggz_read_sync (OGGZ * oggz)
{
  OggzReader * reader = &oggz->x.reader;

  oggz_stream_t * stream;
  ogg_stream_state * os;
  ogg_packet * op;
331
  oggz_position * pos;
andre's avatar
andre committed
332 333
  long serialno;

334
  oggz_packet packet;
andre's avatar
andre committed
335 336
  ogg_page og;

337 338
  int cb_ret = 0;

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

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

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

354
        serialno = reader->current_serialno;
andre's avatar
andre committed
355

356
        stream = oggz_get_stream (oggz, serialno);
357

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

367
        result = ogg_stream_packetout(os, op);
andre's avatar
andre committed
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

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

          /* Reset the position of the next page. */
          reader->current_packet_pages = 1;
          reader->current_packet_begin_page_offset = oggz->offset;
394
          reader->current_packet_begin_segment_index = 1;
395
        }
andre's avatar
andre committed
396

397 398
        if(result > 0){
          int content;
399 400

          stream->packetno++;
401
          
402
          /* Got a packet.  process it ... */
403
          granulepos = op->granulepos;
andre's avatar
andre committed
404

405
          content = oggz_stream_get_content(oggz, serialno);
406 407 408 409 410 411 412 413
          if (content < 0 || content >= OGGZ_CONTENT_UNKNOWN) {
            reader->current_granulepos = granulepos;
	  } else {
            /* if we have no metrics for this stream yet, then generate them */      
            if ((!stream->metric || content == OGGZ_CONTENT_SKELETON) && 
                (oggz->flags & OGGZ_AUTO)) {
              oggz_auto_read_bos_packet (oggz, op, serialno, NULL);
            }
414

415 416 417 418 419 420 421 422 423
            /* attempt to determine granulepos for this packet */
            if (oggz->flags & OGGZ_AUTO) {
              reader->current_granulepos = 
                oggz_auto_calculate_granulepos (content, granulepos, stream, op); 
              /* make sure that we accept any "real" gaps in the granulepos */
              if (granulepos != -1 && reader->current_granulepos < granulepos) {
                reader->current_granulepos = granulepos;
              }
            } else {
424 425
              reader->current_granulepos = granulepos;
            }
426 427
	  }

428
          stream->last_granulepos = reader->current_granulepos;
429
        
430 431
          /* Set unit on last packet of page */
          if ((oggz->metric || stream->metric) && reader->current_granulepos != -1) {
432 433 434 435
            reader->current_unit =
              oggz_get_unit (oggz, serialno, reader->current_granulepos);
          }

436 437 438
          if (stream->packetno == 1) {
            oggz_auto_read_comments (oggz, stream, serialno, op);
          }
439
          
440 441 442 443 444
          /* Fill in position information. */
          pos->calc_granulepos = reader->current_granulepos;
          pos->begin_page_offset = reader->current_packet_begin_page_offset;
          pos->end_page_offset = oggz->offset;
          pos->pages = reader->current_packet_pages;
445
          pos->begin_segment_index = reader->current_packet_begin_segment_index;
446 447

          /* Handle reverse buffering */
448
          if (oggz->flags & OGGZ_AUTO) {
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;
453

454 455
              p = oggz_read_new_pbuffer_entry (oggz, &packet,
                                               serialno, stream, reader);
456
              oggz_dlist_append(oggz->packet_buffer, p);
457

458
              goto prepare_position;
459
            } else if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
460
              /* Move backward through the list assigning gp values based upon
461 462
               * the granulepos we just recieved.  Then move forward through
               * the list delivering any packets at the beginning with valid
463
               * gp values.
464 465
               */
              ogg_int64_t gp_stored = stream->last_granulepos;
466
              stream->last_packet = op;
467 468 469
              oggz_dlist_reverse_iter(oggz->packet_buffer, oggz_read_update_gp);
              oggz_dlist_deliter(oggz->packet_buffer, oggz_read_deliver_packet);

470
              /* Fix up the stream granulepos. */
471 472 473
              stream->last_granulepos = gp_stored;

              if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
474 475 476 477
                OggzBufferedPacket *p;

                p = oggz_read_new_pbuffer_entry(oggz, &packet,
                                                serialno, stream, reader);
478 479

                oggz_dlist_append(oggz->packet_buffer, p);
480

481
                goto prepare_position;
482
              }
483 484 485
            }
          }

486 487 488
#ifdef DEBUG_VERBOSE
          printf ("%s: set begin_page to %llx, calling read_packet\n", __func__, pos->begin_page_offset);
#endif
489

490 491
          if (stream->read_packet) {
            cb_ret =
492
              stream->read_packet (oggz, &packet, serialno, stream->read_user_data);
493 494
          } else if (reader->read_packet) {
            cb_ret =
495
              reader->read_packet (oggz, &packet, serialno, reader->read_user_data);
496
          }
497

498 499 500 501
#ifdef DEBUG_VERBOSE
          fprintf (stdout, "%s: Done packet, setting next begin_page to 0x%llx\n", __func__, oggz->offset);
#endif

502 503
prepare_position:

504
          /* Prepare the position of the next page. */
505 506 507 508 509 510 511 512 513
          if (reader->current_packet_begin_page_offset == oggz->offset) {
            /* The previous packet processed also started on this page */
            reader->current_packet_begin_segment_index++;
          } else {
            /* The previous packet started on an earlier page */
            reader->current_packet_begin_page_offset = oggz->offset;
            reader->current_packet_begin_segment_index = 1;
          }

514 515
          reader->current_packet_pages = 1;

516 517 518 519 520
          /* 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;
521 522
        }
        else
523
          break;
andre's avatar
andre committed
524 525
      }
    }
526

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

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

533
    serialno = ogg_page_serialno (&og);
534
    reader->current_serialno = serialno;
535 536

    stream = oggz_get_stream (oggz, serialno);
537

538 539 540
    if (stream == NULL) {
      /* new stream ... check bos etc. */
      if ((stream = oggz_add_stream (oggz, serialno)) == NULL) {
541
        /* error -- could not add stream */
542
        return OGGZ_ERR_OUT_OF_MEMORY;
andre's avatar
andre committed
543
      }
544

545
      /* identify stream type */
546
      oggz_auto_identify_page (oggz, &og, serialno);
547 548

      /* read bos data */
549
      if (oggz->flags & OGGZ_AUTO) {
550
        oggz_auto_read_bos_page (oggz, &og, serialno, NULL);
551 552 553
      }
    } else if (oggz_stream_get_content(oggz, serialno) == OGGZ_CONTENT_ANXDATA) {
      /* re-identify ANXDATA streams as these are now content streams */
554
      oggz_auto_identify_page (oggz, &og, serialno);
555
    }
556

557
    os = &stream->ogg_stream;
andre's avatar
andre committed
558

559
    {
560 561 562
      ogg_int64_t granulepos;

      granulepos = ogg_page_granulepos (&og);
563
      stream->page_granulepos = granulepos;
564

565
      if ((oggz->metric || stream->metric) && granulepos != -1) {
566
       reader->current_unit = oggz_get_unit (oggz, serialno, granulepos);
567
      } else if (granulepos == 0) {
568
       reader->current_unit = 0;
andre's avatar
andre committed
569
      }
570
    }
571

572 573
    if (stream->read_page) {
      cb_ret =
574
        stream->read_page (oggz, &og, serialno, stream->read_page_user_data);
575
    } else if (reader->read_page) {
576 577
      cb_ret =
        reader->read_page (oggz, &og, serialno, reader->read_page_user_data);
578
    }
andre's avatar
andre committed
579

580
    ogg_stream_pagein(os, &og);
581 582 583 584
    if (ogg_page_continued(&og)) {
      if (reader->current_packet_pages != -1)
        reader->current_packet_pages++;
    } else {
585 586 587
#ifdef DEBUG_VERBOSE
      fprintf (stdout, "%s: New non-cont page, setting next begin_page to 0x%llx\n", __func__, oggz->offset);
#endif
588 589 590
      /* Prepare the position of the next page */
      reader->current_packet_pages = 1;
      reader->current_packet_begin_page_offset = oggz->offset;
591
      reader->current_packet_begin_segment_index = 0;
592
    }
andre's avatar
andre committed
593 594
  }

595
  return cb_ret;
andre's avatar
andre committed
596 597 598 599 600 601 602 603
}

long
oggz_read (OGGZ * oggz, long n)
{
  OggzReader * reader;
  char * buffer;
  long bytes, bytes_read = 1, remaining = n, nread = 0;
604
  int cb_ret = 0;
andre's avatar
andre committed
605 606 607 608 609 610 611

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

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

612 613
  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
    oggz->cb_next = 0;
614
    return oggz_map_return_value_to_error (cb_ret);
615 616
  }

andre's avatar
andre committed
617 618
  reader = &oggz->x.reader;

619
  cb_ret = oggz_read_sync (oggz);
620 621
  if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
    return cb_ret;
andre's avatar
andre committed
622

623
  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK &&
624
         bytes_read > 0 && remaining > 0) {
625
    bytes = MIN (remaining, CHUNKSIZE);
andre's avatar
andre committed
626
    buffer = ogg_sync_buffer (&reader->ogg_sync, bytes);
627
    bytes_read = (long) oggz_io_read (oggz, buffer, bytes);
628 629
    if (bytes_read == OGGZ_ERR_SYSTEM) {
      return OGGZ_ERR_SYSTEM;
andre's avatar
andre committed
630 631
    }

632 633
    if (bytes_read > 0) {
      ogg_sync_wrote (&reader->ogg_sync, bytes_read);
634
      
635 636
      remaining -= bytes_read;
      nread += bytes_read;
637
      
638
      cb_ret = oggz_read_sync (oggz);
639 640
      if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
        return cb_ret;
641
    }
andre's avatar
andre committed
642 643
  }

644
  if (cb_ret == OGGZ_STOP_ERR) oggz_purge (oggz);
645

646
  /* Don't return 0 unless it's actually an EOF condition */
647
  if (nread == 0) {
conrad's avatar
conrad committed
648 649 650 651 652 653 654
    switch (bytes_read) {
    case OGGZ_ERR_IO_AGAIN:
    case OGGZ_ERR_SYSTEM:
      return bytes_read; break;
    default: break;
    }

655 656 657 658 659
    if (cb_ret == OGGZ_READ_EMPTY) {
      return 0;
    } else {
      return oggz_map_return_value_to_error (cb_ret);
    }
660 661 662 663

  } else {
    if (cb_ret == OGGZ_READ_EMPTY) cb_ret = OGGZ_CONTINUE;
    oggz->cb_next = cb_ret;
664
  }
665

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

/* generic */
long
oggz_read_input (OGGZ * oggz, unsigned char * buf, long n)
{
  OggzReader * reader;
  char * buffer;
  long bytes, remaining = n, nread = 0;
676
  int cb_ret = 0;
andre's avatar
andre committed
677 678 679 680 681 682 683

  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;

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

684 685
  if ((cb_ret = oggz->cb_next) != OGGZ_CONTINUE) {
    oggz->cb_next = 0;
686
    return oggz_map_return_value_to_error (cb_ret);
687 688
  }

andre's avatar
andre committed
689 690
  reader = &oggz->x.reader;

691
  cb_ret = oggz_read_sync (oggz);
692 693
  if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
    return cb_ret;
694

695
  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK  &&
696
         /* !oggz->eos && */ remaining > 0) {
andre's avatar
andre committed
697 698 699 700 701 702 703 704 705
    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;

706
    cb_ret = oggz_read_sync (oggz);
707 708
    if (cb_ret == OGGZ_ERR_OUT_OF_MEMORY)
      return cb_ret;
andre's avatar
andre committed
709 710
  }

711
  if (cb_ret == OGGZ_STOP_ERR) oggz_purge (oggz);
712

713
  if (nread == 0) {
714 715
    /* Don't return 0 unless it's actually an EOF condition */
    if (cb_ret == OGGZ_READ_EMPTY) {
716
      return OGGZ_ERR_STOP_OK;
717
    } else {
718
      return oggz_map_return_value_to_error (cb_ret);
719
    }
720 721 722
  } else {
    if (cb_ret == OGGZ_READ_EMPTY) cb_ret = OGGZ_CONTINUE;
    oggz->cb_next = cb_ret;
723
  }
724

andre's avatar
andre committed
725 726 727 728 729 730 731 732 733
  return nread;
}


#else /* OGGZ_CONFIG_READ */

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

734 735 736 737 738 739 740 741 742 743 744 745
OGGZ *
oggz_read_init (OGGZ * oggz)
{
  return NULL;
}

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

andre's avatar
andre committed
746 747
int
oggz_set_read_callback (OGGZ * oggz, long serialno,
748
                        OggzReadPacket read_packet, void * user_data)
andre's avatar
andre committed
749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765
{
  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