forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-17 13:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

type fixes

Browse Source
This commit is contained in:
Devaev Maxim
2020-05-12 07:27:42 +03:00
parent 95318e14d8
commit 43788f812d
8 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/device.h
View File

@@ -30,13 +30,13 @@
#include "picture.h" #include "picture.h"
#define VIDEO_MIN_WIDTH 160 #define VIDEO_MIN_WIDTH ((unsigned)160)
#define VIDEO_MAX_WIDTH 10240 #define VIDEO_MAX_WIDTH ((unsigned)10240)
#define VIDEO_MIN_HEIGHT 120 #define VIDEO_MIN_HEIGHT ((unsigned)120)
#define VIDEO_MAX_HEIGHT 4320 #define VIDEO_MAX_HEIGHT ((unsigned)4320)
#define VIDEO_MAX_FPS 120 #define VIDEO_MAX_FPS ((unsigned)120)
#define STANDARD_UNKNOWN V4L2_STD_UNKNOWN #define STANDARD_UNKNOWN V4L2_STD_UNKNOWN
#define STANDARDS_STR "PAL, NTSC, SECAM" #define STANDARDS_STR "PAL, NTSC, SECAM"

5
src/encoder.h
View File

@@ -33,9 +33,10 @@
# define ENCODER_TYPES_OMX_HINT ", OMX" # define ENCODER_TYPES_OMX_HINT ", OMX"
# ifndef MAX_GLITCHED_RESOLUTIONS # ifndef CFG_MAX_GLITCHED_RESOLUTIONS
# define MAX_GLITCHED_RESOLUTIONS 1024 # define CFG_MAX_GLITCHED_RESOLUTIONS 1024
# endif # endif
# define MAX_GLITCHED_RESOLUTIONS ((unsigned)(CFG_MAX_GLITCHED_RESOLUTIONS))
#else #else
# define ENCODER_TYPES_OMX_HINT "" # define ENCODER_TYPES_OMX_HINT ""
#endif #endif

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

