forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-02-19 08:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-02 10:41:12 +03:00
parent f1fe57109e
commit 61ef6ecd95
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ustreamer/encoders/cpu/encoder.c
View File

@@ -47,7 +47,7 @@ static boolean _jpeg_empty_output_buffer(j_compress_ptr jpeg);
static void _jpeg_term_destination(j_compress_ptr jpeg);
void cpu_encoder_compress(frame_s *src, frame_s *dest, unsigned quality) {
void cpu_encoder_compress(const frame_s *src, frame_s *dest, unsigned quality) {
// This function based on compress_image_to_jpeg() from mjpg-streamer
struct jpeg_compress_struct jpeg;

2
src/ustreamer/encoders/cpu/encoder.h
View File

@@ -35,4 +35,4 @@
#include "../../../libs/common/frame.h"
void cpu_encoder_compress(frame_s *src, frame_s *dest, unsigned quality);
void cpu_encoder_compress(const frame_s *src, frame_s *dest, unsigned quality);

2
src/ustreamer/encoders/hw/encoder.c
View File

@@ -32,7 +32,7 @@ void _copy_plus_huffman(const frame_s *src, frame_s *dest);
static bool _is_huffman(const uint8_t *data);
void hw_encoder_compress(frame_s *src, frame_s *dest) {
void hw_encoder_compress(const frame_s *src, frame_s *dest) {
if (src->format != V4L2_PIX_FMT_MJPEG && src->format != V4L2_PIX_FMT_JPEG) {
assert(0 && "Unsupported input format for HW encoder");
}

2
src/ustreamer/encoders/hw/encoder.h
View File

@@ -34,4 +34,4 @@
#include "huffman.h"
void hw_encoder_compress(frame_s *src, frame_s *dest);
void hw_encoder_compress(const frame_s *src, frame_s *dest);

10
src/ustreamer/encoders/omx/component.h
View File

@@ -44,10 +44,10 @@
}
int component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port);
int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port);
int omx_component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port);
int omx_component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port);
int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port);
int component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef);
int omx_component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port);
int omx_component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef);
int component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state);
int omx_component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state);

32
src/ustreamer/encoders/omx/encoder.c
View File

