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

lib/xiph/OggStream: move code to ReadPage()

Browse Source
This commit is contained in:
Max Kellermann 2016-05-09 14:22:12 +02:00
parent 58c11c3128
commit 1cf632e98b
3 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -596,6 +596,7 @@ libxiph_a_SOURCES += \
src/lib/xiph/OggSerial.cxx src/lib/xiph/OggSerial.hxx \
src/lib/xiph/OggUtil.cxx src/lib/xiph/OggUtil.hxx \
src/lib/xiph/OggSyncState.hxx \
src/lib/xiph/OggPage.hxx \
src/lib/xiph/OggStream.hxx
endif

51
src/lib/xiph/OggPage.hxx Normal file
View File

@ -0,0 +1,51 @@
/*
* 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_PAGE_HXX
#define MPD_OGG_PAGE_HXX
#include "check.h"
#include <ogg/ogg.h>
#include <assert.h>
#include <string.h>
#include <stdint.h>
static size_t
ReadPage(const ogg_page &page, void *_buffer, size_t size)
{
assert(page.header_len > 0 || page.body_len > 0);
size_t header_len = (size_t)page.header_len;
size_t body_len = (size_t)page.body_len;
assert(header_len <= size);
if (header_len + body_len > size)
/* TODO: better overflow handling */
body_len = size - header_len;
uint8_t *buffer = (uint8_t *)_buffer;
memcpy(buffer, page.header, header_len);
memcpy(buffer + header_len, page.body, body_len);
return header_len + body_len;
}
#endif

21
src/lib/xiph/OggStream.hxx
View File

@ -21,12 +21,11 @@
#define MPD_OGG_STREAM_HXX
#include "check.h"
#include "OggPage.hxx"
#include <ogg/ogg.h>
#include <assert.h>
#include <string.h>
#include <stdint.h>
class OggStream {
ogg_stream_state state;
@ -101,26 +100,12 @@ public:
return result != 0;
}
size_t PageOut(void *_buffer, size_t size) {
size_t PageOut(void *buffer, size_t size) {
ogg_page page;
if (!PageOut(page))
return 0;
assert(page.header_len > 0 || page.body_len > 0);
size_t header_len = (size_t)page.header_len;
size_t body_len = (size_t)page.body_len;
assert(header_len <= size);
if (header_len + body_len > size)
/* TODO: better overflow handling */
body_len = size - header_len;
uint8_t *buffer = (uint8_t *)_buffer;
memcpy(buffer, page.header, header_len);
memcpy(buffer + header_len, page.body, body_len);
return header_len + body_len;
return ReadPage(page, buffer, size);
}
};