summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-01-19 18:18:45 -0300
committerReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-01-19 18:18:45 -0300
commit17bb1d7b3e7b21565a35831f678a4f16aae089fe (patch)
tree9cc814a8e80c6b4e35f426c556bc2e3de2404c3a
parent701a9c01f7c87d8f765009df50c58f3fad0a55d8 (diff)
Cosmetics
-rw-r--r--sink/surfaceflingersink/gstsurfaceflingersink.c6
-rw-r--r--sink/surfaceflingersink/surfaceflinger_wrap.cpp25
2 files changed, 12 insertions, 19 deletions
diff --git a/sink/surfaceflingersink/gstsurfaceflingersink.c b/sink/surfaceflingersink/gstsurfaceflingersink.c
index 06cae8c..5f40577 100644
--- a/sink/surfaceflingersink/gstsurfaceflingersink.c
+++ b/sink/surfaceflingersink/gstsurfaceflingersink.c
@@ -73,7 +73,7 @@ static GstCaps *gst_surfaceflinger_sink_getcaps (GstBaseSink * bsink);
static GstVideoSinkClass *parent_class = NULL;
-/* TODO: support more pixel form in the future */
+/* TODO: Add support for other pixel formats */
#define GST_SURFACE_TEMPLATE_CAPS GST_VIDEO_CAPS_RGB_16
static void
@@ -234,7 +234,7 @@ gst_surfaceflinger_sink_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_SURFACE:
surfacesink->isurface = g_value_get_pointer (value);
- GST_DEBUG_OBJECT (surfacesink, "set property: ISureface = %p",
+ GST_DEBUG_OBJECT (surfacesink, "set property: ISurface = %p",
surfacesink->isurface);
break;
@@ -256,7 +256,7 @@ gst_surfaceflinger_sink_get_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_SURFACE:
g_value_set_pointer (value, surfacesink->isurface);
- GST_DEBUG_OBJECT (surfacesink, "get property: ISurface = %p.",
+ GST_DEBUG_OBJECT (surfacesink, "get property: ISurface = %p",
surfacesink->isurface);
break;
diff --git a/sink/surfaceflingersink/surfaceflinger_wrap.cpp b/sink/surfaceflingersink/surfaceflinger_wrap.cpp
index 0a83035..82c0638 100644
--- a/sink/surfaceflingersink/surfaceflinger_wrap.cpp
+++ b/sink/surfaceflingersink/surfaceflinger_wrap.cpp
@@ -51,8 +51,8 @@ static int videoflinger_device_create_new_surface (VideoFlingerDevice *
/*
* The only purpose of class "MediaPlayer" is to call Surface::getISurface()
- * in frameworks/base/include/ui/Surface.h, which is private function and accessed
- * by friend class MediaPlayer.
+ * in frameworks/base/include/ui/Surface.h, which is private function and
+ * accessed by friend class MediaPlayer.
*
* We define a fake one to cheat compiler
*/
@@ -107,8 +107,8 @@ videoflinger_device_create_new_surface (VideoFlingerDevice * videodev)
GST_INFO ("Enter\n");
/* Create a new Surface object with 320x240
- * TODO: Create surface according to device's screen size and rotate it
- * 90, but not a pre-defined value.
+ * FIXME: Create surface according to device's screen size and rotate it
+ * 90 without using a pre-defined size.
*/
sp < SurfaceComposerClient > videoClient = new SurfaceComposerClient;
if (videoClient.get () == NULL) {
@@ -116,7 +116,7 @@ videoflinger_device_create_new_surface (VideoFlingerDevice * videodev)
return -1;
}
- /* release privious surface */
+ /* release previous surface */
videodev->surface.clear ();
videodev->isurface.clear ();
@@ -136,8 +136,8 @@ videoflinger_device_create_new_surface (VideoFlingerDevice * videodev)
videoClient->openTransaction ();
- /* set Surface toppest z-order, this will bypass all isurface created
- * in java side and make sure this surface displaied in toppest */
+ /* Set Surface toppest z-order. This will bypass all ISurface created
+ * in java side and make sure this surface is displayed above all */
state = videodev->surface->setLayer (INT_MAX);
if (state != NO_ERROR) {
GST_INFO ("videoSurface->setLayer(), state = %d", state);
@@ -147,13 +147,6 @@ videoflinger_device_create_new_surface (VideoFlingerDevice * videodev)
/* show surface */
state = videodev->surface->show ();
- /*state = videodev->surface->setLayer(INT_MAX);
- if (state != NO_ERROR)
- {
- GST_INFO("videoSurface->show(), state = %d", state);
- videodev->surface.clear();
- return -1;
- } */
/* get ISurface interface */
videodev->isurface =
@@ -162,7 +155,7 @@ videoflinger_device_create_new_surface (VideoFlingerDevice * videodev)
videoClient->closeTransaction ();
/* Smart pointer videoClient shall be deleted automatically
- * when function exists
+ * when function exits
*/
GST_INFO ("Leave\n");
return 0;
@@ -205,7 +198,7 @@ videoflinger_device_register_framebuffers (VideoFlingerDeviceHandle handle,
}
/* TODO: Now, only PIXEL_FORMAT_RGB_565 is supported. Change here to support
- * more pixel type
+ * other pixel formats
*/
if (format != VIDEO_FLINGER_RGB_565) {
GST_ERROR ("Unsupport format: %d", format);