FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Check output format metadata some more

Browse Source 
And implement workaround for NVidia Tegra 3 not setting the slice_height.
Thanks to Josep Torra for debugging this issue.
This commit is contained in:
Sebastian Dröge 2012-10-09 10:13:32 +02:00
parent 7341ed62fa
commit a870e6a5c3
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sys/androidmedia/gstamcvideodec.c
View File

@ -675,6 +675,11 @@ gst_amc_video_dec_set_src_caps (GstAmcVideoDec * self, GstAmcFormat * format)
return FALSE; return FALSE;
} }
if (width == 0 || height == 0) {
GST_ERROR_OBJECT (self, "Height or width not set");
return FALSE;
}
if (crop_bottom) if (crop_bottom)
height = height - (height - crop_bottom - 1); height = height - (height - crop_bottom - 1);
if (crop_top) if (crop_top)
@ -718,6 +723,7 @@ static gboolean
gst_amc_video_dec_fill_buffer (GstAmcVideoDec * self, gint idx, gst_amc_video_dec_fill_buffer (GstAmcVideoDec * self, gint idx,
const GstAmcBufferInfo * buffer_info, GstBuffer * outbuf) const GstAmcBufferInfo * buffer_info, GstBuffer * outbuf)
{ {
GstAmcVideoDecClass *klass = GST_AMC_VIDEO_DEC_GET_CLASS (self);
GstAmcBuffer *buf = &self->output_buffers[idx]; GstAmcBuffer *buf = &self->output_buffers[idx];
GstVideoCodecState *state = GstVideoCodecState *state =
gst_video_decoder_get_output_state (GST_VIDEO_DECODER (self)); gst_video_decoder_get_output_state (GST_VIDEO_DECODER (self));
@ -748,32 +754,50 @@ gst_amc_video_dec_fill_buffer (GstAmcVideoDec * self, gint idx,
case COLOR_FormatYUV420Planar:{ case COLOR_FormatYUV420Planar:{
gint i, j, height; gint i, j, height;
guint8 *src, *dest; guint8 *src, *dest;
gint stride, slice_height;
gint src_stride, dest_stride; gint src_stride, dest_stride;
gint row_length; gint row_length;
stride = self->stride;
if (stride == 0) {
GST_ERROR_OBJECT (self, "Stride not set");
goto done;
}
slice_height = self->slice_height;
if (slice_height == 0) {
/* NVidia Tegra 3 on Nexus 7 does not set this */
if (g_str_has_prefix (klass->codec_info->name, "OMX.Nvidia.")) {
slice_height = GST_ROUND_UP_32 (self->height);
} else {
GST_ERROR_OBJECT (self, "Slice height not set");
goto done;
}
}
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (i == 0) { if (i == 0) {
src_stride = self->stride; src_stride = stride;
dest_stride = GST_VIDEO_INFO_COMP_STRIDE (info, i); dest_stride = GST_VIDEO_INFO_COMP_STRIDE (info, i);
} else { } else {
src_stride = (self->stride + 1) / 2; src_stride = (stride + 1) / 2;
dest_stride = GST_VIDEO_INFO_COMP_STRIDE (info, i); dest_stride = GST_VIDEO_INFO_COMP_STRIDE (info, i);
} }
src = buf->data + buffer_info->offset; src = buf->data + buffer_info->offset;
if (i == 0) { if (i == 0) {
src += self->crop_top * self->stride; src += self->crop_top * stride;
src += self->crop_left; src += self->crop_left;
row_length = self->width; row_length = self->width;
} else if (i > 0) { } else if (i > 0) {
src += self->slice_height * self->stride; src += slice_height * stride;
src += self->crop_top * src_stride; src += self->crop_top * src_stride;
src += self->crop_left / 2; src += self->crop_left / 2;
row_length = (self->width + 1) / 2; row_length = (self->width + 1) / 2;
} }
if (i == 2) if (i == 2)
src += ((self->slice_height + 1) / 2) * ((self->stride + 1) / 2); src += ((slice_height + 1) / 2) * ((stride + 1) / 2);
dest = GST_BUFFER_DATA (outbuf) + GST_VIDEO_INFO_COMP_OFFSET (info, i); dest = GST_BUFFER_DATA (outbuf) + GST_VIDEO_INFO_COMP_OFFSET (info, i);
height = GST_VIDEO_INFO_COMP_HEIGHT (info, i); height = GST_VIDEO_INFO_COMP_HEIGHT (info, i);
@ -794,6 +818,12 @@ gst_amc_video_dec_fill_buffer (GstAmcVideoDec * self, gint idx,
gint src_stride, dest_stride; gint src_stride, dest_stride;
gint row_length; gint row_length;
/* This should always be set */
if (self->stride == 0 || self->slice_height == 0) {
GST_ERROR_OBJECT (self, "Stride or slice height not set");
goto done;
}
/* FIXME: This does not work for odd widths or heights /* FIXME: This does not work for odd widths or heights
* but might as well be a bug in the codec */ * but might as well be a bug in the codec */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
@ -832,6 +862,12 @@ gst_amc_video_dec_fill_buffer (GstAmcVideoDec * self, gint idx,
gint src_stride, dest_stride; gint src_stride, dest_stride;
gint row_length; gint row_length;
/* This should always be set */
if (self->stride == 0 || self->slice_height == 0) {
GST_ERROR_OBJECT (self, "Stride or slice height not set");
goto done;
}
/* FIXME: This is untested! */ /* FIXME: This is untested! */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {