From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 9C22BE00C25; Wed, 27 Jan 2016 01:44:55 -0800 (PST) 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 * [157.56.111.141 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0141.outbound.protection.outlook.com [157.56.111.141]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 56DF1E00C1A for ; Wed, 27 Jan 2016 01:44:53 -0800 (PST) Received: from BN3PR0301CA0010.namprd03.prod.outlook.com (10.160.180.148) by BN3PR0301MB1172.namprd03.prod.outlook.com (10.160.156.146) with Microsoft SMTP Server (TLS) id 15.1.390.13; Wed, 27 Jan 2016 09:44:50 +0000 Received: from BN1AFFO11FD051.protection.gbl (2a01:111:f400:7c10::152) by BN3PR0301CA0010.outlook.office365.com (2a01:111:e400:4000::20) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Wed, 27 Jan 2016 09:44:50 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD051.mail.protection.outlook.com (10.58.53.66) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Wed, 27 Jan 2016 09:44:49 +0000 Received: from carol-OptiPlex-3020.ap.freescale.net (carol-OptiPlex-3020.ap.freescale.net [10.192.241.17]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u0R9idNp003913; Wed, 27 Jan 2016 02:44:48 -0700 From: Yuqing Zhu To: Date: Wed, 27 Jan 2016 17:41:55 +0800 Message-ID: <1453887720-16863-5-git-send-email-b54851@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453887720-16863-1-git-send-email-b54851@freescale.com> References: <1453887720-16863-1-git-send-email-b54851@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD051; 1:IPI57JdeTxgkgzadbB2A5wjGK5WQl62Hp53+csCIwKtslF74jHeeSKqB+RO7Klk2Vxv4VlKuiGPs98ByhU7rkeg2DG5K3DYzfkr4qpvdgvdB4iehU+r0hgzh30b2/Pv/wRkbPPQRovdtJzgKVFcoaXWBvhHY24R5Wy4+MuZ2ZnR++4sAAUyfsNHr1EvzFBQ2xO++WFzSPhbrbWzTyV0jIKWME7b2epTzc/S5GC6vi0FTvGNYNtaStdkK8ZTXvkcrnfzBJ424rPvzgmamGI3vM9sSX5Qv/7Z/HQc7E/VmPYu4ugg1B/VeUgAh5W6wRbtULCQWT9d3gCME/EKCz8GdWKfPxhviCxCzHnkY3lO/c+bm38ubLt4J08ZsuQ0p9yZeYnV7hQkP3x9HWeXn6p1RSxMRsMWOnna44ZJrdwpks84r8jUF58bNFJGVbz3eM1xS X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(77096005)(450100001)(48376002)(47776003)(575784001)(586003)(86362001)(229853001)(33646002)(4326007)(19580395003)(19580405001)(81156007)(97736004)(5008740100001)(230783001)(2950100001)(92566002)(87936001)(5003940100001)(106466001)(50986999)(6806005)(76176999)(85326001)(4001430100002)(50466002)(69596002)(189998001)(104016004)(36756003)(107886002)(110136002)(3470700001)(11100500001)(1220700001)(50226001)(2351001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0301MB1172; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 49fc680d-ddb3-464e-b167-08d326fe8012 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1172; 2:HRSMrD17FKwwn0z3wbq1DRxmbuRNy3OVkkoACFj6WdVdDhgf0CcVRXospBXKI5XPtT1Zn8slyk1g82eB1LdLdTt2Bw7daWuQzXLzY1vAWyP8c+hOdPXaXYtWbua+eqWAVYNMOf48HK5PTc9FMW7wxyV3V63I0FP6Bij13LTRc2f3fwb44fbb9xOE5W2s0t4b; 3:OLfIvraMD5IRePEdFsHesVWxM1YhjLp4750ONoGMUv5VC5gQTzDONTwszSI+Ic62bbUqBnLAaOobHsHqZwwuyKqr81GxwEOjYYp6nnLijOaaqMNL3QIFkMsqBo1pjO7lgk8ZvtQJ/c3zQvOa5Z+o7wDgjq426MoYiar7Tvegm9EwRdlGQ5MT06gFqz+f8upXa3fyzNhDxeawH9JajDvUhO5gPcmvlR42GHpVshkzr7Y=; 25:4I3BeRMMIbx6M6MrDwNoQyb6zH6rb+gYAEF61zPm7AW4E766I+e2traDjzwTTc+ez8sya2cnFwQHUc1Rh4HKjBQ/jpM12iQPvYW1Wa2fe9cwbzAJrnk3qye+wHjwoIKYrxroVFSAmOOvJIqN8dvhPv3sExvMuvnwOVhHADhZT+fGAjCiaLZFfG8sCKds4ZDiM4SFdUgrkeTcMKxihwo18Pr/NEEc7ImsrwPU+N+tVS7B1//Y0tl3WU7u4pBQR/fI X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0301MB1172; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1172; 20:xO+Ln8MGt2OeNpT0resMcBpthSEpmjusDDEr+DHd8/1ecfu9DjYB8MdTAmSGIy+r/blAYDIJwWqgOk4Bjs+ID2cw1IHHW+V7ItNSKSMCtbNcWs7m5xdnGjjoGZTTEh2fdBrPCoC+wo/jIQeJEqBCDoXOSjoro+Anyli35rXRmOINQszbnqX4PlZL9Jlct1/YqryLLcgQ9Blb9bRrQXj1je8E/Bmiu7MN1KsMtMDeM9LE2Bq1kBFoWGMIXKbzy3pkTVltSdzBa8vJONn1kdNmJ9UfqRv8et41aOntEpTbZclR16dlAlgmvO0cAASME4PEx/+02Ue/aQBb2TbhXWXpdBR5Y2EQ7KHt/YuqafxhQF+wOl0024hhcHNOA0CSmZ7xhSEIIiCQjm7QwcQCNnb9GDVygNJd/c2nupeuN6N0GyUR7lAjuohmniiOLqQJfkHL X-Forefront-PRVS: 0834BAF534 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB1172; 23:bPoaSZyEygb+jI1hz1ie24l6AKDyAjbBoV1xM4N?= =?us-ascii?Q?cPbDnGjv+NBLJOwkV6xGkBF8z32RrmDlwIznT/6WVojqyKfMRHqM1+dW8Jsa?= =?us-ascii?Q?mav8TbkxsNsGOD54hHKX23CQPK5Fq+Vqo1iZjFKIY5B1erUBtpHjGqfMnEyM?= =?us-ascii?Q?4+K9WiuPirF3hU9KeJKQOA7urDO0U5eHyMrhSMbT1nE35X6cn2mp1RpAIOZb?= =?us-ascii?Q?rjo/xqJFEpzQF/HT06KGE/0VSbayQltq5u3YIbTqm69es0NlxrwGNKpnuJB0?= =?us-ascii?Q?oG2lDPanpoWBTUIc40mW1Znce/n+bBFFGSHoP3g9rqwKpEWsFMcGNwkG9RuZ?= =?us-ascii?Q?xm8dBHvy0tdJUHJqQwergIz49S9/dQL5BhAVLRWZ7IENH0Wc0z6SggJMR//h?= =?us-ascii?Q?+WIv74pUKhviPdZ/MZQwppFgu7JWmZf7gwkdqnZRLA4dpFicsE4eaenDqjDr?= =?us-ascii?Q?ZWXaCcDIm1Dk99TmIAcIGjpIFAOfim28+vawPdel82cOLCJWvKiPFS6Lj/rq?= =?us-ascii?Q?lbKWDHs8rD/cNSk3SLUUylUBzd6qZnW/8AaCZVs1vfVsBLNvhEQ3YaS5pmar?= =?us-ascii?Q?Y5/C6Y8gf6VwYRXZLGGHv5Ix5XNUTWgIlTjjzrVCXCZZpZI9aYfu3HFJdnsp?= =?us-ascii?Q?t1lyIZ1TYWJax7ly2KwYEiHr48dDWWRWKPmlP4GN/dNtU/wVrNoNkd9ODd3C?= =?us-ascii?Q?ps8rZcZ2rH+J2/5CrDQdzM79McI8aJawWQnoi3px1/ux9k5khxJKJqLoEEwd?= =?us-ascii?Q?o0kMtrgAGn7g/yPYVAvI+PO8HRxh9VV5kb1pdoGrSyhnGtc1mzNwdlC9oRPH?= =?us-ascii?Q?uZ8friVntJLTqWBgbsiA+OXh85BJr8wI6MdBnan0qITCFKGwZa/am/ETPVNB?= =?us-ascii?Q?gi/83skMhmQE5SYzTCbS0z/veYPK/EDgUedE477ah59S6lvkQ0fp6TPksJ+K?= =?us-ascii?Q?MT/TphnK3LTZK/DrWZJrwhMpq+Zc6kOgQtpMm1bBydNr8a9/CVIjMxoQO9iD?= =?us-ascii?Q?+4o/rcLu0tKH9+9l2UfMMLpw4XI129CpOjFb7eeRbOVT6Engjn1TOgbq0fjW?= =?us-ascii?Q?YciqgcN9hchD2wvtke/A6JCcp/y0KQG09g/frWhctkhGlHXfaTNOJUTdGprb?= =?us-ascii?Q?LBkn5Yh6O/bvqxxYmC8ykX0J0crTNRsqM?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1172; 24:q2YHJ2Vj1MyVbqQUrADXVPvcLnacGFsiDJMQeBvRRRbXa6unYhL3d+EhZwaKu5ViUCeB3tzjzMnlgsaYzoX0RyNEMP4tYEZDPOkKow8DC6Y= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2016 09:44:49.9445 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1172 Subject: [meta-fsl-arm][PATCH 4/9] gstreamer1.0-plugins-bad: Support video crop for glimagesink 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: Wed, 27 Jan 2016 09:44:55 -0000 Content-Type: text/plain 1.Add video crop meta copy in glupload. 2.Calculate the new texture coordinate in vertices array and bind to buffer object. 3.Make glimagesink only updating vertices array when video crop meta changed. Signed-off-by: Yuqing Zhu --- ...plugin-support-video-crop-for-glimagesink.patch | 155 +++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 1 + 2 files changed, 156 insertions(+) create mode 100755 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-glplugin-support-video-crop-for-glimagesink.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-glplugin-support-video-crop-for-glimagesink.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-glplugin-support-video-crop-for-glimagesink.patch new file mode 100755 index 0000000..0d0ade7 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-glplugin-support-video-crop-for-glimagesink.patch @@ -0,0 +1,155 @@ +From 1a917447c3749f0a6d3ff98b8dcbc7439b48293d Mon Sep 17 00:00:00 2001 +From: Haihua Hu +Date: Fri, 13 Nov 2015 10:51:25 +0800 +Subject: [PATCH] [glplugin] support video crop for glimagesink + +1.Add video crop meta copy in glupload +2.Calculate the new texture coordinate in vertices array and bind to buffer object +3.Make glimagesink only updating vertices array when video crop meta changed + +Upstream-Status: Inappropriate [i.MX specific] + +Signed-off-by: Haihua Hu +--- + ext/gl/gstglimagesink.c | 53 ++++++++++++++++++++++++++++++++++++++++- + ext/gl/gstglimagesink.h | 3 +++ + gst-libs/gst/gl/gstglupload.c | 10 ++++++++ + 3 files changed, 65 insertions(+), 1 deletion(-) + +diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c +index 1e5dc05..6fc0f9e 100644 +--- a/ext/gl/gstglimagesink.c ++++ b/ext/gl/gstglimagesink.c +@@ -585,6 +585,8 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink) + glimage_sink->handle_events = TRUE; + glimage_sink->ignore_alpha = TRUE; + glimage_sink->overlay_compositor = NULL; ++ glimage_sink->cropmeta = NULL; ++ glimage_sink->prev_cropmeta = NULL; + + glimage_sink->mview_output_mode = DEFAULT_MULTIVIEW_MODE; + glimage_sink->mview_output_flags = DEFAULT_MULTIVIEW_FLAGS; +@@ -1039,6 +1041,12 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition) + gst_object_unref (glimage_sink->display); + glimage_sink->display = NULL; + } ++ ++ glimage_sink->cropmeta = NULL; ++ if (glimage_sink->prev_cropmeta) ++ g_slice_free(GstVideoCropMeta, glimage_sink->prev_cropmeta); ++ glimage_sink->prev_cropmeta = NULL; ++ + break; + default: + break; +@@ -1452,6 +1460,8 @@ gst_glimage_sink_show_frame (GstVideoSink * vsink, GstBuffer * buf) + GST_VIDEO_SINK_WIDTH (glimage_sink), + GST_VIDEO_SINK_HEIGHT (glimage_sink)); + ++ glimage_sink->cropmeta = gst_buffer_get_video_crop_meta (buf); ++ + /* Ask the underlying window to redraw its content */ + if (!gst_glimage_sink_redisplay (glimage_sink)) + goto redisplay_failed; +@@ -1638,7 +1648,7 @@ config_failed: + } + + /* *INDENT-OFF* */ +-static const GLfloat vertices[] = { ++static GLfloat vertices[] = { + 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, + -1.0f, 1.0f, 0.0f, 0.0f, 0.0f, + -1.0f, -1.0f, 0.0f, 0.0f, 1.0f, +@@ -1898,6 +1908,47 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink) + + gst_gl_shader_use (gl_sink->redisplay_shader); + ++ if (gl_sink->cropmeta) { ++ gint width = GST_VIDEO_SINK_WIDTH (gl_sink); ++ gint height = GST_VIDEO_SINK_HEIGHT (gl_sink); ++ ++ if (!gl_sink->prev_cropmeta){ ++ /* Initialize the previous crop meta and set all memroy to zero */ ++ gl_sink->prev_cropmeta = (GstVideoCropMeta *) g_slice_new0(GstVideoCropMeta); ++ } ++ ++ /* If crop meta not equal to the previous, recalculate the vertices */ ++ if (gl_sink->prev_cropmeta->x != gl_sink->cropmeta->x ++ || gl_sink->prev_cropmeta->y != gl_sink->cropmeta->y ++ || gl_sink->prev_cropmeta->width != gl_sink->cropmeta->width ++ || gl_sink->prev_cropmeta->height != gl_sink->cropmeta->height){ ++ ++ vertices[8] = (float)(gl_sink->cropmeta->x) / width; ++ vertices[9] = (float)(gl_sink->cropmeta->y) / height; ++ ++ vertices[3] = (float)(gl_sink->cropmeta->width + gl_sink->cropmeta->x) / width; ++ vertices[4] = vertices[9]; ++ ++ vertices[13] = vertices[8]; ++ vertices[14] = (float)(gl_sink->cropmeta->height + gl_sink->cropmeta->y) / height; ++ ++ vertices[18] = vertices[3]; ++ vertices[19] = vertices[14]; ++ ++ gl->BindBuffer (GL_ARRAY_BUFFER, gl_sink->vertex_buffer); ++ gl->BufferData (GL_ARRAY_BUFFER, 4 * 5 * sizeof (GLfloat), vertices, ++ GL_STATIC_DRAW); ++ ++ gl->BindBuffer (GL_ARRAY_BUFFER, 0); ++ ++ /* Store the previous crop meta */ ++ gl_sink->prev_cropmeta->x = gl_sink->cropmeta->x; ++ gl_sink->prev_cropmeta->y = gl_sink->cropmeta->y; ++ gl_sink->prev_cropmeta->width = gl_sink->cropmeta->width; ++ gl_sink->prev_cropmeta->height = gl_sink->cropmeta->height; ++ } ++ } ++ + if (gl->GenVertexArrays) + gl->BindVertexArray (gl_sink->vao); + else +diff --git a/ext/gl/gstglimagesink.h b/ext/gl/gstglimagesink.h +index f7b3bfb..a26ca4b 100644 +--- a/ext/gl/gstglimagesink.h ++++ b/ext/gl/gstglimagesink.h +@@ -102,6 +102,9 @@ struct _GstGLImageSink + guint window_width; + guint window_height; + ++ GstVideoCropMeta *cropmeta; ++ GstVideoCropMeta *prev_cropmeta; ++ + GstVideoRectangle display_rect; + + GstGLShader *redisplay_shader; +diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c +index acaa329..0d36248 100644 +--- a/gst-libs/gst/gl/gstglupload.c ++++ b/gst-libs/gst/gl/gstglupload.c +@@ -756,6 +756,7 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou + { + struct PhyBufferUpload *phyBuffer = impl; + GstVideoInfo *info; ++ GstVideoCropMeta *incropmeta, *outcropmeta; + gint n_mem; + + info = &phyBuffer->upload->priv->out_info; +@@ -774,6 +775,15 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou + gst_buffer_add_video_meta_full (*outbuf, 0, + GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info), + GST_VIDEO_INFO_HEIGHT (info), n_mem, info->offset, info->stride); ++ /* add video crop meta to out buffer if need */ ++ incropmeta = gst_buffer_get_video_crop_meta(buffer); ++ if(incropmeta){ ++ outcropmeta = gst_buffer_add_video_crop_meta(*outbuf); ++ outcropmeta->x = incropmeta->x; ++ outcropmeta->y = incropmeta->y; ++ outcropmeta->width = incropmeta->width; ++ outcropmeta->height = incropmeta->height; ++ } + + return GST_GL_UPLOAD_DONE; + } +-- +1.7.9.5 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 7b5788c..ba7269b 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -14,6 +14,7 @@ IMX_PATCHES = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h file://0002-modifiy-the-videoparse-rank.patch \ file://0003-Fix-for-gl-plugin-not-built-in-wayland-backend.patch \ file://0004-glplugin-Add-directviv-to-glimagesink-to-improve-playback-performance.patch \ + file://0005-glplugin-support-video-crop-for-glimagesink.patch \ " SRC_URI_append_mx6 = "${IMX_PATCHES}" -- 1.9.1