MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-09 13:39:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

[input] Adapt input_buffer so it can handle dynamic quality (sample rates etc)

Browse Source 
Still WIP, player and outputs cannot handle this yet
This commit is contained in:
ejurgensen
2019-01-14 00:17:02 +01:00
parent 9182597605
commit 1696fc3384
5 changed files with 161 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/inputs/file_http.c
View File

@@ -59,17 +59,16 @@ static int
start(struct player_source *ps)
{
struct transcode_ctx *ctx = ps->input_ctx;
struct input_quality quality = { 0 };
struct evbuffer *evbuf;
short flags;
int sample_rate;
int bps;
int ret;
int icy_timer;
evbuf = evbuffer_new();
sample_rate = transcode_encode_query(ctx->encode_ctx, "sample_rate");
bps = transcode_encode_query(ctx->encode_ctx, "bits_per_sample");
quality.sample_rate = transcode_encode_query(ctx->encode_ctx, "sample_rate");
quality.bits_per_sample = transcode_encode_query(ctx->encode_ctx, "bits_per_sample");
ret = -1;
flags = 0;
@@ -84,7 +83,7 @@ start(struct player_source *ps)
flags = ((ret == 0) ? INPUT_FLAG_EOF : 0) |
(icy_timer ? INPUT_FLAG_METADATA : 0);
ret = input_write(evbuf, sample_rate, bps, flags);
ret = input_write(evbuf, &quality, flags);
if (ret < 0)
break;
}

12
src/inputs/pipe.c
View File

@@ -831,6 +831,7 @@ static int
start(struct player_source *ps)
{
struct pipe *pipe = ps->input_ctx;
struct input_quality quality = { 0 };
struct evbuffer *evbuf;
short flags;
int ret;
@@ -842,13 +843,16 @@ start(struct player_source *ps)
return -1;
}
quality.sample_rate = pipe_sample_rate;
quality.bits_per_sample = pipe_bits_per_sample;
ret = -1;
while (!input_loop_break)
{
ret = evbuffer_read(evbuf, pipe->fd, PIPE_READ_MAX);
if ((ret == 0) && (pipe->is_autostarted))
{
input_write(evbuf, pipe_sample_rate, pipe_bits_per_sample, INPUT_FLAG_EOF); // Autostop
input_write(evbuf, NULL, INPUT_FLAG_EOF); // Autostop
break;
}
else if ((ret == 0) || ((ret < 0) && (errno == EAGAIN)))
@@ -865,7 +869,7 @@ start(struct player_source *ps)
flags = (pipe_metadata_is_new ? INPUT_FLAG_METADATA : 0);
pipe_metadata_is_new = 0;
ret = input_write(evbuf, pipe_sample_rate, pipe_bits_per_sample, flags);
ret = input_write(evbuf, &quality, flags);
if (ret < 0)
break;
}
@@ -949,14 +953,14 @@ init(void)
}
pipe_sample_rate = cfg_getint(cfg_getsec(cfg, "library"), "pipe_sample_rate");
if (pipe_sample_rate != 44100 || pipe_sample_rate != 48000 || pipe_sample_rate != 96000)
if (pipe_sample_rate != 44100 && pipe_sample_rate != 48000 && pipe_sample_rate != 96000)
{
DPRINTF(E_FATAL, L_PLAYER, "The configuration of pipe_sample_rate is invalid: %d\n", pipe_sample_rate);
return -1;
}
pipe_bits_per_sample = cfg_getint(cfg_getsec(cfg, "library"), "pipe_bits_per_sample");
if (pipe_bits_per_sample != 16 || pipe_bits_per_sample != 24)
if (pipe_bits_per_sample != 16 && pipe_bits_per_sample != 24)
{
DPRINTF(E_FATAL, L_PLAYER, "The configuration of pipe_bits_per_sample is invalid: %d\n", pipe_bits_per_sample);
return -1;