MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-27 15:45:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[streaming] Adjust httpd_streaming to new transcode interface

Browse Source
This commit is contained in:
ejurgensen 2019-02-08 20:04:50 +01:00
parent 4fe5c47526
commit 76bbfb6d2c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/httpd_streaming.c
View File

@ -44,8 +44,10 @@ extern struct event_base *evbase_httpd;
// Seconds between sending silence when player is idle // Seconds between sending silence when player is idle
// (to prevent client from hanging up) // (to prevent client from hanging up)
#define STREAMING_SILENCE_INTERVAL 1 #define STREAMING_SILENCE_INTERVAL 1
// Buffer size for transmitting from player to httpd thread // How many samples we store in the buffer used for transmitting from player to httpd thread
#define STREAMING_RAWBUF_SIZE (STOB(AIRTUNES_V2_PACKET_SAMPLES)) #define STREAMING_RAWBUF_SAMPLES 352
// Buffer size
#define STREAMING_RAWBUF_SIZE (STOB(STREAMING_RAWBUF_SAMPLES, 16, 2))
// Linked list of mp3 streaming requests // Linked list of mp3 streaming requests
struct streaming_session { struct streaming_session {
@ -134,7 +136,7 @@ streaming_send_cb(evutil_socket_t fd, short event, void *arg)
if (!streaming_sessions) if (!streaming_sessions)
return; return;
frame = transcode_frame_new(XCODE_MP3, streaming_rawbuf, STREAMING_RAWBUF_SIZE); frame = transcode_frame_new(streaming_rawbuf, STREAMING_RAWBUF_SIZE, STREAMING_RAWBUF_SAMPLES, 44100, 16);
if (!frame) if (!frame)
{ {
DPRINTF(E_LOG, L_STREAMING, "Could not convert raw PCM to frame\n"); DPRINTF(E_LOG, L_STREAMING, "Could not convert raw PCM to frame\n");
@ -289,7 +291,7 @@ streaming_init(void)
int remaining; int remaining;
int ret; int ret;
decode_ctx = transcode_decode_setup_raw(); decode_ctx = transcode_decode_setup_raw(XCODE_PCM16_44100);
if (!decode_ctx) if (!decode_ctx)
{ {
DPRINTF(E_LOG, L_STREAMING, "Could not create decoding context\n"); DPRINTF(E_LOG, L_STREAMING, "Could not create decoding context\n");
@ -339,10 +341,10 @@ streaming_init(void)
} }
// Encode some silence which will be used for playback pause and put in a permanent buffer // Encode some silence which will be used for playback pause and put in a permanent buffer
remaining = STREAMING_SILENCE_INTERVAL * STOB(44100); remaining = STREAMING_SILENCE_INTERVAL * STOB(44100, 16, 2);
while (remaining > STREAMING_RAWBUF_SIZE) while (remaining > STREAMING_RAWBUF_SIZE)
{ {
frame = transcode_frame_new(XCODE_MP3, streaming_rawbuf, STREAMING_RAWBUF_SIZE); frame = transcode_frame_new(streaming_rawbuf, STREAMING_RAWBUF_SIZE, STREAMING_RAWBUF_SAMPLES, 44100, 16);
if (!frame) if (!frame)
{ {
DPRINTF(E_LOG, L_STREAMING, "Could not convert raw PCM to frame\n"); DPRINTF(E_LOG, L_STREAMING, "Could not convert raw PCM to frame\n");