comparison stheader.h @ 291:da98e96499bb

sh_audio/sh_video added, general codec cleanup

291:da98e96499bb

// Stream headers:

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

typedef struct {
  demux_stream_t *ds;
  codecinfo_t codec;
  // output format:
  int samplerate;
  int samplesize;
  int channels;
  int o_bps; // == samplerate*samplesize*channels
  // buffers:
  char* a_in_buffer;
  int a_in_buffer_len;
  int a_in_buffer_size;
  // win32 codec stuff:
  AVIStreamHeader audio;
  WAVEFORMATEX wf;
  char wf_ext[64];     // in format
  WAVEFORMATEX o_wf;   // out format
  HACMSTREAM srcstream;  // handle
  int audio_in_minsize;
  int audio_out_minsize;
  // other codecs:
  ac3_frame_t *ac3_frame;
  int pcm_bswap;
} sh_audio_t;

typedef struct {
  demux_stream_t *ds;
  codecinfo_t codec;
  // output format:
  float fps;
  float frametime;  // 1/fps
  unsigned int outfmt;
//  unsigned int bitrate;
  // buffers:
  char *our_out_buffer;
  // win32 codec stuff:
  AVIStreamHeader video;
  BITMAPINFOHEADER bih;   // in format
  BITMAPINFOHEADER o_bih; // out format
  HIC hic;  // handle
} sh_video_t;