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

logging; removed some pragmas

Browse Source
This commit is contained in:
Devaev Maxim
2019-03-03 17:09:34 +03:00
parent d8a774e358
commit 3db57cfa42
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/encoder.c
View File

@@ -136,8 +136,6 @@ enum encoder_type_t encoder_parse_type(const char *str) {
return ENCODER_TYPE_UNKNOWN; return ENCODER_TYPE_UNKNOWN;
} }
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic push
void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) { void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) {
assert(encoder->run->type != ENCODER_TYPE_UNKNOWN); assert(encoder->run->type != ENCODER_TYPE_UNKNOWN);
@@ -160,9 +158,9 @@ void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) {
A_PTHREAD_M_LOCK(&encoder->run->mutex); A_PTHREAD_M_LOCK(&encoder->run->mutex);
encoder->run->quality = 0; encoder->run->quality = 0;
A_PTHREAD_M_UNLOCK(&encoder->run->mutex); A_PTHREAD_M_UNLOCK(&encoder->run->mutex);
LOG_INFO("Using JPEG quality: HW default");
} }
} }
#pragma GCC diagnostic pop
# ifdef OMX_ENCODER # ifdef OMX_ENCODER
else if (encoder->run->type == ENCODER_TYPE_OMX) { else if (encoder->run->type == ENCODER_TYPE_OMX) {
for (unsigned index = 0; index < encoder->run->n_omxs; ++index) { for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
@@ -176,14 +174,11 @@ void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) {
return; return;
# pragma GCC diagnostic ignored "-Wunused-label"
# pragma GCC diagnostic push
use_fallback: use_fallback:
A_PTHREAD_M_LOCK(&encoder->run->mutex); A_PTHREAD_M_LOCK(&encoder->run->mutex);
encoder->run->type = ENCODER_TYPE_CPU; encoder->run->type = ENCODER_TYPE_CPU;
encoder->run->quality = encoder->quality; encoder->run->quality = encoder->quality;
A_PTHREAD_M_UNLOCK(&encoder->run->mutex); A_PTHREAD_M_UNLOCK(&encoder->run->mutex);
# pragma GCC diagnostic pop
} }
#pragma GCC diagnostic ignored "-Wunused-label" #pragma GCC diagnostic ignored "-Wunused-label"