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

decoder/vorbis: add VorbisInputStream constructor

Browse Source
This commit is contained in:
Max Kellermann 2014-05-22 13:04:35 +02:00
parent a3142ee4e6
commit 36c9e95969
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/decoder/plugins/VorbisDecoderPlugin.cxx
View File

@ -49,10 +49,14 @@
#include <errno.h> #include <errno.h>
struct VorbisInputStream { struct VorbisInputStream {
Decoder *decoder; Decoder *const decoder;
InputStream *input_stream; InputStream *const input_stream;
bool seekable; bool seekable;
VorbisInputStream(Decoder *_decoder, InputStream &_is)
:decoder(_decoder), input_stream(&_is),
seekable(input_stream->CheapSeeking()) {}
}; };
static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *data) static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *data)
@ -123,17 +127,12 @@ vorbis_strerror(int code)
} }
static bool static bool
vorbis_is_open(VorbisInputStream *vis, OggVorbis_File *vf, vorbis_is_open(VorbisInputStream *vis, OggVorbis_File *vf)
Decoder *decoder, InputStream &input_stream)
{ {
vis->decoder = decoder;
vis->input_stream = &input_stream;
vis->seekable = input_stream.CheapSeeking();
int ret = ov_open_callbacks(vis, vf, nullptr, 0, vorbis_is_callbacks); int ret = ov_open_callbacks(vis, vf, nullptr, 0, vorbis_is_callbacks);
if (ret < 0) { if (ret < 0) {
if (decoder == nullptr || if (vis->decoder == nullptr ||
decoder_get_command(*decoder) == DecoderCommand::NONE) decoder_get_command(*vis->decoder) == DecoderCommand::NONE)
FormatWarning(vorbis_domain, FormatWarning(vorbis_domain,
"Failed to open Ogg Vorbis stream: %s", "Failed to open Ogg Vorbis stream: %s",
vorbis_strerror(ret)); vorbis_strerror(ret));
@ -192,9 +191,9 @@ vorbis_stream_decode(Decoder &decoder,
moved it */ moved it */
input_stream.LockRewind(IgnoreError()); input_stream.LockRewind(IgnoreError());
VorbisInputStream vis; VorbisInputStream vis(&decoder, input_stream);
OggVorbis_File vf; OggVorbis_File vf;
if (!vorbis_is_open(&vis, &vf, &decoder, input_stream)) if (!vorbis_is_open(&vis, &vf))
return; return;
const vorbis_info *vi = ov_info(&vf, -1); const vorbis_info *vi = ov_info(&vf, -1);
@ -313,10 +312,10 @@ static bool
vorbis_scan_stream(InputStream &is, vorbis_scan_stream(InputStream &is,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
VorbisInputStream vis; VorbisInputStream vis(nullptr, is);
OggVorbis_File vf; OggVorbis_File vf;
if (!vorbis_is_open(&vis, &vf, nullptr, is)) if (!vorbis_is_open(&vis, &vf))
return false; return false;
tag_handler_invoke_duration(handler, handler_ctx, tag_handler_invoke_duration(handler, handler_ctx,