comparison mimic.c @ 6666:1c76797e2216 libavcodec

Use bytestream functions for reading frame header.

6665:c22932db0ebb

#include <string.h>
#include <stdint.h>

#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"

#define MIMIC_HEADER_SIZE   20

typedef struct {

    if(buf_size < MIMIC_HEADER_SIZE) {
        av_log(avctx, AV_LOG_ERROR, "insufficient data\n");
        return -1;
    }

    width  = AV_RL16(buf + 4);
    height = AV_RL16(buf + 6);

    if(!ctx->avctx) {
        int i;

        if(!(width == 160 && height == 120) &&

    } else if(width != ctx->avctx->width || height != ctx->avctx->height) {
        av_log(avctx, AV_LOG_ERROR, "resolution changing is not supported\n");
        return -1;
    }

    quality    = AV_RL16(buf + 2);
    is_pframe  = AV_RL32(buf + 12);
    num_coeffs = buf[16];

    if(is_pframe && !ctx->buf_ptrs[ctx->prev_index].data[0]) {
        av_log(avctx, AV_LOG_ERROR, "decoding must start with keyframe\n");
        return -1;
    }

                                 swap_buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
    if(!ctx->swap_buf)
        return AVERROR_NOMEM;

    ctx->dsp.bswap_buf((uint32_t*)ctx->swap_buf,
                        (const uint32_t*) (buf + MIMIC_HEADER_SIZE),
                        swap_buf_size>>2);
    init_get_bits(&ctx->gb, ctx->swap_buf, swap_buf_size << 3);

    if(!decode(ctx, quality, num_coeffs, !is_pframe)) {
        avctx->release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]);

6666:1c76797e2216

#include <string.h>
#include <stdint.h>

#include "avcodec.h"
#include "bitstream.h"
#include "bytestream.h"
#include "dsputil.h"

#define MIMIC_HEADER_SIZE   20

typedef struct {

    if(buf_size < MIMIC_HEADER_SIZE) {
        av_log(avctx, AV_LOG_ERROR, "insufficient data\n");
        return -1;
    }

    buf       += 2;
    quality    = bytestream_get_le16(&buf);
    width      = bytestream_get_le16(&buf);
    height     = bytestream_get_le16(&buf);
    buf       += 4;
    is_pframe  = bytestream_get_le32(&buf);
    num_coeffs = bytestream_get_le32(&buf);

    if(!ctx->avctx) {
        int i;

        if(!(width == 160 && height == 120) &&

    } else if(width != ctx->avctx->width || height != ctx->avctx->height) {
        av_log(avctx, AV_LOG_ERROR, "resolution changing is not supported\n");
        return -1;
    }

    if(is_pframe && !ctx->buf_ptrs[ctx->prev_index].data[0]) {
        av_log(avctx, AV_LOG_ERROR, "decoding must start with keyframe\n");
        return -1;
    }

                                 swap_buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
    if(!ctx->swap_buf)
        return AVERROR_NOMEM;

    ctx->dsp.bswap_buf((uint32_t*)ctx->swap_buf,
                        (const uint32_t*) buf,
                        swap_buf_size>>2);
    init_get_bits(&ctx->gb, ctx->swap_buf, swap_buf_size << 3);

    if(!decode(ctx, quality, num_coeffs, !is_pframe)) {
        avctx->release_buffer(avctx, &ctx->buf_ptrs[ctx->cur_index]);