From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 56F4AE00CCA; Mon, 31 Oct 2016 23:10:05 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 SPF_HELO_PASS SPF: HELO matches SPF record * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [104.47.33.88 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0088.outbound.protection.outlook.com [104.47.33.88]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 01BC0E00C86 for ; Mon, 31 Oct 2016 23:10:00 -0700 (PDT) Received: from CY1PR03CA0027.namprd03.prod.outlook.com (10.174.128.37) by CY1PR03MB2377.namprd03.prod.outlook.com (10.166.207.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12; Tue, 1 Nov 2016 06:09:59 +0000 Received: from BN1AFFO11FD033.protection.gbl (2a01:111:f400:7c10::124) by CY1PR03CA0027.outlook.office365.com (2603:10b6:600::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12 via Frontend Transport; Tue, 1 Nov 2016 06:09:59 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD033.mail.protection.outlook.com (10.58.52.246) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.693.6 via Frontend Transport; Tue, 1 Nov 2016 06:09:58 +0000 Received: from carol-OptiPlex-3020.ap.freescale.net (carol-OptiPlex-3020.ap.freescale.net [10.192.241.17]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uA169q4F003382; Mon, 31 Oct 2016 23:09:57 -0700 From: Yuqing Zhu To: Date: Tue, 1 Nov 2016 14:09:35 +0800 Message-ID: <1477980575-10601-3-git-send-email-carol.zhu@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477980575-10601-1-git-send-email-carol.zhu@nxp.com> References: <1477980575-10601-1-git-send-email-carol.zhu@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131224541989312211; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(76176999)(50986999)(68736007)(36756003)(47776003)(19580395003)(19580405001)(6916009)(2950100002)(110136003)(2906002)(4326007)(87936001)(356003)(305945005)(8666005)(7846002)(5660300001)(626004)(81166006)(85426001)(81156014)(8676002)(11100500001)(586003)(6666003)(105606002)(5003940100001)(104016004)(50226002)(8936002)(229853001)(2351001)(230783001)(106466001)(92566002)(189998001)(97736004)(33646002)(86362001)(48376002)(50466002)(77096005)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2377; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD033; 1:xx+YMJHopadhjjfi+6o+l/juml3AHUvy4i8nebav766k/QwcFp/wiu2ZkY7wEVA0FG/LqSyOM+JYRVNICayfPQOVHQ/q6USh0VtmhF90r6AvFnXqWuLD4k+n8dTAeOBsXSFWj8IBAo2g8Ofkc+I+AGYR4QWMeG7CyxyWv/KrG0rIt5+3ZN3+a/O6NGcyz+1oxsJg8buYiDUqqPrEP9iTwL5yJmlWTheZXy/S+i3Gy3oi0GcJWtjuT3z8NQC//10RJxhL1358rsG/Ie56vTY7bOjWWQW6O7hhTL7P7jBh4rZE3d6brIDodMziaeixV8zRbmRsS9yGCCMDthOBIR4foiv1LIMMPyy9tyteqZcJYwZvKjMd2mI4HXwR0rYXaLyNgNc6rn9w6EkFYacRT8n5WS5LxWqJte0XlgRr4CcGsuk/2WTKrp0cYhJ3lZgoAhHB/KstwKXFm3rQ4n8yCkl4hGYR3vWZT/hYZJ6RePS3sstHqT77TRAEYgVCWrbADpF34DY9so5sfTOfuKvT4cuABrJmYZv0YET5n+21aaIecmKA+EcGuGThEql8nA0JcwguBYmczzSpKyaiOBS5fE+QpKi32GGKYFC9ATMxBGplOGXdxW1t1iJC8bVEch6mIhPJL+kj/faImR7oMmeEP38aCW40Lb17YoMSa2NJqFSmZ4DZcoWXfthkgVJPC930b/XEHDkJGa7Dc3jykdctOVcE5cszLWhVrO7lA3Ye8stX71c= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 62b7625c-9348-4e47-b572-08d4021db58a X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2377; 2:NvJ/mszTg+WegD8Tc0zfxjUvLvTRh3V3lby3H7TbK9lz/7JS67ypxzYQhRW1WJso+l7IexkyDfVj6wH3LYFkTpQ39X7rb0zqwSANcHz5180QaGwaFA0oLF2bzDlWD4x6E6/oxjHdk28bA0VDHCEGgrtR+5kvsO1abLL76EjNto2flEKM1/nkT9Ao+I2nzJr7LxgFCeTjgJJgjXBGNSbpJA==; 3:3D7wuM6dnFaZho8YTnOMIQImxYsFmGt3QQJoqVjdkJ2OGo+ZB2bLerfTXpNVroNb9hLRXNJ8l8z1ESAEOQqOH4VeMkWu5g9JZmrY24vpr5t+xsdDWHO2B1kV/yeuifzFpx1TCPjH7/CEc99XxfTtQ1WJKUwUZMAh/C5lCwQkBTuV1an+lVSnnhYlW3lc8lhH7xMwsqFgn4EcjD028j3uCIg/0FYM/6Sjp1sArNyefdX1bFpwwiwN4VHj+F8xCEeY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB2377; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2377; 25:fH1MIUCG4wamXpE/MEZ3zcDkbAok1BLt9lRe5OL3YSO7ZRCjbjVhN9WOb8blod0jSNvk0C0QMvVSJIk8U6W8CuNURhfz3DW2cIggFpWUwEL2dVZzJVUMjO5lvnaZcvg/YyUaiF1K4HzeU7ep7eYX8DxH3b+xcEW+a47UJnEqEawzndxjorgHZEQbRtcYwuKymXDwM0MaisNobuc0RSBv9VI3BZEy7PCOCkhOojQxD2ztLd4lECIrWXFqwaGIs3LOFhQAGo4E0EtuETiA0e1U4RSRUJ7FyUEfx4J5K2+zAKTO84S0/d9wBXogz97jShH7uEQs5Pk1YDYVsNI7o96WiowR8ctyWjo3Ev4dtGudDTLZG0hnyi/aLbc2kjF3Hc3smJ6j7aDPSNNGFsON1J1v81w0weeSj3JjOJLnH7upgDYqLP4sSe1rtO2J9cnZPlTFuDHjcTtl0hZwD0w3730vY2pS1S4iPoSefCbZBZSpEDxsLtlBWazh90jflF4LMOaP9Hq/IFgVPY1EsJ335Ydzj0QRxEhMMO4kPC0u4VfzPZvQI0y2OoXPRnW3eaKu/CdaO3uSLgmiXfLHox0JQ1Dl2mKeHznTMibE3eGIiaKwbxjLb0hBXhoa4Kw9aQ4vKKRp7n+SLHy6u5nbNRUc48Cr+qG439/hLLk06LiJgL7nFj+pttz0a1uSZjstmWMrTLtGqne5QC7ibkVqlN2mxr5l278D7BQ1di/lICFo7Spm125dePr9I7qNPWbdXhBP5pTl X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2377; 31:69nCs5WULFg6FCKliX7SaVrxSvQe7CBVzvGuXnAgxjR77fIufuxQp+Z6ZladjFxLHA4IuSLbXU7zNgteZ2ZCuKZpmati08i1vGwBiafWQwZVlzUB9cR7atnfFlYIns+rogioNDsDFeWHZgOuNPzG//3HY7R9A8g+hjHZRIFBuuj71oASzD3VH64XzXy86L0b2JVl97OaUjNvNxtWlUa6dyWKhv1CdYxSqJqnW8lodtZpz3tQs1MUd1HDPeAtNkfORE6gG+x89PwmlcBhnXH4Q8PJM81vvrik2i2HrU5EJIw=; 4:Ih1tvkciE4Q3iOnyyt8LiVCq9c/OTuL0ue80qhDfur6dZZdlb4HTCdP2Px3RsRLr2mvO/dU5uy9M6ktDcMy4tnXjLmnbVcoeVpcmBWqcJ/pg50qbwmAwtAxxv8KtZjScpbGk2AZnGN6jxyrpnDM715mc+OQAGc1H7pwMPuUeSIereNEvf6nrL5cGrSsYkdXhhph5s4/aeEVQSvImhDyQDVuen0ZvznHSNT4snvMuVAzSg+0Mx91S5dE8njvS+PQ8+Fiqxv/Zx04fZe1d+peHd0Lepdh49OLvngo4TENSzWFq/sQb2/ASLVkTL/OmCyE2idZ7iEa5Am9vXcodIjAwXIbnHVMP1mwyG5P8D0bvSyd/pwCZP65oUyR0h1soaWhMmkI1yFMscpnFZ+L8fg+FxY6Wz3imWNwrAu1SycCduzyd4TdEVLaiZMR1AzlH+4cr6ZC2j1BZ7YqoboW/Qhwtzfyrt3EPWsm4LIi5ntGo6S6e0tCGZtD0mhmV+ps47hp7xLupPRLwDKiOySjTG2Jmp+6RCHJAaLo5cYjI5g3Lz9oCiOJbiu3xe8oiAWDJTo3h X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13023025)(13024025)(13015025)(13017025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:CY1PR03MB2377; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR03MB2377; X-Forefront-PRVS: 01136D2D90 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2377; 23:QsVX9wdahd+u+hyH0EVFHxwFMbJhWF0focFJ2E4LI?= =?us-ascii?Q?e/Hcc0Ki/HwVv8Z01OHGDVcxE0Lrx4UMDnAmNdk6QkcJv20nChRHIZqBKocp?= =?us-ascii?Q?UbhpLGedDKh/DKqiFaVfF3/Z1U8PMKCgxN5jTLqSROq5CoXLsI4gvxo7RzVO?= =?us-ascii?Q?JbH6EXgo0cqBQJ/rHHw+88Wvndwd2SWuO/DgQ2aT0ky7i5KXuSjBQYIr1c0t?= =?us-ascii?Q?HNh5U1uAVaSF/K88m4LOe4jHh4d4ukFSlp1msq/bRF/jigqiykXQrwikaevr?= =?us-ascii?Q?adqDbT+MYCFTnsE7eEs3hlZR9m59UNMS6mvs5yZAmW+THiErRyJSs/rwHE1V?= =?us-ascii?Q?ne1jLxEcUScv+10mG+NvXqnnfMhUsthEqNT3oS4qjToyLBu7npftzBBn53k/?= =?us-ascii?Q?+mI9wFTQr6RVRY8wOXQV5bYLNxFZQCauHiq6xkKFzV/Ti5AuF8mTeVfKXWbO?= =?us-ascii?Q?R/auchuHJaytNff2aEOV7C0SPvin10KyzoQI40tuQALIFezZKy5vJYm31S4L?= =?us-ascii?Q?ej+eii8ffqiEE3TdL1MezoM3xhZ1yZoERUp5hlhcRYYXyC0fYWFrrd1YnSoO?= =?us-ascii?Q?phpHG069VXZcfr3dpumC1f4orJxD7at1V2W9tsSPm77m4p7XotINr0dGEk/X?= =?us-ascii?Q?Hq0+2NAbbk8LwuTcKzMnNu5wRv7KvEkgcBuuNnyyXMBDSPgsccCUAs9fHNXQ?= =?us-ascii?Q?+7nzCRQ+JQYPmN+gobFWAQTAevFJ7pl4Ib9Kg7rYxGaYCkZVhDMdYhgo1Ocl?= =?us-ascii?Q?iDpP0arwWiECk5fhNgRgl4zLEYH2S8Qe/N8W66qoKsgaZiH/FlCunrvrKGcd?= =?us-ascii?Q?4lI/QTtISIGLneLXkk/RnshhbMTZeAYB8uurZRVGdeZ4dzGCMGAZkXmoIIco?= =?us-ascii?Q?yLvHnA8DONqDrg1iv+EePB+a/a3cCuyaXjCMQHtL8pCKQvhS1fi5lWha2IWo?= =?us-ascii?Q?vlbpcUzI4b4dOI8RPRfdqHzcz6ULVDbftLrDHHqY/i+sjIz3bgHTsevnUr5s?= =?us-ascii?Q?+DZdzfNeSS0kZnksGVHMK58qbISs/KmuVv2pJVxXm/cS6pnzxCXb1MWiJh97?= =?us-ascii?Q?AVHu94kTeoDI3QU7gX699RNWkSxPI10B09umjK1GpKxjFKZ50TGeKGpcB10A?= =?us-ascii?Q?/O7hUYGa6ajLFsGSLrki/5yQxIT6JIYFDiyIMYlMcxUHyUDoVG2W6StWMoOc?= =?us-ascii?Q?L/CnDwqJ/0hnfqdt1nI26Zt3eDOqp2BWQiig8DCBDztaVOMTZjU5qN84w=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2377; 6:KLDT9JaFXvPRjsUZlNA1XrpTFi7LywzBMra4lG11lkwdkDdJQ9GQTj4nEdX+AOvJ3+hPtIgwEBa+x32iFrZ1Hxx9YeZtVh7CmyAD2WbDRkPU4G6RDpdgYSESDO1CdObc77DUclXtFfBWuYHv7Ckpg/lDQWXzop0AnjFBa13vEOUqLHHDOzt9lGFL8anIV+NEJ9zZ7+CuJuu8iMR+1n27EuBWB1rw4qxIIfW9UkOiFmz0GBBMX9UIdxeSwReRukrPX3z19YoXQRUCzufuPKaBmUjfIWs8Xxpd5vDRlIIf7hYDCFBYMRH/OQMM5qPSVcD5; 5:WJNYFLwvXklPncDIrJlpYQU1JuhA2LmBsSeh04QKXzP01t10z9E+pQDSWkYySh23mbxxYPbxxupJ/BwuMagDoEoyvK9QoW2pzMl5yKRa/q2aPDAwdLTws2xpaEfsd/l74hsAH3sal7wcv2ah6YcKkmDJWPZeLvud2kymHNq2IxFJnMKMOiZk9hGqJGXju3ec; 24:9wbd/vg2O9omoimLHs349NmsfdP8/Z48lJewR30gN3XqWiSyq4zDCw0KVFLv3/sq7gLWWlg4OSdeIHmV04G7YIvL0B59CUwC9khw8kmFQxQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2377; 7:YEn2DeGOkzs7Bmd9zbogjDjyLrwleRwJ3y1/m/jPCLrFoWwnB++8EP80PhP6AyO43GLxLQQap2jxMa4lAvxU6e3D62MpcXefiSKWoZ9D3is323eDRmcxPHG/ZVWMqXoHjSybtplqjK2kv84pIv0SwuUWbMyXOt6u6MSuam4xhqQcYABIza/fp2Oxl7i8KDmq4mQEvAyNflLnIzH+dDl8TcS+PfCWPNZVCfS+756eMSsOct2NcK1XhKEw4k1Ybb+c2ZQyOEL0F2wsk/2KpdOPvkMqzoA2AG5Syw2Sza5OcQ0oLDJA6iQj2WSimwaMHFgslhJOL9JIuC6q9Wi+KHrFa5ymXa4xS3DW6RVwxy6H120= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2016 06:09:58.7284 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2377 Cc: Yuqing Zhu Subject: [PATCH v2 2/2] gstreamer1.0-plugins-bad: Fix build issue on non-GPU SoC X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2016 06:10:05 -0000 Content-Type: text/plain 1. Add directviv and g2d check in configure.ac 2. Add compile marcos in glupload and gldownload Signed-off-by: Yuqing Zhu --- ...MFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch | 454 +++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 1 + 2 files changed, 455 insertions(+) create mode 100755 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch new file mode 100755 index 0000000..44bb7b0 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch @@ -0,0 +1,454 @@ +From 506dd50401d4f702d92540db9cb90a752e6817aa Mon Sep 17 00:00:00 2001 +From: Haihua Hu +Date: Mon, 31 Oct 2016 15:22:01 +0800 +Subject: [PATCH] [MMFMWK-7308] Fix build issue on non-GPU soc. + +1.Add directviv and g2d check in configure.ac +2.Add compile marcos in glupload and gldownload + +Upstream-Status: Inappropriate [i.MX specific] + +Signed-off-by: Haihua Hu +--- + configure.ac | 27 +++++++++++++++- + ext/gl/gstgldownloadelement.c | 21 ++++++++++--- + gst-libs/gst/gl/Makefile.am | 22 ++++++++++--- + gst-libs/gst/gl/gstglbufferpool.c | 4 ++- + gst-libs/gst/gl/gstglupload.c | 66 ++++++++++++++++++++++----------------- + 5 files changed, 100 insertions(+), 40 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9d007f1..655e019 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -682,7 +682,9 @@ save_LIBS="$LIBS" + HAVE_GL=no + HAVE_GLES2=no + HAVE_WAYLAND_EGL=no +-HAV_FB_EGL=no ++HAVE_FB_EGL=no ++HAVE_DIRECTVIV=no ++HAVE_G2D=no + + HAVE_EGL_RPI=no + +@@ -722,6 +724,10 @@ case $host in + dnl check for imx fbbackend support + AC_CHECK_LIB(EGL, fbGetDisplay, HAVE_FB_EGL=yes, HAVE_FB_EGL=no) + ++ dnl specific check for imx soc ++ AC_CHECK_LIB(GLESv2, glTexDirectVIV, HAVE_DIRECTVIV=yes, HAVE_DIRECTVIV=no) ++ AC_CHECK_HEADER(g2d.h, HAVE_G2D=yes, HAVE_G2D=no) ++ + dnl FIXME: Mali EGL depends on GLESv1 or GLESv2 + AC_CHECK_HEADER([EGL/fbdev_window.h], + [ +@@ -820,6 +826,18 @@ if test "x$HAVE_GLES2" = "xno"; then + fi + fi + ++dnl specific for imx soc ++GST_GL_HAVE_DIRECTVIV=0 ++GST_GL_HAVE_PHYMEM=0 ++if test "x$HAVE_DIRECTVIV" = "xyes"; then ++ GST_GL_HAVE_DIRECTVIV=1 ++ if test "x$HAVE_G2D" = "xyes"; then ++ GST_GL_HAVE_PHYMEM=1 ++ else ++ AC_MSG_WARN([Physical memory do not support]) ++ fi ++fi ++ + dnl X, GLX and OpenGL + if test "x$HAVE_X" = "xno"; then + if test "x$NEED_GLX" = "xyes"; then +@@ -1265,6 +1283,8 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES + + GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES + #define GST_GL_HAVE_DMABUF $GST_GL_HAVE_DMABUF ++#define GST_GL_HAVE_DIRECTVIV $GST_GL_HAVE_DIRECTVIV ++#define GST_GL_HAVE_PHYMEM $GST_GL_HAVE_PHYMEM + " + + dnl Check for no platforms/window systems +@@ -1300,6 +1320,9 @@ if test "x$GL_APIS" = "x" -o "x$GL_PLATFORMS" = "x" -o "x$GL_WINDOWS" = "x"; the + HAVE_WINDOW_COCOA=no + HAVE_WINDOW_EAGL=no + HAVE_WINDOW_FB=no ++ ++ HAVE_DIRECTVIV=no ++ HAVE_G2D=no + fi + + AC_SUBST(GL_LIBS) +@@ -1316,6 +1339,8 @@ AM_CONDITIONAL(HAVE_WINDOW_WAYLAND, test "x$HAVE_WINDOW_WAYLAND" = "xyes") + AM_CONDITIONAL(HAVE_WINDOW_ANDROID, test "x$HAVE_WINDOW_ANDROID" = "xyes") + AM_CONDITIONAL(HAVE_WINDOW_EAGL, test "x$HAVE_WINDOW_EAGL" = "xyes") + AM_CONDITIONAL(HAVE_WINDOW_FB, test "x$HAVE_WINDOW_FB" = "xyes") ++AM_CONDITIONAL(HAVE_DIRECTVIV, test "x$HAVE_DIRECTVIV" = "xyes") ++AM_CONDITIONAL(HAVE_PHYMEM, test "x$HAVE_DIRECTVIV" = "xyes" -a "x$HAVE_G2D" = "xyes") + + AM_CONDITIONAL(USE_OPENGL, test "x$USE_OPENGL" = "xyes") + AM_CONDITIONAL(USE_GLES2, test "x$USE_GLES2" = "xyes") +diff --git a/ext/gl/gstgldownloadelement.c b/ext/gl/gstgldownloadelement.c +index 9ea0146..e89c36e 100644 +--- a/ext/gl/gstgldownloadelement.c ++++ b/ext/gl/gstgldownloadelement.c +@@ -23,9 +23,12 @@ + #endif + + #include +-#include + #include "gstgldownloadelement.h" + ++#if GST_GL_HAVE_PHYMEM ++#include ++#endif ++ + GST_DEBUG_CATEGORY_STATIC (gst_gl_download_element_debug); + #define GST_CAT_DEFAULT gst_gl_download_element_debug + +@@ -33,7 +36,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_download_element_debug); + G_DEFINE_TYPE_WITH_CODE (GstGLDownloadElement, gst_gl_download_element, + GST_TYPE_GL_BASE_FILTER, + GST_DEBUG_CATEGORY_INIT (gst_gl_download_element_debug, "gldownloadelement", +- 0, "download element");); ++ 0, "download element"); ++ ); + + static gboolean gst_gl_download_element_get_unit_size (GstBaseTransform * trans, + GstCaps * caps, gsize * size); +@@ -170,6 +174,7 @@ gst_gl_download_element_prepare_output_buffer (GstBaseTransform * bt, + gint i, n; + GstGLMemory *glmem; + ++#if GST_GL_HAVE_PHYMEM + glmem = gst_buffer_peek_memory (inbuf, 0); + if (gst_is_gl_physical_memory (glmem)) { + GstGLContext *context = GST_GL_BASE_FILTER (bt)->context; +@@ -182,6 +187,7 @@ gst_gl_download_element_prepare_output_buffer (GstBaseTransform * bt, + + return GST_FLOW_OK; + } ++#endif /* GST_GL_HAVE_PHYMEM */ + + *outbuf = inbuf; + +@@ -235,19 +241,23 @@ gst_gl_download_element_propose_allocation (GstBaseTransform * bt, + return FALSE; + } + +- GST_DEBUG_OBJECT (bt, "video format is %s", gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&info))); ++ GST_DEBUG_OBJECT (bt, "video format is %s", ++ gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (&info))); + + gst_allocation_params_init (¶ms); ++ ++#if GST_GL_HAVE_PHYMEM + if (gst_is_gl_physical_memory_supported_fmt (&info)) { + allocator = gst_phy_mem_allocator_obtain (); + GST_DEBUG_OBJECT (bt, "obtain physical memory allocator %p.", allocator); + } ++#endif /* GST_GL_HAVE_PHYMEM */ + + if (!allocator) + allocator = gst_allocator_find (GST_GL_MEMORY_ALLOCATOR_NAME); + + if (!allocator) { +- GST_ERROR_OBJECT (bt, "Can't obtain physical memory allocator."); ++ GST_ERROR_OBJECT (bt, "Can't obtain gl memory allocator."); + return FALSE; + } + +@@ -268,7 +278,8 @@ gst_gl_download_element_propose_allocation (GstBaseTransform * bt, + /* the normal size of a frame */ + size = info.size; + gst_buffer_pool_config_set_params (config, caps, size, 0, 0); +- gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_GL_SYNC_META); ++ gst_buffer_pool_config_add_option (config, ++ GST_BUFFER_POOL_OPTION_GL_SYNC_META); + + if (!gst_buffer_pool_set_config (pool, config)) { + gst_object_unref (pool); +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index 55f8a20..c52bba5 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -33,10 +33,16 @@ libgstgl_@GST_API_VERSION@_la_SOURCES = \ + gstglviewconvert.c \ + gstgloverlaycompositor.c \ + gstglquery.c \ +- gstglvivdirecttexture.c \ +- gstglphymemory.c \ + gstglcontrolbindingproxy.c + ++if HAVE_DIRECTVIV ++libgstgl_@GST_API_VERSION@_la_SOURCES += gstglvivdirecttexture.c ++endif ++ ++if HAVE_PHYMEM ++libgstgl_@GST_API_VERSION@_la_SOURCES += gstglphymemory.c ++endif ++ + libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl + libgstgl_@GST_API_VERSION@include_HEADERS = \ + gstglwindow.h \ +@@ -68,10 +74,16 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \ + gstglcontrolbindingproxy.h \ + gstgl_fwd.h \ + gstgl_enums.h \ +- gstglvivdirecttexture.h \ +- gstglphymemory.h \ + gl.h + ++if HAVE_DIRECTVIV ++libgstgl_@GST_API_VERSION@include_HEADERS += gstglvivdirecttexture.h ++endif ++ ++if HAVE_PHYMEM ++libgstgl_@GST_API_VERSION@include_HEADERS += gstglphymemory.h ++endif ++ + noinst_HEADERS = \ + gstglsl_private.h \ + utils/opengl_versions.h \ +@@ -86,7 +98,9 @@ libgstgl_@GST_API_VERSION@_la_LIBADD = \ + $(GST_LIBS) \ + $(GL_LIBS) + ++if HAVE_PHYMEM + libgstgl_@GST_API_VERSION@_la_LIBADD += -lg2d ++endif + + if HAVE_WINDOW_WIN32 + SUBDIRS += win32 +diff --git a/gst-libs/gst/gl/gstglbufferpool.c b/gst-libs/gst/gl/gstglbufferpool.c +index 71c726a..77452be 100644 +--- a/gst-libs/gst/gl/gstglbufferpool.c ++++ b/gst-libs/gst/gl/gstglbufferpool.c +@@ -292,8 +292,9 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer, + } + #endif + ++#if GST_GL_HAVE_PHYMEM + if ((g_strcmp0 (priv->allocator->mem_type, GST_GL_PHY_MEM_ALLOCATOR) == 0)) { +- GstAllocator* allocator = (GstAllocator*) gst_phy_mem_allocator_obtain (); ++ GstAllocator *allocator = (GstAllocator *) gst_phy_mem_allocator_obtain (); + if (!gst_gl_physical_memory_setup_buffer (allocator, buf, priv->gl_params)) { + GST_ERROR_OBJECT (pool, "Can't create physcial buffer."); + return GST_FLOW_ERROR; +@@ -301,6 +302,7 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer, + *buffer = buf; + return GST_FLOW_OK; + } ++#endif + + alloc = GST_GL_MEMORY_ALLOCATOR (priv->allocator); + if (!gst_gl_memory_setup_buffer (alloc, buf, priv->gl_params)) +diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c +index 99cc68a..d17fab3 100644 +--- a/gst-libs/gst/gl/gstglupload.c ++++ b/gst-libs/gst/gl/gstglupload.c +@@ -23,7 +23,6 @@ + #endif + + #include +-#include + + #include "gl.h" + #include "gstglupload.h" +@@ -36,6 +35,9 @@ + #include + #endif + ++#if GST_GL_HAVE_DIRECTVIV ++#include ++#endif + /** + * SECTION:gstglupload + * @short_description: an object that uploads to GL textures +@@ -316,8 +318,8 @@ _gl_memory_upload_propose_allocation (gpointer impl, GstQuery * decide_query, + gst_allocation_params_init (¶ms); + + allocator = +- GST_ALLOCATOR (gst_gl_memory_allocator_get_default (upload-> +- upload->context)); ++ GST_ALLOCATOR (gst_gl_memory_allocator_get_default (upload->upload-> ++ context)); + gst_query_add_allocation_param (query, allocator, ¶ms); + gst_object_unref (allocator); + } +@@ -603,8 +605,8 @@ _egl_image_upload_perform_gl_thread (GstGLContext * context, + } + + if (GST_IS_GL_BUFFER_POOL (image->buffer->pool)) +- gst_gl_buffer_pool_replace_last_buffer (GST_GL_BUFFER_POOL (image-> +- buffer->pool), image->buffer); ++ gst_gl_buffer_pool_replace_last_buffer (GST_GL_BUFFER_POOL (image->buffer-> ++ pool), image->buffer); + } + + static GstGLUploadReturn +@@ -1045,11 +1047,11 @@ _upload_meta_upload_propose_allocation (gpointer impl, GstQuery * decide_query, + gpointer handle; + + gl_apis = +- gst_gl_api_to_string (gst_gl_context_get_gl_api (upload->upload-> +- context)); +- platform = +- gst_gl_platform_to_string (gst_gl_context_get_gl_platform (upload-> ++ gst_gl_api_to_string (gst_gl_context_get_gl_api (upload-> + upload->context)); ++ platform = ++ gst_gl_platform_to_string (gst_gl_context_get_gl_platform ++ (upload->upload->context)); + handle = (gpointer) gst_gl_context_get_gl_context (upload->upload->context); + + gl_context = +@@ -1170,6 +1172,7 @@ static const UploadMethod _upload_meta_upload = { + &_upload_meta_upload_free + }; + ++#if GST_GL_HAVE_DIRECTVIV + struct PhyBufferUpload + { + GstGLUpload *upload; +@@ -1177,7 +1180,7 @@ struct PhyBufferUpload + }; + + static gpointer +-_physical_buffer_upload_new(GstGLUpload *upload) ++_physical_buffer_upload_new (GstGLUpload * upload) + { + struct PhyBufferUpload *phybuffer = g_new0 (struct PhyBufferUpload, 1); + +@@ -1187,8 +1190,8 @@ _physical_buffer_upload_new(GstGLUpload *upload) + } + + static GstCaps * +-_physical_buffer_upload_transform_caps(GstGLContext *context, +- GstPadDirection direction, GstCaps *caps) ++_physical_buffer_upload_transform_caps (GstGLContext * context, ++ GstPadDirection direction, GstCaps * caps) + { + GstCapsFeatures *passthrough = + gst_caps_features_from_string +@@ -1208,7 +1211,7 @@ _physical_buffer_upload_transform_caps(GstGLContext *context, + ret = tmp; + } else { + ret = gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES +- (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,GST_GL_DIRECTVIV_FORMAT)); ++ (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, GST_GL_DIRECTVIV_FORMAT)); + } + + gst_caps_features_free (passthrough); +@@ -1216,16 +1219,16 @@ _physical_buffer_upload_transform_caps(GstGLContext *context, + } + + static gboolean +-_physical_buffer_upload_accept(gpointer impl, GstBuffer *buffer, +- GstCaps *in_caps, GstCaps *out_caps) ++_physical_buffer_upload_accept (gpointer impl, GstBuffer * buffer, ++ GstCaps * in_caps, GstCaps * out_caps) + { +- struct PhyBufferUpload *upload = impl; ++ struct PhyBufferUpload *upload = impl; + GstCapsFeatures *features; + + features = gst_caps_get_features (out_caps, 0); + if (!gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_GL_MEMORY)) + return FALSE; +- ++ + if (upload->params) + gst_gl_allocation_params_free ((GstGLAllocationParams *) upload->params); + if (!(upload->params = +@@ -1234,18 +1237,19 @@ _physical_buffer_upload_accept(gpointer impl, GstBuffer *buffer, + GST_GL_TEXTURE_TARGET_2D))) + return FALSE; + +- return gst_is_physical_buffer(buffer); ++ return gst_is_physical_buffer (buffer); + } + + static void +-_physical_buffer_upload_propose_allocation(gpointer impl, GstQuery *decide_query, +- GstQuery *query) ++_physical_buffer_upload_propose_allocation (gpointer impl, ++ GstQuery * decide_query, GstQuery * query) + { + gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0); + } + + static GstGLUploadReturn +-_physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **outbuf) ++_physical_buffer_upload_perform (gpointer impl, GstBuffer * buffer, ++ GstBuffer ** outbuf) + { + struct PhyBufferUpload *phyBuffer = impl; + GstGLMemoryAllocator *allocator; +@@ -1255,7 +1259,7 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou + info = &phyBuffer->upload->priv->out_info; + n_mem = GST_VIDEO_INFO_N_PLANES (info); + GST_LOG_OBJECT (phyBuffer->upload, "Attempting viv direct upload"); +- ++ + allocator = + GST_GL_MEMORY_ALLOCATOR (gst_allocator_find + (GST_GL_MEMORY_PBO_ALLOCATOR_NAME)); +@@ -1265,11 +1269,10 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou + gst_gl_memory_setup_buffer (allocator, *outbuf, phyBuffer->params); + gst_object_unref (allocator); + +- GstGLMemory *out_gl_mem = +- (GstGLMemory *) gst_buffer_peek_memory (*outbuf, 0); ++ GstGLMemory *out_gl_mem = (GstGLMemory *) gst_buffer_peek_memory (*outbuf, 0); + +- gst_gl_viv_direct_bind_gstbuffer(phyBuffer->upload->context, out_gl_mem->tex_id, +- &phyBuffer->upload->priv->in_info, buffer); ++ gst_gl_viv_direct_bind_gstbuffer (phyBuffer->upload->context, ++ out_gl_mem->tex_id, &phyBuffer->upload->priv->in_info, buffer); + + gst_buffer_add_video_meta_full (*outbuf, 0, + GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info), +@@ -1279,14 +1282,14 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou + } + + static void +-_physical_buffer_upload_free(gpointer impl) ++_physical_buffer_upload_free (gpointer impl) + { + struct PhyBufferUpload *phyBuffer = impl; + + if (phyBuffer->params) + gst_gl_allocation_params_free ((GstGLAllocationParams *) phyBuffer->params); + +- g_free(phyBuffer); ++ g_free (phyBuffer); + } + + static GstStaticCaps _physical_buffer_upload_caps = +@@ -1303,6 +1306,7 @@ static const UploadMethod _physical_buffer_upload = { + &_physical_buffer_upload_perform, + &_physical_buffer_upload_free + }; ++#endif /* GST_GL_HAVE_DIRECTVIV */ + + struct RawUploadFrame + { +@@ -1526,7 +1530,11 @@ static const UploadMethod *upload_methods[] = { &_gl_memory_upload, + #if GST_GL_HAVE_DMABUF + &_dma_buf_upload, + #endif +- &_upload_meta_upload, &_physical_buffer_upload, &_raw_data_upload ++ &_upload_meta_upload, ++#if GST_GL_HAVE_DIRECTVIV ++ &_physical_buffer_upload, ++#endif ++ &_raw_data_upload + }; + + static GMutex upload_global_lock; +-- +1.9.1 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 9ee82a8..110bd8d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -19,6 +19,7 @@ SRC_URI_append_imxgpu3d = " \ file://0006-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch \ file://0007-glwindow-work-around-for-no-frame-when-imxplayer-use.patch \ file://0008-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch \ + file://0009-MMFMWK-7308-Fix-build-issue-on-non-GPU-soc.patch \ " -- 1.9.1