comparison mpegvideo.c @ 320:cda7d0857baf libavcodec

- ME setting moved to AVCodecContext/MpegEncContext, no longer a global. - EPZS ME algo used by default. - HQ flag activated for ffmpeg. - Cosmetics ...

319:3ef1cc75d5f5

        s->intra_only = 1;
        s->gop_size = 12;
    } else {
        s->intra_only = 0;
    }
    s->full_search = motion_estimation_method;

    s->fixed_qscale = (avctx->flags & CODEC_FLAG_QSCALE);
    
    switch(avctx->codec->id) {
    case CODEC_ID_MPEG1VIDEO:
        s->out_format = FMT_MPEG1;

        h263_encode_init(s);
    else if (s->out_format == FMT_MPEG1)
        mpeg1_encode_init(s);

    /* dont use mv_penalty table for crap MV as it would be confused */
    if(s->full_search<4) s->mv_penalty= default_mv_penalty;

    s->encoding = 1;

    /* init */
    if (MPV_common_init(s) < 0)

        memset(s->mb_type   , MB_TYPE_INTRA, sizeof(UINT8)*s->mb_width*s->mb_height);
//printf("Scene change detected, encoding as I Frame\n");
    }

    /* find best f_code for ME which do unlimited searches */
    if(s->pict_type==P_TYPE && s->full_search>3){
        int mv_num[8];
        int i;
        int loose=0;
        UINT8 * fcode_tab= s->fcode_tab;

320:cda7d0857baf

        s->intra_only = 1;
        s->gop_size = 12;
    } else {
        s->intra_only = 0;
    }
    
    /* ME algorithm */
    s->me_method = avctx->me_method;
    /* Fixed QSCALE */
    s->fixed_qscale = (avctx->flags & CODEC_FLAG_QSCALE);
    
    switch(avctx->codec->id) {
    case CODEC_ID_MPEG1VIDEO:
        s->out_format = FMT_MPEG1;

        h263_encode_init(s);
    else if (s->out_format == FMT_MPEG1)
        mpeg1_encode_init(s);

    /* dont use mv_penalty table for crap MV as it would be confused */
    if (s->me_method < 0) s->mv_penalty = default_mv_penalty;

    s->encoding = 1;

    /* init */
    if (MPV_common_init(s) < 0)

        memset(s->mb_type   , MB_TYPE_INTRA, sizeof(UINT8)*s->mb_width*s->mb_height);
//printf("Scene change detected, encoding as I Frame\n");
    }

    /* find best f_code for ME which do unlimited searches */
    if(s->pict_type == P_TYPE && s->me_method >= 0){
        int mv_num[8];
        int i;
        int loose=0;
        UINT8 * fcode_tab= s->fcode_tab;