comparison wav.c @ 858:66cc656ea404 libavformat

Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS in libavformat to allow building (de)coders and (de)muxers independently at some point + support for this option in configure.

857:26aaf3eed638

    { CODEC_ID_ADPCM_CT, 0x200 },
    { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
    { 0, 0 },
};

#ifdef CONFIG_ENCODERS
/* WAVEFORMATEX header */
/* returns the size or -1 on error */
int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
{
    int bps, blkalign, bytespersec;

        hdrsize -= 2;
    }

    return hdrsize;
}
#endif //CONFIG_ENCODERS

/* We could be given one of the three possible structures here:
 * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
 * is an expansion of the previous one with the fields added
 * at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and

    if (id == CODEC_ID_PCM_S16LE && bps == 32)
        id = CODEC_ID_PCM_S32LE;
    return id;
}

#ifdef CONFIG_ENCODERS
typedef struct {
    offset_t data;
} WAVContext;

static int wav_write_header(AVFormatContext *s)

        put_flush_packet(pb);
    }
    return 0;
}
#endif //CONFIG_ENCODERS

/* return the size of the found tag */
/* XXX: > 2GB ? */
static int find_tag(ByteIOContext *pb, uint32_t tag1)
{

    wav_read_packet,
    wav_read_close,
    wav_read_seek,
};

#ifdef CONFIG_ENCODERS
static AVOutputFormat wav_oformat = {
    "wav",
    "wav format",
    "audio/x-wav",
    "wav",

    CODEC_ID_NONE,
    wav_write_header,
    wav_write_packet,
    wav_write_trailer,
};
#endif //CONFIG_ENCODERS

int ff_wav_init(void)
{
    av_register_input_format(&wav_iformat);
#ifdef CONFIG_ENCODERS
    av_register_output_format(&wav_oformat);
#endif //CONFIG_ENCODERS
    return 0;
}

858:66cc656ea404

    { CODEC_ID_ADPCM_CT, 0x200 },
    { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
    { 0, 0 },
};

#ifdef CONFIG_MUXERS
/* WAVEFORMATEX header */
/* returns the size or -1 on error */
int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
{
    int bps, blkalign, bytespersec;

        hdrsize -= 2;
    }

    return hdrsize;
}
#endif //CONFIG_MUXERS

/* We could be given one of the three possible structures here:
 * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
 * is an expansion of the previous one with the fields added
 * at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and

    if (id == CODEC_ID_PCM_S16LE && bps == 32)
        id = CODEC_ID_PCM_S32LE;
    return id;
}

#ifdef CONFIG_MUXERS
typedef struct {
    offset_t data;
} WAVContext;

static int wav_write_header(AVFormatContext *s)

        put_flush_packet(pb);
    }
    return 0;
}
#endif //CONFIG_MUXERS

/* return the size of the found tag */
/* XXX: > 2GB ? */
static int find_tag(ByteIOContext *pb, uint32_t tag1)
{

    wav_read_packet,
    wav_read_close,
    wav_read_seek,
};

#ifdef CONFIG_MUXERS
static AVOutputFormat wav_oformat = {
    "wav",
    "wav format",
    "audio/x-wav",
    "wav",

    CODEC_ID_NONE,
    wav_write_header,
    wav_write_packet,
    wav_write_trailer,
};
#endif //CONFIG_MUXERS

int ff_wav_init(void)
{
    av_register_input_format(&wav_iformat);
#ifdef CONFIG_MUXERS
    av_register_output_format(&wav_oformat);
#endif //CONFIG_MUXERS
    return 0;
}