Revert "video: respect stride alignment when calculating planes offsets"

This reverts commit 28e1dadbfa.

Incrementing the offset to make the plane aligned causes the image to be
incompatible with what Xv expects. Rather that forcing a memcpy in the
xvimagesink we would like to do adjust the left padding instead.
This commit is contained in:
Wim Taymans 2013-07-19 10:43:38 +02:00
parent 28e1dadbfa
commit fad4589579

View file

@ -767,7 +767,6 @@ gst_video_info_align (GstVideoInfo * info, GstVideoAlignment * align)
for (i = 0; i < n_planes; i++) {
gint vedge, hedge, comp;
guint offset;
/* Find the component for this plane, FIXME, we assume the plane number and
* component number is the same for now, for scaling the dimensions this is
@ -781,15 +780,10 @@ gst_video_info_align (GstVideoInfo * info, GstVideoAlignment * align)
vedge =
GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (vinfo, comp, align->padding_top);
offset = (vedge * info->stride[i]) +
GST_DEBUG ("plane %d: comp: %d, hedge %d vedge %d align %d stride %d", i,
comp, hedge, vedge, align->stride_align[i], info->stride[i]);
info->offset[i] += (vedge * info->stride[i]) +
(hedge * GST_VIDEO_FORMAT_INFO_PSTRIDE (vinfo, comp));
offset = (offset + align->stride_align[i]) & ~align->stride_align[i];
GST_DEBUG ("plane %d: comp: %d, hedge %d vedge %d align %d stride %d "
"offset %u", i, comp, hedge, vedge, align->stride_align[i],
info->stride[i], offset);
info->offset[i] += offset;
}
}