comparison svq1.c @ 903:22ee74da2cd3 libavcodec

cleanup adding AVVideoFrame moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame removing obsolete variables in AVCodecContext skiping of MBs in b frames correctly initalizing AVCodecContext picture buffer cleanup

902:6acc8394960d

                             UINT8 *buf, int buf_size)
{
  MpegEncContext *s=avctx->priv_data;
  uint8_t      *current, *previous;
  int		result, i, x, y, width, height;
  AVPicture *pict = data; 

  /* initialize bit buffer */
  init_get_bits(&s->gb,buf,buf_size);

  /* decode frame header */

      src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i];
    }
  }

  result = svq1_decode_frame_header (&s->gb, s);
  
  if(MPV_frame_start(s, avctx) < 0)
      return -1;

  if (result != 0)
  {
#ifdef DEBUG_SVQ1
    printf("Error in svq1_decode_frame_header %i\n",result);
#endif
    return result;
  }
  
  if(avctx->hurry_up && s->pict_type==B_TYPE) return buf_size;

  /* decode y, u and v components */
  for (i=0; i < 3; i++) {
    int linesize;
    if (i == 0) {

      width  = (s->width/4+15)&~15;
      height = (s->height/4+15)&~15;
      linesize= s->uvlinesize;
    }

    current  = s->current_picture[i];

    if(s->pict_type==B_TYPE){
        previous = s->next_picture[i];
    }else{
        previous = s->last_picture[i];
    }

    if (s->pict_type == I_TYPE) {
      /* keyframe */
      for (y=0; y < height; y+=16) {

	pmv[0].y = 0;

	current += 16*linesize;
      }
    }

    pict->data[i] = s->current_picture[i];
    pict->linesize[i] = linesize;
  }

  *data_size=sizeof(AVPicture);
  return buf_size;
}

static int svq1_decode_init(AVCodecContext *avctx)
{

    s->avctx = avctx;
    s->width = (avctx->width+3)&~3;
    s->height = (avctx->height+3)&~3;
    s->codec_id= avctx->codec->id;
    avctx->mbskip_table= s->mbskip_table;
    avctx->pix_fmt = PIX_FMT_YUV410P;
    avctx->has_b_frames= s->has_b_frames=1; // not true, but DP frames and these behave like unidirectional b frames
    s->flags= avctx->flags;
    if (MPV_common_init(s) < 0) return -1;
    return 0;

903:22ee74da2cd3

                             UINT8 *buf, int buf_size)
{
  MpegEncContext *s=avctx->priv_data;
  uint8_t      *current, *previous;
  int		result, i, x, y, width, height;
  AVVideoFrame *pict = data; 

  /* initialize bit buffer */
  init_get_bits(&s->gb,buf,buf_size);

  /* decode frame header */

      src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i];
    }
  }

  result = svq1_decode_frame_header (&s->gb, s);

  if (result != 0)
  {
#ifdef DEBUG_SVQ1
    printf("Error in svq1_decode_frame_header %i\n",result);
#endif
    return result;
  }
  
  if(avctx->hurry_up && s->pict_type==B_TYPE) return buf_size;

  if(MPV_frame_start(s, avctx) < 0)
      return -1;

  /* decode y, u and v components */
  for (i=0; i < 3; i++) {
    int linesize;
    if (i == 0) {

      width  = (s->width/4+15)&~15;
      height = (s->height/4+15)&~15;
      linesize= s->uvlinesize;
    }

    current  = s->current_picture.data[i];

    if(s->pict_type==B_TYPE){
        previous = s->next_picture.data[i];
    }else{
        previous = s->last_picture.data[i];
    }

    if (s->pict_type == I_TYPE) {
      /* keyframe */
      for (y=0; y < height; y+=16) {

	pmv[0].y = 0;

	current += 16*linesize;
      }
    }
  }
  
  *pict = *(AVVideoFrame*)&s->current_picture;


  MPV_frame_end(s);
  
  *data_size=sizeof(AVVideoFrame);
  return buf_size;
}

static int svq1_decode_init(AVCodecContext *avctx)
{

    s->avctx = avctx;
    s->width = (avctx->width+3)&~3;
    s->height = (avctx->height+3)&~3;
    s->codec_id= avctx->codec->id;
    avctx->pix_fmt = PIX_FMT_YUV410P;
    avctx->has_b_frames= s->has_b_frames=1; // not true, but DP frames and these behave like unidirectional b frames
    s->flags= avctx->flags;
    if (MPV_common_init(s) < 0) return -1;
    return 0;