3cd24c0a51
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTcPbuAAoJECNuiljG20US+LsQAI5LcUiQ2AxfDdXfEkIW+ryQ U5htp4RAAizVFEAdgzdDOoHBVefkvwij6G9ND9WAbJRsUOZs62XwlnOFaB/uQPhd VvoNIQLmuUNxltF1itaCTJ0UJkXi6ObVExpwMScGI242uUmoNnxwsWxDxyy2s4bn On/OwT64zTOsPTjkYGdfGncwx4dhQc2KJvGGD6y/lMhxUnn3NoKG/VOgleN4ALcL KQ0SFQOFbUHJcvMXYdMzhe426d7GiHzFVIfdU16yJz47/xHDmaM+VVJQCOF68rrw kyb2POxR4VXhPMfIleF2RiCopvDGSvQfUE3jhQjKBgZE2NeFeI/5N6JcWbZgFJ/J 4ez3DcjSD1Oeoz6gzaq1QybCku4EZTvPa6Kbb5/84JNKmVdb/JowGF0L18bwTbGv y5D5HN3zTdmBXwsiDnTNDtuwaSejvIDTN1k4AkdQ9mLMIMT+13NHLBs1rDE2JnlG 3xhXrIvwhUBdE1A4uFj8duzk11EWzNI+ltJBRnG8uEzAJxpv5Khiwmj2GciS6s5r wp1YUIUA0BhrEgrtoTdE7x13lXkDrmydcJ5kA0kArJFQALliE7kivyg1gtrcNRj1 7fDRAb9QOxaJrrsJzM9f9pDaIttHRjRvurFtikD90oaRE1g+6ygeScmYJDPhPjvU R6PxzvsMCn8kJFWq2ARg =Ubmu -----END PGP SIGNATURE----- Merge tag 'v0.18.11'
119 lines
2.7 KiB
C++
119 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2003-2014 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "OggUtil.hxx"
|
|
#include "../DecoderAPI.hxx"
|
|
|
|
bool
|
|
OggFeed(ogg_sync_state &oy, Decoder *decoder,
|
|
InputStream &input_stream, size_t size)
|
|
{
|
|
char *buffer = ogg_sync_buffer(&oy, size);
|
|
if (buffer == nullptr)
|
|
return false;
|
|
|
|
size_t nbytes = decoder_read(decoder, input_stream,
|
|
buffer, size);
|
|
if (nbytes == 0)
|
|
return false;
|
|
|
|
ogg_sync_wrote(&oy, nbytes);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OggExpectPage(ogg_sync_state &oy, ogg_page &page,
|
|
Decoder *decoder, InputStream &input_stream)
|
|
{
|
|
while (true) {
|
|
int r = ogg_sync_pageout(&oy, &page);
|
|
if (r != 0)
|
|
return r > 0;
|
|
|
|
if (!OggFeed(oy, decoder, input_stream, 1024))
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool
|
|
OggExpectFirstPage(ogg_sync_state &oy, ogg_stream_state &os,
|
|
Decoder *decoder, InputStream &is)
|
|
{
|
|
ogg_page page;
|
|
if (!OggExpectPage(oy, page, decoder, is))
|
|
return false;
|
|
|
|
ogg_stream_init(&os, ogg_page_serialno(&page));
|
|
ogg_stream_pagein(&os, &page);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OggExpectPageIn(ogg_sync_state &oy, ogg_stream_state &os,
|
|
Decoder *decoder, InputStream &is)
|
|
{
|
|
ogg_page page;
|
|
if (!OggExpectPage(oy, page, decoder, is))
|
|
return false;
|
|
|
|
ogg_stream_pagein(&os, &page);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
OggExpectPageSeek(ogg_sync_state &oy, ogg_page &page,
|
|
Decoder *decoder, InputStream &input_stream)
|
|
{
|
|
size_t remaining_skipped = 32768;
|
|
|
|
while (true) {
|
|
int r = ogg_sync_pageseek(&oy, &page);
|
|
if (r > 0)
|
|
return true;
|
|
|
|
if (r < 0) {
|
|
/* skipped -r bytes */
|
|
size_t nbytes = -r;
|
|
if (nbytes > remaining_skipped)
|
|
/* still no ogg page - we lost our
|
|
patience, abort */
|
|
return false;
|
|
|
|
remaining_skipped -= nbytes;
|
|
continue;
|
|
}
|
|
|
|
if (!OggFeed(oy, decoder, input_stream, 1024))
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool
|
|
OggExpectPageSeekIn(ogg_sync_state &oy, ogg_stream_state &os,
|
|
Decoder *decoder, InputStream &is)
|
|
{
|
|
ogg_page page;
|
|
if (!OggExpectPageSeek(oy, page, decoder, is))
|
|
return false;
|
|
|
|
ogg_stream_pagein(&os, &page);
|
|
return true;
|
|
}
|