summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Decina <alessandro.decina@collabora.co.uk>2011-09-29 23:40:47 +0200
committerAlessandro Decina <alessandro.decina@collabora.co.uk>2011-09-29 23:46:28 +0200
commit6a1945358120eedfc5dd0184c69ac3f5cd2d9b1d (patch)
tree32ebbff20ad2bd580b60478fa3eb8db9e29ae28f
parent5a4e10a6d0656a84955a2ecd4e5ec98d93cc5393 (diff)
Undo a change in gst_ducati_get_mem_type.
Make it return -1 when the virtual address doesn't match any of the known zones.
-rw-r--r--src/gstducati.c2
-rw-r--r--src/gstducatividdec.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gstducati.c b/src/gstducati.c
index 2bdc904..244fb59 100644
--- a/src/gstducati.c
+++ b/src/gstducati.c
@@ -87,7 +87,7 @@ gst_ducati_alloc_2d (gint width, gint height, guint * sz)
XDAS_Int16
gst_ducati_get_mem_type (SSPtr paddr)
{
- XDAS_Int16 type = XDM_MEMTYPE_RAW;
+ XDAS_Int16 type = -1;
if ((0x60000000 <= paddr) && (paddr < 0x68000000))
type = XDM_MEMTYPE_TILED8;
diff --git a/src/gstducatividdec.c b/src/gstducatividdec.c
index ae97c15..231fd31 100644
--- a/src/gstducatividdec.c
+++ b/src/gstducatividdec.c
@@ -204,7 +204,7 @@ codec_prepare_outbuf (GstDucatiVidDec * self, GstBuffer * buf)
y_type = gst_ducati_get_mem_type (y_paddr);
uv_type = gst_ducati_get_mem_type (uv_paddr);
- if (y_type == XDM_MEMTYPE_RAW || uv_type == XDM_MEMTYPE_RAW) {
+ if (y_type < 0 || uv_type < 0) {
GST_DEBUG_OBJECT (self, "non TILER buffer, fallback to bufferpool");
return codec_prepare_outbuf (self, codec_bufferpool_get (self, buf));
}