return error if a buffer is attached twice

   We have to handle attaching a buffer twice as error. Display server
   should attach a buffer after finishing a previous converting.

Change-Id: I98ee0a585af19f3a3009133f99a2c27b4e51b438

diff --git a/src/tdm_capture.c b/src/tdm_capture.c
index 14ebc3d..133de4b 100644 (file)
--- a/src/tdm_capture.c
+++ b/src/tdm_capture.c
@@ -51,6 +51,29 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     private_display = private_capture->private_display; \
     func_capture = &private_display->func_capture
 
+static tdm_error
+_tdm_capture_check_if_exist(tdm_private_capture *private_capture,
+                            tbm_surface_h buffer)
+{
+       tdm_buffer_info *buf_info = NULL;
+
+       LIST_FOR_EACH_ENTRY(buf_info, &private_capture->buffer_list, link) {
+               if (buf_info->buffer == buffer) {
+                       TDM_ERR("%p attached twice", buffer);
+                       return TDM_ERROR_BAD_REQUEST;
+               }
+       }
+
+       LIST_FOR_EACH_ENTRY(buf_info, &private_capture->pending_buffer_list, link) {
+               if (buf_info->buffer == buffer) {
+                       TDM_ERR("%p attached twice", buffer);
+                       return TDM_ERROR_BAD_REQUEST;
+               }
+       }
+
+       return TDM_ERROR_NONE;
+}
+
 static void
 _tdm_caputre_cb_done(tdm_capture *capture_backend, tbm_surface_h buffer,
                      void *user_data)
@@ -281,6 +304,12 @@ tdm_capture_attach(tdm_capture *capture, tbm_surface_h buffer)
                return TDM_ERROR_NONE;
        }
 
+       ret = _tdm_capture_check_if_exist(private_capture, buffer);
+       if (ret != TDM_ERROR_NONE) {
+               pthread_mutex_unlock(&private_display->lock);
+               return ret;
+       }
+
        ret = func_capture->capture_attach(private_capture->capture_backend, buffer);
        TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 

diff --git a/src/tdm_pp.c b/src/tdm_pp.c
index 8f43860..ad6f8a5 100644 (file)
--- a/src/tdm_pp.c
+++ b/src/tdm_pp.c
@@ -51,6 +51,43 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     private_display = private_pp->private_display; \
     func_pp = &private_display->func_pp
 
+static tdm_error
+_tdm_pp_check_if_exist(tdm_private_pp *private_pp,
+                       tbm_surface_h src, tbm_surface_h dst)
+{
+       tdm_buffer_info *buf_info = NULL;
+
+       LIST_FOR_EACH_ENTRY(buf_info, &private_pp->src_buffer_list, link) {
+               if (buf_info->buffer == src) {
+                       TDM_ERR("%p attached twice", src);
+                       return TDM_ERROR_BAD_REQUEST;
+               }
+       }
+
+       LIST_FOR_EACH_ENTRY(buf_info, &private_pp->src_pending_buffer_list, link) {
+               if (buf_info->buffer == src) {
+                       TDM_ERR("%p attached twice", src);
+                       return TDM_ERROR_BAD_REQUEST;
+               }
+       }
+
+       LIST_FOR_EACH_ENTRY(buf_info, &private_pp->dst_buffer_list, link) {
+               if (buf_info->buffer == dst) {
+                       TDM_ERR("%p attached twice", dst);
+                       return TDM_ERROR_BAD_REQUEST;
+               }
+       }
+
+       LIST_FOR_EACH_ENTRY(buf_info, &private_pp->dst_pending_buffer_list, link) {
+               if (buf_info->buffer == dst) {
+                       TDM_ERR("%p attached twice", dst);
+                       return TDM_ERROR_BAD_REQUEST;
+               }
+       }
+
+       return TDM_ERROR_NONE;
+}
+
 static void
 _tdm_pp_cb_done(tdm_pp *pp_backend, tbm_surface_h src, tbm_surface_h dst,
                 void *user_data)
@@ -269,6 +306,12 @@ tdm_pp_attach(tdm_pp *pp, tbm_surface_h src, tbm_surface_h dst)
                return TDM_ERROR_NONE;
        }
 
+       ret = _tdm_pp_check_if_exist(private_pp, src, dst);
+       if (ret != TDM_ERROR_NONE) {
+               pthread_mutex_unlock(&private_display->lock);
+               return ret;
+       }
+
        ret = func_pp->pp_attach(private_pp->pp_backend, src, dst);
        TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);