oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/opus: limit the number of packets in _scan_stream()

Browse Source
This commit is contained in:
Max Kellermann 2016-04-19 13:07:28 +02:00
parent e6fad97edc
commit c731a82b71
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/decoder/plugins/OpusDecoderPlugin.cxx
View File

@ -444,10 +444,12 @@ mpd_opus_scan_stream(InputStream &is,
/* read at most 64 more pages */ /* read at most 64 more pages */
unsigned remaining_pages = 64; unsigned remaining_pages = 64;
unsigned remaining_packets = 4;
bool result = false; bool result = false;
ogg_packet packet; ogg_packet packet;
while (true) { while (remaining_packets > 0) {
int r = ogg_stream_packetout(&os, &packet); int r = ogg_stream_packetout(&os, &packet);
if (r < 0) { if (r < 0) {
result = false; result = false;
@ -466,6 +468,8 @@ mpd_opus_scan_stream(InputStream &is,
continue; continue;
} }
--remaining_packets;
if (packet.b_o_s) { if (packet.b_o_s) {
if (!IsOpusHead(packet)) if (!IsOpusHead(packet))
break; break;