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

decoder/opus: move _scan_stream() code to OggReadPacket()

Browse Source
This commit is contained in:
Max Kellermann
2016-05-14 10:39:53 +02:00
parent 2654888782
commit 74926c1dd3
4 changed files with 119 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib/xiph/OggPacket.cxx Normal file
View File

@@ -0,0 +1,35 @@
/*
* Copyright 2003-2016 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 "OggPacket.hxx"
#include "OggSyncState.hxx"
#include "OggStreamState.hxx"
bool
OggReadPacket(OggSyncState &sync, OggStreamState &stream, ogg_packet &packet)
{
while (true) {
if (stream.PacketOut(packet))
return true;
if (!sync.ExpectPageIn(stream))
return false;
}
}

37
src/lib/xiph/OggPacket.hxx Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright 2003-2016 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.
*/
#ifndef MPD_OGG_PACKET_HXX
#define MPD_OGG_PACKET_HXX
#include "check.h"
#include <ogg/ogg.h>
class OggSyncState;
class OggStreamState;
/**
* Read the next packet. If necessary, feed more data into
* #OggSyncState and feed more pages into #OggStreamState.
*/
bool
OggReadPacket(OggSyncState &sync, OggStreamState &stream, ogg_packet &packet);
#endif