From 1054b8c10f69627c623892e8b88474043818b11c Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Sat, 2 Jan 2021 15:50:22 +0300
Subject: [PATCH] fix

---
 src/ustreamer/encoders/omx/component.c | 24 ++++++++++++------------
 src/ustreamer/stream.c                 |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/ustreamer/encoders/omx/component.c b/src/ustreamer/encoders/omx/component.c
index 01a9282..bd4282c 100644
--- a/src/ustreamer/encoders/omx/component.c
+++ b/src/ustreamer/encoders/omx/component.c
@@ -23,11 +23,11 @@
 #include "component.h"
 
 
-static int _component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port, OMX_BOOL enabled);
-static int _component_wait_state_changed(OMX_HANDLETYPE *component, OMX_STATETYPE wanted);
+static int _omx_component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port, OMX_BOOL enabled);
+static int _omx_component_wait_state_changed(OMX_HANDLETYPE *component, OMX_STATETYPE wanted);
 
 
-int component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
+int omx_component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
 	OMX_ERRORTYPE error;
 
 	LOG_DEBUG("Enabling OMX port %u ...", port);
@@ -35,10 +35,10 @@ int component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
 		LOG_ERROR_OMX(error, "Can't enable OMX port %u", port);
 		return -1;
 	}
-	return _component_wait_port_changed(component, port, OMX_TRUE);
+	return _omx_component_wait_port_changed(component, port, OMX_TRUE);
 }
 
-int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
+int omx_component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
 	OMX_ERRORTYPE error;
 
 	LOG_DEBUG("Disabling OMX port %u ...", port);
@@ -46,10 +46,10 @@ int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
 		LOG_ERROR_OMX(error, "Can't disable OMX port %u", port);
 		return -1;
 	}
-	return _component_wait_port_changed(component, port, OMX_FALSE);
+	return _omx_component_wait_port_changed(component, port, OMX_FALSE);
 }
 
-int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port) {
+int omx_component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port) {
 	OMX_ERRORTYPE error;
 
 	// cppcheck-suppress redundantPointerOp
@@ -64,7 +64,7 @@ int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYP
 	return 0;
 }
 
-int component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef) {
+int omx_component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef) {
 	OMX_ERRORTYPE error;
 
 	LOG_DEBUG("Writing OMX port %u definition ...", portdef->nPortIndex);
@@ -75,7 +75,7 @@ int component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYP
 	return 0;
 }
 
-int component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state) {
+int omx_component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state) {
 	const char *state_str = omx_state_to_string(state);
 	OMX_ERRORTYPE error;
 
@@ -85,7 +85,7 @@ int component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state) {
 	do {
 		error = OMX_SendCommand(*component, OMX_CommandStateSet, state, NULL);
 		if (error == OMX_ErrorNone) {
-			return _component_wait_state_changed(component, state);
+			return _omx_component_wait_state_changed(component, state);
 		} else if (error == OMX_ErrorInsufficientResources && retries) {
 			// Иногда железо не инициализируется, хз почему, просто ретраим, со второй попытки сработает
 			LOG_ERROR_OMX(error, "Can't switch OMX component state to %s, need to retry", state_str);
@@ -101,7 +101,7 @@ int component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state) {
 }
 
 
-static int _component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port, OMX_BOOL enabled) {
+static int _omx_component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port, OMX_BOOL enabled) {
 	OMX_ERRORTYPE error;
 
 	OMX_PARAM_PORTDEFINITIONTYPE portdef;
@@ -126,7 +126,7 @@ static int _component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port,
 	return (portdef.bEnabled == enabled ? 0 : -1);
 }
 
-static int _component_wait_state_changed(OMX_HANDLETYPE *component, OMX_STATETYPE wanted) {
+static int _omx_component_wait_state_changed(OMX_HANDLETYPE *component, OMX_STATETYPE wanted) {
 	OMX_ERRORTYPE error;
 	OMX_STATETYPE state;
 
diff --git a/src/ustreamer/stream.c b/src/ustreamer/stream.c
index 2392193..807e9f9 100644
--- a/src/ustreamer/stream.c
+++ b/src/ustreamer/stream.c
@@ -175,7 +175,7 @@ void stream_loop(stream_s *stream) {
 							job->encoder = stream->encoder;
 							job->buf_index = buf_index;
 							workers_pool_assign(pool, ready_wr);
-							LOG_DEBUG("Assigned new frame in buffer %u to worker %s", buf_index, ready_wr->name);
+							LOG_DEBUG("Assigned new frame in buffer %d to worker %s", buf_index, ready_wr->name);
 						}
 					} else if (buf_index != -2) { // -2 for broken frame
 						break;