comparison mpeg12.c @ 826:ce240888252d libavcodec

cleanup

825:92c6d8b71e3b

        mpeg_decode_picture_coding_extension(s);
        break;
    }
}

/* return 1 if end of frame */
static int mpeg_decode_slice(AVCodecContext *avctx, 
                              AVPicture *pict,
                              int start_code,
                              UINT8 *buf, int buf_size)
{

    int ret;

    start_code = (start_code - 1) & 0xff;
    if (start_code >= s->mb_height){
        fprintf(stderr, "slice below image (%d >= %d)\n", start_code, s->mb_height);
        return -1;
    }
    s->last_dc[0] = 1 << (7 + s->intra_dc_precision);
    s->last_dc[1] = s->last_dc[0];
    s->last_dc[2] = s->last_dc[0];
    memset(s->last_mv, 0, sizeof(s->last_mv));
    /* start frame decoding */
    if (s->first_slice) {
        s->first_slice = 0;
        if(MPV_frame_start(s, avctx) < 0)
            return -2;
    }

    init_get_bits(&s->gb, buf, buf_size);

    s->qscale = get_qscale(s);

                }
            }
        }
        if(s->mb_y >= s->mb_height){
            fprintf(stderr, "slice too long\n");
            return -1;
        }
    }
eos: //end of slice
    
    emms_c();

            pict->data[1] = picture[1];
            pict->data[2] = picture[2];
            pict->linesize[0] = s->linesize;
            pict->linesize[1] = s->uvlinesize;
            pict->linesize[2] = s->uvlinesize;
            return 1;
        } else {
            return 0;
        }
    } else {
        return 0;
    }
}

static int mpeg1_decode_sequence(AVCodecContext *avctx, 
                                 UINT8 *buf, int buf_size)

                default:
                    if (start_code >= SLICE_MIN_START_CODE &&
                        start_code <= SLICE_MAX_START_CODE) {
                        ret = mpeg_decode_slice(avctx, picture,
                                                start_code, s->buffer, input_size);
                        if (ret == 1) {
                            /* got a picture: exit */
                            /* first check if we must repeat the frame */
                            avctx->repeat_pict = 0;
#if 0
                            if (s2->progressive_frame && s2->repeat_first_field) {

                            }         
                            *data_size = sizeof(AVPicture);
                            goto the_end;
                        }else if(ret<0){
                            printf("Error while decoding slice\n");
			    if(ret<-1) return -1;
                        }
                    }
                    break;
                }
            }

826:ce240888252d

        mpeg_decode_picture_coding_extension(s);
        break;
    }
}

#define DECODE_SLICE_FATAL_ERROR -2
#define DECODE_SLICE_ERROR -1
#define DECODE_SLICE_OK 0
#define DECODE_SLICE_EOP 1

/**
 * decodes a slice.
 * @return DECODE_SLICE_FATAL_ERROR if a non recoverable error occured<br>
 *         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, 
                              AVPicture *pict,
                              int start_code,
                              UINT8 *buf, int buf_size)
{

    int ret;

    start_code = (start_code - 1) & 0xff;
    if (start_code >= s->mb_height){
        fprintf(stderr, "slice below image (%d >= %d)\n", start_code, s->mb_height);
        return DECODE_SLICE_ERROR;
    }
    s->last_dc[0] = 1 << (7 + s->intra_dc_precision);
    s->last_dc[1] = s->last_dc[0];
    s->last_dc[2] = s->last_dc[0];
    memset(s->last_mv, 0, sizeof(s->last_mv));
    /* start frame decoding */
    if (s->first_slice) {
        s->first_slice = 0;
        if(MPV_frame_start(s, avctx) < 0)
            return DECODE_SLICE_FATAL_ERROR;
    }

    init_get_bits(&s->gb, buf, buf_size);

    s->qscale = get_qscale(s);

                }
            }
        }
        if(s->mb_y >= s->mb_height){
            fprintf(stderr, "slice too long\n");
            return DECODE_SLICE_ERROR;
        }
    }
eos: //end of slice
    
    emms_c();

            pict->data[1] = picture[1];
            pict->data[2] = picture[2];
            pict->linesize[0] = s->linesize;
            pict->linesize[1] = s->uvlinesize;
            pict->linesize[2] = s->uvlinesize;
            return DECODE_SLICE_EOP;
        } else {
            return DECODE_SLICE_OK;
        }
    } else {
        return DECODE_SLICE_OK;
    }
}

static int mpeg1_decode_sequence(AVCodecContext *avctx, 
                                 UINT8 *buf, int buf_size)

                default:
                    if (start_code >= SLICE_MIN_START_CODE &&
                        start_code <= SLICE_MAX_START_CODE) {
                        ret = mpeg_decode_slice(avctx, picture,
                                                start_code, s->buffer, input_size);
                        if (ret == DECODE_SLICE_EOP) {
                            /* got a picture: exit */
                            /* first check if we must repeat the frame */
                            avctx->repeat_pict = 0;
#if 0
                            if (s2->progressive_frame && s2->repeat_first_field) {

                            }         
                            *data_size = sizeof(AVPicture);
                            goto the_end;
                        }else if(ret<0){
                            printf("Error while decoding slice\n");
			    if(ret==DECODE_SLICE_FATAL_ERROR) return -1;
                        }
                    }
                    break;
                }
            }