comparison mpeg12.c @ 925:7fccaa0d699d libavcodec

AVVideoFrame -> AVFrame

924:3814e9115672

 *         DECODE_SLICE_ERROR if the slice is damaged<br>
 *         DECODE_SLICE_OK if this slice is ok<br>
 *         DECODE_SLICE_EOP if the end of the picture is reached
 */
static int mpeg_decode_slice(AVCodecContext *avctx, 
                              AVVideoFrame *pict,
                              int start_code,
                              UINT8 *buf, int buf_size)
{
    Mpeg1Context *s1 = avctx->priv_data;
    MpegEncContext *s = &s1->mpeg_enc_ctx;

            s->qscale >>=1;

        MPV_frame_end(s);

        if (s->pict_type == B_TYPE || s->low_delay) {
            *pict= *(AVVideoFrame*)&s->current_picture;
        } else {
            s->picture_number++;
            /* latency of 1 frame for I and P frames */
            /* XXX: use another variable than picture_number */
            if (s->picture_number == 1) {
                return DECODE_SLICE_OK;
            } else {
                *pict= *(AVVideoFrame*)&s->last_picture;
            }
        }
        return DECODE_SLICE_EOP;
    } else {
        return DECODE_SLICE_OK;

                             UINT8 *buf, int buf_size)
{
    Mpeg1Context *s = avctx->priv_data;
    UINT8 *buf_end, *buf_ptr, *buf_start;
    int len, start_code_found, ret, code, start_code, input_size;
    AVVideoFrame *picture = data;
    MpegEncContext *s2 = &s->mpeg_enc_ctx;
            
    dprintf("fill_buffer\n");

    *data_size = 0;

    /* special case for last picture */
    if (buf_size == 0) {
        if (s2->picture_number > 0) {
            *picture= *(AVVideoFrame*)&s2->next_picture;

            *data_size = sizeof(AVVideoFrame);
        }
        return 0;
    }

    buf_ptr = buf;

925:7fccaa0d699d

 *         DECODE_SLICE_ERROR if the slice is damaged<br>
 *         DECODE_SLICE_OK if this slice is ok<br>
 *         DECODE_SLICE_EOP if the end of the picture is reached
 */
static int mpeg_decode_slice(AVCodecContext *avctx, 
                              AVFrame *pict,
                              int start_code,
                              UINT8 *buf, int buf_size)
{
    Mpeg1Context *s1 = avctx->priv_data;
    MpegEncContext *s = &s1->mpeg_enc_ctx;

            s->qscale >>=1;

        MPV_frame_end(s);

        if (s->pict_type == B_TYPE || s->low_delay) {
            *pict= *(AVFrame*)&s->current_picture;
        } else {
            s->picture_number++;
            /* latency of 1 frame for I and P frames */
            /* XXX: use another variable than picture_number */
            if (s->picture_number == 1) {
                return DECODE_SLICE_OK;
            } else {
                *pict= *(AVFrame*)&s->last_picture;
            }
        }
        return DECODE_SLICE_EOP;
    } else {
        return DECODE_SLICE_OK;

                             UINT8 *buf, int buf_size)
{
    Mpeg1Context *s = avctx->priv_data;
    UINT8 *buf_end, *buf_ptr, *buf_start;
    int len, start_code_found, ret, code, start_code, input_size;
    AVFrame *picture = data;
    MpegEncContext *s2 = &s->mpeg_enc_ctx;
            
    dprintf("fill_buffer\n");

    *data_size = 0;

    /* special case for last picture */
    if (buf_size == 0) {
        if (s2->picture_number > 0) {
            *picture= *(AVFrame*)&s2->next_picture;

            *data_size = sizeof(AVFrame);
        }
        return 0;
    }

    buf_ptr = buf;