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

decoder/opus: add method IsInitialized()

Browse Source
This commit is contained in:
Max Kellermann
2016-05-11 17:24:48 +02:00
parent 20758cef30
commit 1af59d31b9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,6 +102,13 @@ public:
~MPDOpusDecoder(); ~MPDOpusDecoder();
/**
* Has decoder_initialized() been called yet?
*/
bool IsInitialized() const {
return previous_channels != 0;
}
bool ReadNextPage(OggSyncState &oy); bool ReadNextPage(OggSyncState &oy);
DecoderCommand HandlePackets(); DecoderCommand HandlePackets();
@@ -240,9 +247,9 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
} }
assert(opus_decoder == nullptr); assert(opus_decoder == nullptr);
assert((previous_channels == 0) == (output_buffer == nullptr)); assert(IsInitialized() == (output_buffer != nullptr));
if (previous_channels != 0 && channels != previous_channels) { if (IsInitialized() && channels != previous_channels) {
FormatWarning(opus_domain, FormatWarning(opus_domain,
"Next stream has different channels (%u -> %u)", "Next stream has different channels (%u -> %u)",
previous_channels, channels); previous_channels, channels);
@@ -263,7 +270,7 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
return DecoderCommand::STOP; return DecoderCommand::STOP;
} }
if (previous_channels != 0) { if (IsInitialized()) {
/* decoder was already initialized by the previous /* decoder was already initialized by the previous
stream; skip the rest of this method */ stream; skip the rest of this method */
LogDebug(opus_domain, "Found another stream"); LogDebug(opus_domain, "Found another stream");
@@ -293,7 +300,7 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
inline DecoderCommand inline DecoderCommand
MPDOpusDecoder::HandleEOS() MPDOpusDecoder::HandleEOS()
{ {
if (eos_granulepos < 0 && previous_channels != 0) { if (eos_granulepos < 0 && IsInitialized()) {
/* allow chaining of (unseekable) streams */ /* allow chaining of (unseekable) streams */
assert(opus_decoder != nullptr); assert(opus_decoder != nullptr);
assert(output_buffer != nullptr); assert(output_buffer != nullptr);