@@ -104,9 +104,9 @@ omx_encoder_s *omx_encoder_init(void) {
void omx_encoder_destroy(omx_encoder_s *omx) {
LOG_INFO("Destroying OMX encoder ...");
component_set_state(&omx->encoder, OMX_StateIdle);
omx_component_set_state(&omx->encoder, OMX_StateIdle);
_omx_encoder_clear_ports(omx);
component_set_state(&omx->encoder, OMX_StateLoaded);
omx_component_set_state(&omx->encoder, OMX_StateLoaded);
if (omx->i_handler_sem) {
vcos_semaphore_delete(&omx->handler_sem);
@@ -132,7 +132,7 @@ void omx_encoder_destroy(omx_encoder_s *omx) {
}
int omx_encoder_prepare(omx_encoder_s *omx, device_s *dev, unsigned quality) {
if (component_set_state(&omx->encoder, OMX_StateIdle) < 0) {
if (omx_component_set_state(&omx->encoder, OMX_StateIdle) < 0) {
return -1;
}
if (_omx_encoder_clear_ports(omx) < 0) {
@@ -144,13 +144,13 @@ int omx_encoder_prepare(omx_encoder_s *omx, device_s *dev, unsigned quality) {
if (_omx_setup_output(omx, quality) < 0) {
return -1;
}
if (component_set_state(&omx->encoder, OMX_StateExecuting) < 0) {
if (omx_component_set_state(&omx->encoder, OMX_StateExecuting) < 0) {
return -1;
}
return 0;
}
int omx_encoder_compress(omx_encoder_s *omx, frame_s *src, frame_s *dest) {
int omx_encoder_compress(omx_encoder_s *omx, const frame_s *src, frame_s *dest) {
# define IN(_next) omx->input_buffer->_next
# define OUT(_next) omx->output_buffer->_next
@@ -294,7 +294,7 @@ static int _omx_init_disable_ports(omx_encoder_s *omx) {
return -1;
}
for (OMX_U32 port = ports.nStartPortNumber; port < ports.nStartPortNumber + ports.nPorts; ++port) {
if (component_disable_port(&omx->encoder, port) < 0) {
if (omx_component_disable_port(&omx->encoder, port) < 0) {
return -1;
}
}
@@ -308,7 +308,7 @@ static int _omx_setup_input(omx_encoder_s *omx, device_s *dev) {
LOG_DEBUG("Setting up OMX JPEG input port ...");
if (component_get_portdef(&omx->encoder, &portdef, _INPUT_PORT) < 0) {
if (omx_component_get_portdef(&omx->encoder, &portdef, _INPUT_PORT) < 0) {
LOG_ERROR("... first");
return -1;
}
@@ -340,16 +340,16 @@ static int _omx_setup_input(omx_encoder_s *omx, device_s *dev) {
# undef MAP_FORMAT
if (component_set_portdef(&omx->encoder, &portdef) < 0) {
if (omx_component_set_portdef(&omx->encoder, &portdef) < 0) {
return -1;
}
if (component_get_portdef(&omx->encoder, &portdef, _INPUT_PORT) < 0) {
if (omx_component_get_portdef(&omx->encoder, &portdef, _INPUT_PORT) < 0) {
LOG_ERROR("... second");
return -1;
}
if (component_enable_port(&omx->encoder, _INPUT_PORT) < 0) {
if (omx_component_enable_port(&omx->encoder, _INPUT_PORT) < 0) {
return -1;
}
omx->i_input_port_enabled = true;
@@ -367,7 +367,7 @@ static int _omx_setup_output(omx_encoder_s *omx, unsigned quality) {
LOG_DEBUG("Setting up OMX JPEG output port ...");
if (component_get_portdef(&omx->encoder, &portdef, _OUTPUT_PORT) < 0) {
if (omx_component_get_portdef(&omx->encoder, &portdef, _OUTPUT_PORT) < 0) {
LOG_ERROR("... first");
return -1;
}
@@ -376,11 +376,11 @@ static int _omx_setup_output(omx_encoder_s *omx, unsigned quality) {
portdef.format.image.eCompressionFormat = OMX_IMAGE_CodingJPEG;
portdef.format.image.eColorFormat = OMX_COLOR_FormatYCbYCr;
if (component_set_portdef(&omx->encoder, &portdef) < 0) {
if (omx_component_set_portdef(&omx->encoder, &portdef) < 0) {
return -1;
}
if (component_get_portdef(&omx->encoder, &portdef, _OUTPUT_PORT) < 0) {
if (omx_component_get_portdef(&omx->encoder, &portdef, _OUTPUT_PORT) < 0) {
LOG_ERROR("... second");
return -1;
}
@@ -423,7 +423,7 @@ static int _omx_setup_output(omx_encoder_s *omx, unsigned quality) {
}
}
if (component_enable_port(&omx->encoder, _OUTPUT_PORT) < 0) {
if (omx_component_enable_port(&omx->encoder, _OUTPUT_PORT) < 0) {
return -1;
}
omx->i_output_port_enabled = true;
@@ -440,11 +440,11 @@ static int _omx_encoder_clear_ports(omx_encoder_s *omx) {
int retval = 0;
if (omx->i_output_port_enabled) {
retval -= component_disable_port(&omx->encoder, _OUTPUT_PORT);
retval -= omx_component_disable_port(&omx->encoder, _OUTPUT_PORT);
omx->i_output_port_enabled = false;
}
if (omx->i_input_port_enabled) {
retval -= component_disable_port(&omx->encoder, _INPUT_PORT);
retval -= omx_component_disable_port(&omx->encoder, _INPUT_PORT);
omx->i_input_port_enabled = false;
}

2
src/ustreamer/encoders/omx/encoder.h
View File

@@ -71,4 +71,4 @@ omx_encoder_s *omx_encoder_init(void);
void omx_encoder_destroy(omx_encoder_s *omx);
int omx_encoder_prepare(omx_encoder_s *omx, device_s *dev, unsigned quality);
int omx_encoder_compress(omx_encoder_s *omx, frame_s *src, frame_s *dest);
int omx_encoder_compress(omx_encoder_s *omx, const frame_s *src, frame_s *dest);