@@ -258,7 +258,7 @@ static void _jpeg_write_scanlines_rgb24(
} }
} }
#define JPEG_OUTPUT_BUFFER_SIZE 4096 #define JPEG_OUTPUT_BUFFER_SIZE ((size_t)4096)
static void _jpeg_init_destination(j_compress_ptr jpeg) { static void _jpeg_init_destination(j_compress_ptr jpeg) {
struct _jpeg_dest_manager_t *dest = (struct _jpeg_dest_manager_t *)jpeg->dest; struct _jpeg_dest_manager_t *dest = (struct _jpeg_dest_manager_t *)jpeg->dest;

5
src/encoders/omx/encoder.h
View File

@@ -29,9 +29,10 @@
#include "../../device.h" #include "../../device.h"
#ifndef OMX_MAX_ENCODERS #ifndef CFG_OMX_MAX_ENCODERS
# define OMX_MAX_ENCODERS 3 // Raspberry Pi limitation # define CFG_OMX_MAX_ENCODERS 3 // Raspberry Pi limitation
#endif #endif
#define OMX_MAX_ENCODERS ((unsigned)(CFG_OMX_MAX_ENCODERS))
struct omx_encoder_t { struct omx_encoder_t {

42
src/gpio.h
View File

@@ -26,6 +26,7 @@
#include <wiringPi.h> #include <wiringPi.h>
#include "tools.h"
#include "logging.h" #include "logging.h"
@@ -42,17 +43,18 @@ int gpio_pin_workers_busy_at;
gpio_pin_workers_busy_at = -1; \ gpio_pin_workers_busy_at = -1; \
} }
#define GPIO_INIT_PIN(_role, _offset) { \ #define GPIO_INIT_PIN(_role, _offset) _gpio_init_pin(#_role, gpio_pin_##_role, _offset)
if (gpio_pin_##_role >= 0) { \
pinMode(gpio_pin_##_role + _offset, OUTPUT); \ INLINE void _gpio_init_pin(const char *role, int base, unsigned offset) {
digitalWrite(gpio_pin_##_role + _offset, LOW); \ if (base >= 0) {
if (_offset == 0) { \ pinMode(base + offset, OUTPUT);
LOG_INFO("GPIO: Using pin %d as %s", gpio_pin_##_role, #_role); \ if (offset == 0) {
} else { \ LOG_INFO("GPIO: Using pin %d as %s", base, role);
LOG_INFO("GPIO: Using pin %d+%d as %s", gpio_pin_##_role, _offset, #_role); \ } else {
} \ LOG_INFO("GPIO: Using pin %d+%u as %s", base, offset, role);
} \ }
} }
}
#define GPIO_INIT_PINOUT { \ #define GPIO_INIT_PINOUT { \
if ( \ if ( \
@@ -74,16 +76,18 @@ int gpio_pin_workers_busy_at;
} \ } \
} }
#define GPIO_SET_STATE(_role, _offset, _state) { \ #define GPIO_SET_STATE(_role, _offset, _state) _gpio_set_state(#_role, gpio_pin_##_role, _offset, _state)
if (gpio_pin_##_role >= 0) { \
if (_offset == 0) { \ INLINE void _gpio_set_state(const char *role, int base, unsigned offset, int state) {
LOG_DEBUG("GPIO: Writing %d to pin %d (%s)", _state, gpio_pin_##_role, #_role); \ if (base >= 0) {
} else { \ if (offset == 0) {
LOG_DEBUG("GPIO: Writing %d to pin %d+%d (%s)", _state, gpio_pin_##_role, _offset, #_role); \ LOG_DEBUG("GPIO: Writing %d to pin %d (%s)", state, base, role);
} \ } else {
digitalWrite(gpio_pin_##_role + _offset, _state); \ LOG_DEBUG("GPIO: Writing %d to pin %d+%u (%s)", state, base, offset, role);
} \ }
digitalWrite(base + offset, state);
} }
}
#define GPIO_SET_LOW(_role) GPIO_SET_STATE(_role, 0, LOW) #define GPIO_SET_LOW(_role) GPIO_SET_STATE(_role, 0, LOW)
#define GPIO_SET_HIGH(_role) GPIO_SET_STATE(_role, 0, HIGH) #define GPIO_SET_HIGH(_role) GPIO_SET_STATE(_role, 0, HIGH)

2
src/http/blank.c
View File

@@ -94,7 +94,7 @@ static struct picture_t *_init_external(const char *path) {
goto error; goto error;
} }
# define CHUNK_SIZE (100 * 1024) # define CHUNK_SIZE ((size_t)(100 * 1024))
while (true) { while (true) {
if (blank->used + CHUNK_SIZE >= blank->allocated) { if (blank->used + CHUNK_SIZE >= blank->allocated) {
picture_realloc_data(blank, blank->used + CHUNK_SIZE * 2); picture_realloc_data(blank, blank->used + CHUNK_SIZE * 2);

4
src/threading.h
View File

@@ -41,9 +41,9 @@
#ifdef PTHREAD_MAX_NAMELEN_NP #ifdef PTHREAD_MAX_NAMELEN_NP
# define MAX_THREAD_NAME PTHREAD_MAX_NAMELEN_NP # define MAX_THREAD_NAME ((size_t)(PTHREAD_MAX_NAMELEN_NP))
#else #else
# define MAX_THREAD_NAME 16 # define MAX_THREAD_NAME ((size_t)16)
#endif #endif
#define A_THREAD_CREATE(_tid, _func, _arg) assert(!pthread_create(_tid, NULL, _func, _arg)) #define A_THREAD_CREATE(_tid, _func, _arg) assert(!pthread_create(_tid, NULL, _func, _arg))

7
src/xioctl.h
View File

@@ -30,9 +30,10 @@
#include "logging.h" #include "logging.h"
#ifndef XIOCTL_RETRIES #ifndef CFG_XIOCTL_RETRIES
# define XIOCTL_RETRIES 4 # define CFG_XIOCTL_RETRIES 4
#endif #endif
#define XIOCTL_RETRIES ((unsigned)(CFG_XIOCTL_RETRIES))
INLINE int xioctl(int fd, int request, void *arg) { INLINE int xioctl(int fd, int request, void *arg) {
@@ -52,7 +53,7 @@ INLINE int xioctl(int fd, int request, void *arg) {
); );
if (retval && retries <= 0) { if (retval && retries <= 0) {
LOG_PERROR("ioctl(%d) retried %d times; giving up", request, XIOCTL_RETRIES); LOG_PERROR("ioctl(%d) retried %u times; giving up", request, XIOCTL_RETRIES);
} }
return retval; return retval;
} }