diff --git a/janus/src/audio.c b/janus/src/audio.c index 6987a5c..d8a30e4 100644 --- a/janus/src/audio.c +++ b/janus/src/audio.c @@ -214,7 +214,7 @@ static _enc_buffer_s *_enc_buffer_init(void) { static void *_pcm_thread(void *v_audio) { US_THREAD_SETTLE("us_a_pcm"); - us_audio_s *const audio = (us_audio_s *)v_audio; + us_audio_s *const audio = v_audio; u8 in[_MAX_BUF8]; while (!atomic_load(&audio->stop)) { @@ -244,7 +244,7 @@ static void *_pcm_thread(void *v_audio) { static void *_encoder_thread(void *v_audio) { US_THREAD_SETTLE("us_a_enc"); - us_audio_s *const audio = (us_audio_s *)v_audio; + us_audio_s *const audio = v_audio; s16 in_res[_MAX_BUF16]; while (!atomic_load(&audio->stop)) { diff --git a/janus/src/client.c b/janus/src/client.c index a1fde4f..7692968 100644 --- a/janus/src/client.c +++ b/janus/src/client.c @@ -104,7 +104,7 @@ static void *_audio_thread(void *v_client) { } static void *_common_thread(void *v_client, bool video) { - us_janus_client_s *const client = (us_janus_client_s *)v_client; + us_janus_client_s *const client = v_client; us_ring_s *const ring = (video ? client->video_ring : client->audio_ring); assert(ring != NULL); // Audio may be NULL diff --git a/janus/src/rtp.c b/janus/src/rtp.c index 91601ba..63e9a7a 100644 --- a/janus/src/rtp.c +++ b/janus/src/rtp.c @@ -57,7 +57,7 @@ void us_rtp_write_header(us_rtp_s *rtp, u32 pts, bool marked) { ++rtp->seq; # define WRITE_BE_U32(x_offset, x_value) \ - *((u32 *)(rtp->datagram + x_offset)) = __builtin_bswap32(x_value) + *((u32*)(rtp->datagram + x_offset)) = __builtin_bswap32(x_value) WRITE_BE_U32(0, word0); WRITE_BE_U32(4, pts); WRITE_BE_U32(8, rtp->ssrc); diff --git a/python/src/ustreamer.c b/python/src/ustreamer.c index 37b4f61..d9e9c16 100644 --- a/python/src/ustreamer.c +++ b/python/src/ustreamer.c @@ -99,11 +99,11 @@ static PyObject *_MemsinkObject_close(_MemsinkObject *self, PyObject *Py_UNUSED( static PyObject *_MemsinkObject_enter(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) { Py_INCREF(self); - return (PyObject *)self; + return (PyObject*)self; } static PyObject *_MemsinkObject_exit(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) { - return PyObject_CallMethod((PyObject *)self, "close", ""); + return PyObject_CallMethod((PyObject*)self, "close", ""); } static int _wait_frame(_MemsinkObject *self) { @@ -230,7 +230,7 @@ static PyObject *_MemsinkObject_wait_frame(_MemsinkObject *self, PyObject *args, SET_NUMBER(grab_ts, Double, Float); SET_NUMBER(encode_begin_ts, Double, Float); SET_NUMBER(encode_end_ts, Double, Float); - SET_VALUE("data", PyBytes_FromStringAndSize((const char *)self->frame->data, self->frame->used)); + SET_VALUE("data", PyBytes_FromStringAndSize((const char*)self->frame->data, self->frame->used)); # undef SET_NUMBER # undef SET_VALUE @@ -305,7 +305,7 @@ PyMODINIT_FUNC PyInit_ustreamer(void) { Py_INCREF(&_MemsinkType); - if (PyModule_AddObject(module, "Memsink", (PyObject *)&_MemsinkType) < 0) { + if (PyModule_AddObject(module, "Memsink", (PyObject*)&_MemsinkType) < 0) { return NULL; } diff --git a/src/dump/file.c b/src/dump/file.c index 43a275f..e2895b0 100644 --- a/src/dump/file.c +++ b/src/dump/file.c @@ -47,7 +47,7 @@ us_output_file_s *us_output_file_init(const char *path, bool json) { } void us_output_file_write(void *v_output, const us_frame_s *frame) { - us_output_file_s *output = (us_output_file_s *)v_output; + us_output_file_s *output = v_output; if (output->json) { us_base64_encode(frame->data, frame->used, &output->base64_data, &output->base64_allocated); fprintf(output->fp, @@ -66,7 +66,7 @@ void us_output_file_write(void *v_output, const us_frame_s *frame) { } void us_output_file_destroy(void *v_output) { - us_output_file_s *output = (us_output_file_s *)v_output; + us_output_file_s *output = v_output; US_DELETE(output->base64_data, free); if (output->fp && output->fp != stdout) { if (fclose(output->fp) < 0) { diff --git a/src/dump/main.c b/src/dump/main.c index 4cadaba..36993ff 100644 --- a/src/dump/main.c +++ b/src/dump/main.c @@ -182,7 +182,7 @@ int main(int argc, char *argv[]) { _output_context_s ctx = {0}; if (output_path && output_path[0] != '\0') { - if ((ctx.v_output = (void *)us_output_file_init(output_path, output_json)) == NULL) { + if ((ctx.v_output = (void*)us_output_file_init(output_path, output_json)) == NULL) { return 1; } ctx.write = us_output_file_write; diff --git a/src/libs/threading.h b/src/libs/threading.h index 10acc1d..e438b71 100644 --- a/src/libs/threading.h +++ b/src/libs/threading.h @@ -84,7 +84,7 @@ INLINE void us_thread_set_name(const char *name) { # elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) pthread_set_name_np(pthread_self(), name); # elif defined(__NetBSD__) - pthread_setname_np(pthread_self(), "%s", (void *)name); + pthread_setname_np(pthread_self(), "%s", (void*)name); # else # error us_thread_set_name() not implemented, you can disable it using WITH_PTHREAD_NP=0 # endif diff --git a/src/ustreamer/encoder.c b/src/ustreamer/encoder.c index a0741b7..371390f 100644 --- a/src/ustreamer/encoder.c +++ b/src/ustreamer/encoder.c @@ -166,7 +166,7 @@ void us_encoder_open(us_encoder_s *enc, us_device_s *dev) { enc->run->pool = us_workers_pool_init( "JPEG", "jw", n_workers, desired_interval, - _worker_job_init, (void *)enc, + _worker_job_init, (void*)enc, _worker_job_destroy, _worker_run_job); @@ -188,19 +188,19 @@ void us_encoder_get_runtime_params(us_encoder_s *enc, us_encoder_type_e *type, u static void *_worker_job_init(void *v_enc) { us_encoder_job_s *job; US_CALLOC(job, 1); - job->enc = (us_encoder_s *)v_enc; + job->enc = (us_encoder_s*)v_enc; job->dest = us_frame_init(); - return (void *)job; + return (void*)job; } static void _worker_job_destroy(void *v_job) { - us_encoder_job_s *job = (us_encoder_job_s *)v_job; + us_encoder_job_s *job = v_job; us_frame_destroy(job->dest); free(job); } static bool _worker_run_job(us_worker_s *wr) { - us_encoder_job_s *job = (us_encoder_job_s *)wr->job; + us_encoder_job_s *job = wr->job; us_encoder_s *enc = job->enc; // Just for _ER() const us_frame_s *src = &job->hw->raw; us_frame_s *dest = job->dest; diff --git a/src/ustreamer/encoders/cpu/encoder.c b/src/ustreamer/encoders/cpu/encoder.c index 33ef7f6..ceef5f7 100644 --- a/src/ustreamer/encoders/cpu/encoder.c +++ b/src/ustreamer/encoders/cpu/encoder.c @@ -29,8 +29,8 @@ typedef struct { - struct jpeg_destination_mgr mgr; // Default manager - JOCTET *buf; // Start of buffer + struct jpeg_destination_mgr mgr; // Default manager + JOCTET *buf; // Start of buffer us_frame_s *frame; } _jpeg_dest_manager_s; @@ -63,7 +63,12 @@ void us_cpu_encoder_compress(const us_frame_s *src, us_frame_s *dest, unsigned q jpeg.image_width = src->width; jpeg.image_height = src->height; jpeg.input_components = 3; - jpeg.in_color_space = ((src->format == V4L2_PIX_FMT_YUYV || src->format == V4L2_PIX_FMT_UYVY) ? JCS_YCbCr : JCS_RGB); + switch (src->format) { + case V4L2_PIX_FMT_YUYV: + case V4L2_PIX_FMT_YVYU: + case V4L2_PIX_FMT_UYVY: jpeg.in_color_space = JCS_YCbCr; break; + default: jpeg.in_color_space = JCS_RGB; break; + } jpeg_set_defaults(&jpeg); jpeg_set_quality(&jpeg, quality, TRUE); @@ -89,12 +94,12 @@ void us_cpu_encoder_compress(const us_frame_s *src, us_frame_s *dest, unsigned q static void _jpeg_set_dest_frame(j_compress_ptr jpeg, us_frame_s *frame) { if (jpeg->dest == NULL) { - assert((jpeg->dest = (struct jpeg_destination_mgr *)(*jpeg->mem->alloc_small)( + assert((jpeg->dest = (struct jpeg_destination_mgr*)(*jpeg->mem->alloc_small)( (j_common_ptr) jpeg, JPOOL_PERMANENT, sizeof(_jpeg_dest_manager_s) )) != NULL); } - _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s *)jpeg->dest; + _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s*)jpeg->dest; dest->mgr.init_destination = _jpeg_init_destination; dest->mgr.empty_output_buffer = _jpeg_empty_output_buffer; dest->mgr.term_destination = _jpeg_term_destination; @@ -221,10 +226,10 @@ static void _jpeg_write_scanlines_bgr24(struct jpeg_compress_struct *jpeg, const #define JPEG_OUTPUT_BUFFER_SIZE ((size_t)4096) static void _jpeg_init_destination(j_compress_ptr jpeg) { - _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s *)jpeg->dest; + _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s*)jpeg->dest; // Allocate the output buffer - it will be released when done with image - assert((dest->buf = (JOCTET *)(*jpeg->mem->alloc_small)( + assert((dest->buf = (JOCTET*)(*jpeg->mem->alloc_small)( (j_common_ptr) jpeg, JPOOL_IMAGE, JPEG_OUTPUT_BUFFER_SIZE * sizeof(JOCTET) )) != NULL); @@ -235,7 +240,7 @@ static void _jpeg_init_destination(j_compress_ptr jpeg) { static boolean _jpeg_empty_output_buffer(j_compress_ptr jpeg) { // Called whenever local jpeg buffer fills up - _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s *)jpeg->dest; + _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s*)jpeg->dest; us_frame_append_data(dest->frame, dest->buf, JPEG_OUTPUT_BUFFER_SIZE); @@ -249,7 +254,7 @@ static void _jpeg_term_destination(j_compress_ptr jpeg) { // Called by jpeg_finish_compress after all data has been written. // Usually needs to flush buffer. - _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s *)jpeg->dest; + _jpeg_dest_manager_s *const dest = (_jpeg_dest_manager_s*)jpeg->dest; const size_t final = JPEG_OUTPUT_BUFFER_SIZE - dest->mgr.free_in_buffer; // Write any data remaining in the buffer. diff --git a/src/ustreamer/workers.c b/src/ustreamer/workers.c index a61f3b6..ca53c06 100644 --- a/src/ustreamer/workers.c +++ b/src/ustreamer/workers.c @@ -62,7 +62,7 @@ us_workers_pool_s *us_workers_pool_init( WR(pool) = pool; WR(job) = job_init(job_init_arg); - US_THREAD_CREATE(WR(tid), _worker_thread, (void *)&(pool->workers[number])); + US_THREAD_CREATE(WR(tid), _worker_thread, (void*)&(pool->workers[number])); pool->free_workers += 1; # undef WR @@ -176,7 +176,7 @@ long double us_workers_pool_get_fluency_delay(us_workers_pool_s *pool, const us_ } static void *_worker_thread(void *v_worker) { - us_worker_s *wr = (us_worker_s *)v_worker; + us_worker_s *wr = v_worker; US_THREAD_SETTLE("%s", wr->name); US_LOG_DEBUG("Hello! I am a worker %s ^_^", wr->name); diff --git a/src/v4p/main.c b/src/v4p/main.c index a301716..86e32f2 100644 --- a/src/v4p/main.c +++ b/src/v4p/main.c @@ -274,7 +274,7 @@ static void *_follower_thread(void *v_unix_follow) { strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); addr.sun_family = AF_UNIX; - const bool online = !connect(fd, (struct sockaddr *)&addr, sizeof(addr)); + const bool online = !connect(fd, (struct sockaddr*)&addr, sizeof(addr)); atomic_store(&_g_ustreamer_online, online); US_CLOSE_FD(fd); // cppcheck-suppress unreadVariable