comparison sonic.c @ 8590:7a463923ecd1 libavcodec

Change semantic of CONFIG_*, HAVE_* and ARCH_*. They are now always defined to either 0 or 1.

8589:a29b5b5c3c9d

    state[0] = x;

    return x;
}

#if defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER)
// Heavily modified Levinson-Durbin algorithm which
// copes better with quantization, and calculates the
// actual whitened result as it goes.

static void modified_levinson_durbin(int *window, int window_entries,

#endif
    }

    av_free(state);
}
#endif /* defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) */

static const int samplerate_table[] =
    { 44100, 22050, 11025, 96000, 48000, 32000, 24000, 16000, 8000 };

#if defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER)
static inline int code_samplerate(int samplerate)
{
    switch (samplerate)
    {
        case 44100: return 0;

//    av_log(avctx, AV_LOG_DEBUG, "used bytes: %d\n", (put_bits_count(&pb)+7)/8);

    flush_put_bits(&pb);
    return (put_bits_count(&pb)+7)/8;
}
#endif /* defined(CONFIG_SONIC_ENCODER) || defined(CONFIG_SONIC_LS_ENCODER) */

#ifdef CONFIG_SONIC_DECODER
static av_cold int sonic_decode_init(AVCodecContext *avctx)
{
    SonicContext *s = avctx->priv_data;
    GetBitContext gb;
    int i, version;

    return (get_bits_count(&gb)+7)/8;
}
#endif /* CONFIG_SONIC_DECODER */

#ifdef CONFIG_SONIC_ENCODER
AVCodec sonic_encoder = {
    "sonic",
    CODEC_TYPE_AUDIO,
    CODEC_ID_SONIC,
    sizeof(SonicContext),

    NULL,
    .long_name = NULL_IF_CONFIG_SMALL("Sonic"),
};
#endif

#ifdef CONFIG_SONIC_LS_ENCODER
AVCodec sonic_ls_encoder = {
    "sonicls",
    CODEC_TYPE_AUDIO,
    CODEC_ID_SONIC_LS,
    sizeof(SonicContext),

    NULL,
    .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"),
};
#endif

#ifdef CONFIG_SONIC_DECODER
AVCodec sonic_decoder = {
    "sonic",
    CODEC_TYPE_AUDIO,
    CODEC_ID_SONIC,
    sizeof(SonicContext),

8590:7a463923ecd1

    state[0] = x;

    return x;
}

#if CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER
// Heavily modified Levinson-Durbin algorithm which
// copes better with quantization, and calculates the
// actual whitened result as it goes.

static void modified_levinson_durbin(int *window, int window_entries,

#endif
    }

    av_free(state);
}
#endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */

static const int samplerate_table[] =
    { 44100, 22050, 11025, 96000, 48000, 32000, 24000, 16000, 8000 };

#if CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER
static inline int code_samplerate(int samplerate)
{
    switch (samplerate)
    {
        case 44100: return 0;

//    av_log(avctx, AV_LOG_DEBUG, "used bytes: %d\n", (put_bits_count(&pb)+7)/8);

    flush_put_bits(&pb);
    return (put_bits_count(&pb)+7)/8;
}
#endif /* CONFIG_SONIC_ENCODER || CONFIG_SONIC_LS_ENCODER */

#if CONFIG_SONIC_DECODER
static av_cold int sonic_decode_init(AVCodecContext *avctx)
{
    SonicContext *s = avctx->priv_data;
    GetBitContext gb;
    int i, version;

    return (get_bits_count(&gb)+7)/8;
}
#endif /* CONFIG_SONIC_DECODER */

#if CONFIG_SONIC_ENCODER
AVCodec sonic_encoder = {
    "sonic",
    CODEC_TYPE_AUDIO,
    CODEC_ID_SONIC,
    sizeof(SonicContext),

    NULL,
    .long_name = NULL_IF_CONFIG_SMALL("Sonic"),
};
#endif

#if CONFIG_SONIC_LS_ENCODER
AVCodec sonic_ls_encoder = {
    "sonicls",
    CODEC_TYPE_AUDIO,
    CODEC_ID_SONIC_LS,
    sizeof(SonicContext),

    NULL,
    .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"),
};
#endif

#if CONFIG_SONIC_DECODER
AVCodec sonic_decoder = {
    "sonic",
    CODEC_TYPE_AUDIO,
    CODEC_ID_SONIC,
    sizeof(SonicContext),