use pp flags instead of pp property

Change-Id: I8476c1f89059e442787545b67a8da2f7eea1a8cb

diff --git a/include/tdm.h b/include/tdm.h
index f8ccdca..b3812d7 100644 (file)
--- a/include/tdm.h
+++ b/include/tdm.h
@@ -68,7 +68,6 @@ tdm_error    tdm_display_get_capabilities(tdm_display *dpy, tdm_display_capabili
 tdm_error    tdm_display_get_pp_capabilities(tdm_display *dpy, tdm_pp_capability *capabilities);
 tdm_error    tdm_display_get_pp_available_formats(tdm_display *dpy, const tbm_format **formats, int *count);
 tdm_error    tdm_display_get_pp_available_size(tdm_display *dpy, int *min_w, int *min_h, int *max_w, int *max_h, int *preferred_align);
-tdm_error    tdm_display_get_pp_available_properties(tdm_display *dpy, const tdm_prop **props, int *count);
 tdm_error    tdm_display_get_capture_capabilities(tdm_display *dpy, tdm_capture_capability *capabilities);
 tdm_error    tdm_display_get_catpure_available_formats(tdm_display *dpy, const tbm_format **formats, int *count);
 tdm_error    tdm_display_get_output_count(tdm_display *dpy, int *count);
@@ -122,8 +121,6 @@ tdm_capture *tdm_layer_create_capture(tdm_layer *layer, tdm_error *error);
 ///////////////////////////////////////////////////////////////////////////////
 
 void         tdm_pp_destroy(tdm_pp *pp);
-tdm_error    tdm_pp_set_property(tdm_pp *pp, unsigned int id, tdm_value value);
-tdm_error    tdm_pp_get_property(tdm_pp *pp, unsigned int id, tdm_value *value);
 tdm_error    tdm_pp_set_info(tdm_pp *pp, tdm_info_pp *info);
 tdm_error    tdm_pp_attach(tdm_pp *pp, tdm_buffer *src, tdm_buffer *dst);
 tdm_error    tdm_pp_commit(tdm_pp *pp);

diff --git a/include/tdm_backend.h b/include/tdm_backend.h
index d09e01f..1957987 100644 (file)
--- a/include/tdm_backend.h
+++ b/include/tdm_backend.h
@@ -95,9 +95,6 @@ typedef struct _tdm_caps_pp
     unsigned int format_count;
     tbm_format *formats;
 
-    unsigned int prop_count;
-    tdm_prop *props;
-
     /* -1: not defined */
     int min_w;
     int min_h;
@@ -160,8 +157,6 @@ typedef void (*tdm_pp_done_handler)(tdm_pp *pp, tbm_surface_h src, tbm_surface_h
 typedef struct _tdm_func_pp
 {
     void         (*pp_destroy)(tdm_pp *pp); /* init */
-    tdm_error    (*pp_set_property)(tdm_pp *pp, unsigned int id, tdm_value value);
-    tdm_error    (*pp_get_property)(tdm_pp *pp, unsigned int id, tdm_value *value);
     tdm_error    (*pp_set_info)(tdm_pp *pp, tdm_info_pp *info);
     tdm_error    (*pp_attach)(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst);
     tdm_error    (*pp_commit)(tdm_pp *pp); /* init */

diff --git a/include/tdm_types.h b/include/tdm_types.h
index 7451c5a..e5e577b 100644 (file)
--- a/include/tdm_types.h
+++ b/include/tdm_types.h
@@ -227,6 +227,7 @@ typedef struct _tdm_info_pp
     tdm_info_config dst_config;
     tdm_transform transform;
     int sync;
+    int flags;
 } tdm_info_pp;
 
 typedef struct _tdm_info_capture
@@ -235,6 +236,7 @@ typedef struct _tdm_info_capture
     tdm_transform transform;
     int oneshot;
     int frequency;
+    int flags;
 } tdm_info_capture;
 
 typedef void tdm_display;

diff --git a/src/tdm_display.c b/src/tdm_display.c
index abb5cb1..9e40cd6 100644 (file)
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -165,24 +165,6 @@ tdm_display_get_pp_available_size(tdm_display *dpy, int *min_w, int *min_h, int
 }
 
 EXTERN tdm_error
-tdm_display_get_pp_available_properties(tdm_display *dpy, const tdm_prop **props, int *count)
-{
-    DISPLAY_FUNC_ENTRY();
-
-    TDM_RETURN_VAL_IF_FAIL(props != NULL, TDM_ERROR_INVALID_PARAMETER);
-    TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
-
-    pthread_mutex_lock(&private_display->lock);
-
-    *props = (const tdm_prop*)private_display->caps_pp.props;
-    *count = private_display->caps_pp.prop_count;
-
-    pthread_mutex_unlock(&private_display->lock);
-
-    return ret;
-}
-
-EXTERN tdm_error
 tdm_display_get_capture_capabilities(tdm_display *dpy, tdm_capture_capability *capabilities)
 {
     DISPLAY_FUNC_ENTRY();

diff --git a/src/tdm_pp.c b/src/tdm_pp.c
index 669b271..278e6e2 100644 (file)
--- a/src/tdm_pp.c
+++ b/src/tdm_pp.c
@@ -152,48 +152,6 @@ tdm_pp_destroy(tdm_pp *pp)
 }
 
 EXTERN tdm_error
-tdm_pp_set_property(tdm_pp *pp, unsigned int id, tdm_value value)
-{
-    PP_FUNC_ENTRY();
-
-    pthread_mutex_lock(&private_display->lock);
-
-    if (!func_pp->pp_set_property)
-    {
-        pthread_mutex_unlock(&private_display->lock);
-        return TDM_ERROR_NONE;
-    }
-
-    ret = func_pp->pp_set_property(private_pp->pp, id, value);
-
-    pthread_mutex_unlock(&private_display->lock);
-
-    return ret;
-}
-
-EXTERN tdm_error
-tdm_pp_get_property(tdm_pp *pp, unsigned int id, tdm_value *value)
-{
-    PP_FUNC_ENTRY();
-
-    TDM_RETURN_VAL_IF_FAIL(value != NULL, TDM_ERROR_INVALID_PARAMETER);
-
-    pthread_mutex_lock(&private_display->lock);
-
-    if (!func_pp->pp_get_property)
-    {
-        pthread_mutex_unlock(&private_display->lock);
-        return TDM_ERROR_NONE;
-    }
-
-    ret = func_pp->pp_get_property(private_pp->pp, id, value);
-
-    pthread_mutex_unlock(&private_display->lock);
-
-    return ret;
-}
-
-EXTERN tdm_error
 tdm_pp_set_info(tdm_pp *pp, tdm_info_pp *info)
 {
     PP_FUNC_ENTRY();