comparison stheader.h @ 1828:60afe3421c04

OggVorbis support, ALPHA state!

1827:9d62dcf8c7c5

typedef struct {
  int driver;
    // codec descriptor from codec.conf
} codecinfo_t;
*/

typedef struct {
  demux_stream_t *ds;
  unsigned int format;
  codecs_t *codec;

  int audio_out_minsize;
  // other codecs:
//  ac3_frame_t *ac3_frame;
  void* ac3_frame;
  int pcm_bswap;
} sh_audio_t;

typedef struct {
  demux_stream_t *ds;
  unsigned int format;

1828:60afe3421c04

typedef struct {
  int driver;
    // codec descriptor from codec.conf
} codecinfo_t;
*/

#ifdef HAVE_OGGVORBIS
#include <math.h>
#include <vorbis/codec.h>
typedef struct {
  ogg_sync_state   oy; /* sync and verify incoming physical bitstream */
  ogg_stream_state os; /* take physical pages, weld into a logical
			  stream of packets */
  ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
  ogg_packet       op; /* one raw packet of data for decode */
  
  vorbis_info      vi; /* struct that stores all the static vorbis bitstream
			  settings */
  vorbis_comment   vc; /* struct that stores all the bitstream user comments */
  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
  vorbis_block     vb; /* local working space for packet->PCM decode */
} ov_struct_t;
#endif

typedef struct {
  demux_stream_t *ds;
  unsigned int format;
  codecs_t *codec;

  int audio_out_minsize;
  // other codecs:
//  ac3_frame_t *ac3_frame;
  void* ac3_frame;
  int pcm_bswap;
#ifdef HAVE_OGGVORBIS
  ov_struct_t *ov; // should be assigned on init
#endif
} sh_audio_t;

typedef struct {
  demux_stream_t *ds;
  unsigned int format;