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

encoder: removed cpu_forced logic

Browse Source
This commit is contained in:
Maxim Devaev
2024-04-04 03:44:20 +03:00
parent ae2f270f50
commit 65c652e624
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ustreamer/encoder.c
View File

@@ -115,10 +115,9 @@ void us_encoder_open(us_encoder_s *enc, us_capture_s *cap) {
assert(run->pool == NULL); assert(run->pool == NULL);
us_encoder_type_e type = (run->cpu_forced ? US_ENCODER_TYPE_CPU : enc->type); us_encoder_type_e type = enc->type;
uint quality = cap->jpeg_quality; uint quality = cap->jpeg_quality;
uint n_workers = US_MIN(enc->n_workers, cr->n_bufs); uint n_workers = US_MIN(enc->n_workers, cr->n_bufs);
bool cpu_forced = false;
if (us_is_jpeg(cr->format) && type != US_ENCODER_TYPE_HW) { if (us_is_jpeg(cr->format) && type != US_ENCODER_TYPE_HW) {
US_LOG_INFO("Switching to HW encoder: the input is (M)JPEG ..."); US_LOG_INFO("Switching to HW encoder: the input is (M)JPEG ...");
@@ -126,12 +125,14 @@ void us_encoder_open(us_encoder_s *enc, us_capture_s *cap) {
} }
if (type == US_ENCODER_TYPE_HW) { if (type == US_ENCODER_TYPE_HW) {
if (!us_is_jpeg(cr->format)) { if (us_is_jpeg(cr->format) {
US_LOG_INFO("Switching to CPU encoder: the input format is not (M)JPEG ...");
goto use_cpu;
}
quality = cr->jpeg_quality; quality = cr->jpeg_quality;
n_workers = 1; n_workers = 1;
} else {
US_LOG_INFO("Switching to CPU encoder: the input format is not (M)JPEG ...");
type = US_ENCODER_TYPE_CPU;
quality = cap->jpeg_quality;
}
} else if (type == US_ENCODER_TYPE_M2M_VIDEO || type == US_ENCODER_TYPE_M2M_IMAGE) { } else if (type == US_ENCODER_TYPE_M2M_VIDEO || type == US_ENCODER_TYPE_M2M_IMAGE) {
US_LOG_DEBUG("Preparing M2M-%s encoder ...", (type == US_ENCODER_TYPE_M2M_VIDEO ? "VIDEO" : "IMAGE")); US_LOG_DEBUG("Preparing M2M-%s encoder ...", (type == US_ENCODER_TYPE_M2M_VIDEO ? "VIDEO" : "IMAGE"));
@@ -150,13 +151,6 @@ void us_encoder_open(us_encoder_s *enc, us_capture_s *cap) {
} }
} }
goto ok;
use_cpu:
type = US_ENCODER_TYPE_CPU;
quality = cap->jpeg_quality;
ok:
if (quality == 0) { if (quality == 0) {
US_LOG_INFO("Using JPEG quality: encoder default"); US_LOG_INFO("Using JPEG quality: encoder default");
} else { } else {
@@ -166,9 +160,6 @@ ok:
US_MUTEX_LOCK(run->mutex); US_MUTEX_LOCK(run->mutex);
run->type = type; run->type = type;
run->quality = quality; run->quality = quality;
if (cpu_forced) {
run->cpu_forced = true;
}
US_MUTEX_UNLOCK(run->mutex); US_MUTEX_UNLOCK(run->mutex);
const ldf desired_interval = ( const ldf desired_interval = (
@@ -243,14 +234,9 @@ static bool _worker_run_job(us_worker_s *wr) {
job->dest->encode_end_ts - job->dest->encode_begin_ts, job->dest->encode_end_ts - job->dest->encode_begin_ts,
wr->name, wr->name,
job->hw->buf.index); job->hw->buf.index);
return true; return true;
error: error:
US_LOG_ERROR("Compression failed: worker=%s, buffer=%u", wr->name, job->hw->buf.index); US_LOG_ERROR("Compression failed: worker=%s, buffer=%u", wr->name, job->hw->buf.index);
US_LOG_ERROR("Error while compressing buffer, falling back to CPU");
US_MUTEX_LOCK(run->mutex);
run->cpu_forced = true;
US_MUTEX_UNLOCK(run->mutex);
return false; return false;
} }

1
src/ustreamer/encoder.h
View File

@@ -45,7 +45,6 @@ typedef enum {
typedef struct { typedef struct {
us_encoder_type_e type; us_encoder_type_e type;
uint quality; uint quality;
bool cpu_forced;
pthread_mutex_t mutex; pthread_mutex_t mutex;
uint n_m2ms; uint n_m2ms;