aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-11-03 04:17:17 -05:00
Code

Workaround: This avoids libspeex printing warnings on Opus streams.

Browse Source 
libspeex reports warnings in case of oddnesses with the data to stderr.
However Icecast2 uses those functions in it's codec probeing process.
This way libspeex will write messages to a posibily reused random handle.

This is clearly a bug by package maintainers of libspeex.
See the source code of this change as well as libspeex's source code
as reference.
This commit is contained in:
Philipp Schafft 2016-10-29 11:42:52 +00:00
parent fa1915c46d
commit 1a4bb8865b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/format_speex.c
View File

@ -73,6 +73,19 @@ ogg_codec_t *initial_speex_page (format_plugin_t *plugin, ogg_page *page)
ogg_stream_packetout (&codec->os, &packet);
/* Check for te first packet to be at least of the minimal size for a Speex header.
* The header size is 80 bytes as per specs. You can find the specs here:
* https://speex.org/docs/manual/speex-manual/node8.html#SECTION00830000000000000000
*
* speex_packet_to_header() will also check the header size for us. However
* that function generates noise on stderr in case the header is too short.
* This is dangerous as we may have closed stderr already and the handle may be use
* again for something else.
*/
if (packet.bytes < 80) {
return NULL;
}
ICECAST_LOG_DEBUG("checking for speex codec");
header = speex_packet_to_header ((char*)packet.packet, packet.bytes);
if (header == NULL)