libavcodec.hg: mpegvideo.c comparison

comparison mpegvideo.c @ 10604:ce2cf9e32b09 libavcodec

Set mb_y in mpeg2 field pictures like h264 does. This fixes -vismv & -debug 16384 with field pictures.

author	michael
date	Mon, 30 Nov 2009 19:14:00 +0000
parents	9a670cfd1941
children	9ea5f2f1874f

comparison

equal deleted inserted replaced

-:874e26fe2284
+:ce2cf9e32b09
 /* apply one mpeg motion vector to the three components */
 static av_always_inline void mpeg_motion_lowres(MpegEncContext *s,
 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
 int field_based, int bottom_field, int field_select,
 uint8_t **ref_picture, h264_chroma_mc_func *pix_op,
-int motion_x, int motion_y, int h)
+int motion_x, int motion_y, int h, int mb_y)
 {
 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy;
 const int lowres= s->avctx->lowres;
 const int block_s= 8>>lowres;
 }
 sx= motion_x & s_mask;
 sy= motion_y & s_mask;
 src_x = s->mb_x*2*block_s               + (motion_x >> (lowres+1));
-src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1));
+src_y =(   mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1));
 if (s->out_format == FMT_H263) {
 uvsx = ((motion_x>>1) & s_mask) | (sx&1);
 uvsy = ((motion_y>>1) & s_mask) | (sy&1);
 uvsrc_x = src_x>>1;
 mx = motion_x / 4;
 my = motion_y / 4;
 uvsx = (2*mx) & s_mask;
 uvsy = (2*my) & s_mask;
 uvsrc_x = s->mb_x*block_s               + (mx >> lowres);
-uvsrc_y = s->mb_y*block_s               + (my >> lowres);
+uvsrc_y =    mb_y*block_s               + (my >> lowres);
 } else {
 mx = motion_x / 2;
 my = motion_y / 2;
 uvsx = mx & s_mask;
 uvsy = my & s_mask;
 uvsrc_x = s->mb_x*block_s               + (mx >> (lowres+1));
-uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1));
+uvsrc_y =(   mb_y*block_s>>field_based) + (my >> (lowres+1));
 }
 ptr_y  = ref_picture[0] + src_y * linesize + src_x;
 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
 switch(s->mv_type) {
 case MV_TYPE_16X16:
 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 0, 0, 0,
 ref_picture, pix_op,
-s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s);
+s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s, mb_y);
 break;
 case MV_TYPE_8X8:
 mx = 0;
 my = 0;
 for(i=0;i<4;i++) {
 if (s->picture_structure == PICT_FRAME) {
 /* top field */
 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 1, 0, s->field_select[dir][0],
 ref_picture, pix_op,
-s->mv[dir][0][0], s->mv[dir][0][1], block_s);
+s->mv[dir][0][0], s->mv[dir][0][1], block_s, mb_y);
 /* bottom field */
 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 1, 1, s->field_select[dir][1],
 ref_picture, pix_op,
-s->mv[dir][1][0], s->mv[dir][1][1], block_s);
+s->mv[dir][1][0], s->mv[dir][1][1], block_s, mb_y);
 } else {
 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != FF_B_TYPE && !s->first_field){
 ref_picture= s->current_picture_ptr->data;
 }
 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 0, 0, s->field_select[dir][0],
 ref_picture, pix_op,
-s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s);
+s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s, mb_y>>1);
 }
 break;
 case MV_TYPE_16X8:
 for(i=0; i<2; i++){
 uint8_t ** ref2picture;
 }
 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 0, 0, s->field_select[dir][i],
 ref2picture, pix_op,
-s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s);
+s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s, mb_y>>1);
 dest_y += 2*block_s*s->linesize;
 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
 }
 int j;
 for(j=0; j<2; j++){
 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 1, j, j^i,
 ref_picture, pix_op,
-s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s);
+s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s, mb_y);
 }
 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
 }
 }else{
 for(i=0; i<2; i++){
 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
 0, 0, s->picture_structure != i+1,
 ref_picture, pix_op,
-s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s);
+s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s, mb_y>>1);
 // after put we make avg of the same block
 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
 //opposite parity is always in the same frame if this is second field
 * @param h is the normal height, this will be reduced automatically if needed for the last row
 */
 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
 if (s->avctx->draw_horiz_band) {
 AVFrame *src;
+const int field_pic= s->picture_structure != PICT_FRAME;
 int offset[4];
-if(s->picture_structure != PICT_FRAME){
+h= FFMIN(h, (s->avctx->height>>field_pic) - y);
+if(field_pic && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)){
 h <<= 1;
 y <<= 1;
-if(s->first_field  && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return;
+if(s->first_field) return;
 }
-h= FFMIN(h, s->avctx->height - y);
 if(s->pict_type==FF_B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER))
 src= (AVFrame*)s->current_picture_ptr;
 else if(s->last_picture_ptr)
 src= (AVFrame*)s->last_picture_ptr;
 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
 if(!(s->pict_type==FF_B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME))
 {
+if(s->picture_structure==PICT_FRAME){
 s->dest[0] += s->mb_y *   linesize << mb_size;
 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift);
 s->dest[2] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift);
+}else{
+s->dest[0] += (s->mb_y>>1) *   linesize << mb_size;
+s->dest[1] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift);
+s->dest[2] += (s->mb_y>>1) * uvlinesize << (mb_size - s->chroma_y_shift);
+assert((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD));
+}
 }
 }
 void ff_mpeg_flush(AVCodecContext *avctx){
 int i;

Mercurial > libavcodec.hg

comparison mpegvideo.c @ 10604:ce2cf9e32b09 libavcodec