X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_layer.c;h=97e2a09aef0d3b55260f97c101a8256b48a3fceb;hb=55b52e7511e2c626e7d4845d4954477ba01314ad;hp=3afebd16a40c5b837830581afe64acdb75e2cd6e;hpb=a03f1283751930597b6c9f2fe43bffef288d6ead;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_layer.c b/src/tdm_layer.c
index 3afebd1..97e2a09 100644
--- a/src/tdm_layer.c
+++ b/src/tdm_layer.c
@@ -752,7 +752,7 @@ _tdm_layer_cb_output_commit(tdm_output *output, unsigned int sequence,
 
 	if (layer_commit_handler->func) {
 		_pthread_mutex_unlock(&private_display->lock);
-		layer_commit_handler->func(private_output, sequence,
+		layer_commit_handler->func(private_layer, sequence,
 								   tv_sec, tv_usec, layer_commit_handler->user_data);
 		_pthread_mutex_lock(&private_display->lock);
 	}
@@ -1115,8 +1115,6 @@ tdm_layer_get_displaying_buffer(tdm_layer *layer, tdm_error *error)
 	if (private_layer->showing_buffer) {
 		buffer = private_layer->showing_buffer->buffer;
 	} else {
-		if (error)
-			*error = TDM_ERROR_OPERATION_FAILED;
 		_pthread_mutex_unlock(&private_display->lock);
 		TDM_DBG("layer(%p) showing_buffer is null", private_layer);
 		return NULL;
@@ -1133,7 +1131,7 @@ _tbm_layer_queue_acquirable_cb(tbm_surface_queue_h surface_queue, void *data)
 	tdm_layer *layer = data;
 	tdm_private_backend *private_backend;
 	tdm_func_layer *func_layer;
-	tbm_surface_h surface = NULL;
+	tbm_surface_h buffer = NULL;
 	tdm_private_layer_buffer *layer_buffer;
 	LAYER_FUNC_ENTRY_VOID_RETURN();
 
@@ -1159,49 +1157,30 @@ _tbm_layer_queue_acquirable_cb(tbm_surface_queue_h surface_queue, void *data)
 	}
 	LIST_INITHEAD(&layer_buffer->link);
 
-	if (TBM_SURFACE_QUEUE_ERROR_NONE != tbm_surface_queue_acquire(private_layer->buffer_queue, &surface) ||
-		surface == NULL) {
+	if (TBM_SURFACE_QUEUE_ERROR_NONE != tbm_surface_queue_acquire(private_layer->buffer_queue, &buffer) ||
+		buffer == NULL) {
 		/* LCOV_EXCL_START */
 		TDM_ERR("layer(%p) tbm_surface_queue_acquire() failed surface:%p",
-				private_layer, surface);
+				private_layer, buffer);
 		_pthread_mutex_unlock(&private_display->lock);
 		free(layer_buffer);
 		return;
 		/* LCOV_EXCL_STOP */
 	}
 
-	/* we don't need to handle pending data here because the changes in this function
-	 * should be applied immediately. we can't expect calling tdm_layer_commit.
-	 */
-	ret = func_layer->layer_set_buffer(private_layer->layer_backend, surface);
-	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
-
-	if (ret == TDM_ERROR_NONE) {
-		if (private_layer->waiting_buffer) {
-			TDM_DBG("layer(%p) drop waiting_buffer(%p)", private_layer, private_layer->waiting_buffer->buffer);
-			_tdm_layer_free_buffer(private_layer, private_layer->waiting_buffer);
-		}
-
-		private_layer->waiting_buffer = layer_buffer;
-		private_layer->waiting_buffer->buffer = tdm_buffer_ref_backend(surface);
-
-		if (tdm_debug_module & TDM_DEBUG_BUFFER)
-			TDM_INFO("layer(%p) waiting_buffer(%p)",
-					 private_layer, private_layer->waiting_buffer->buffer);
+	ret = tdm_layer_set_buffer_internal(private_layer, buffer);
+	if (ret != TDM_ERROR_NONE) {
+		TDM_ERR("tdm_layer_set_buffer_internal failed");
+		_pthread_mutex_unlock(&private_display->lock);
+		return;
+	}
 
-		if (private_output->commit_type == TDM_COMMIT_TYPE_OUTPUT) {
-			ret = tdm_output_commit_internal(private_layer->private_output, 0, NULL, NULL);
-			if (ret != TDM_ERROR_NONE)
-				TDM_ERR("tdm_output_commit_internal() is fail");
-		} else if (private_output->commit_type == TDM_COMMIT_TYPE_LAYER) {
-			ret = _tdm_layer_commit(private_layer, NULL, NULL);
-			if (ret != TDM_ERROR_NONE)
-				TDM_ERR("layer(%p) _tdm_layer_commit() is fail", private_layer);
-		} else {
-			TDM_NEVER_GET_HERE();
-		}
-	} else
-		_tdm_layer_free_buffer(private_layer, layer_buffer);
+	ret = tdm_layer_commit_internal(private_layer, NULL, NULL);
+	if (ret != TDM_ERROR_NONE) {
+		TDM_ERR("tdm_layer_commit_internal failed");
+		_pthread_mutex_unlock(&private_display->lock);
+		return;
+	}
 
 	_pthread_mutex_unlock(&private_display->lock);
 }
@@ -1313,7 +1292,7 @@ tdm_layer_set_video_pos(tdm_layer *layer, int zpos)
 	if (!(private_layer->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)) {
 		TDM_ERR("layer(%p) is not video layer", private_layer);
 		_pthread_mutex_unlock(&private_display->lock);
-		return TDM_ERROR_INVALID_PARAMETER;
+		return TDM_ERROR_BAD_REQUEST;
 	}
 
 	if (!func_layer->layer_set_video_pos) {
@@ -1364,8 +1343,8 @@ tdm_layer_get_buffer_flags(tdm_layer *layer, unsigned int *flags)
 		/* LCOV_EXCL_START */
 		*flags = 0;
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_ERR("not implemented!!");
-		return TDM_ERROR_NOT_IMPLEMENTED;
+		TDM_INFO("not implemented!!");
+		return TDM_ERROR_NONE;
 		/* LCOV_EXCL_STOP */
 	}