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

decoder/opus: eliminate flag "found_opus"

Browse Source 
Check opus_decoder!=nullptr instead.
This commit is contained in:
Max Kellermann
2014-11-11 08:30:11 +01:00
parent 4a04f73434
commit 466b6a23cd
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,6 @@ class MPDOpusDecoder {
opus_int16 *output_buffer; opus_int16 *output_buffer;
bool os_initialized; bool os_initialized;
bool found_opus;
int opus_serialno; int opus_serialno;
@@ -92,7 +91,7 @@ public:
:decoder(_decoder), input_stream(_input_stream), :decoder(_decoder), input_stream(_input_stream),
opus_decoder(nullptr), opus_decoder(nullptr),
output_buffer(nullptr), output_buffer(nullptr),
os_initialized(false), found_opus(false) {} os_initialized(false) {}
~MPDOpusDecoder(); ~MPDOpusDecoder();
bool ReadFirstPage(OggSyncState &oy); bool ReadFirstPage(OggSyncState &oy);
@@ -168,7 +167,7 @@ MPDOpusDecoder::HandlePacket(const ogg_packet &packet)
if (packet.b_o_s) if (packet.b_o_s)
return HandleBOS(packet); return HandleBOS(packet);
else if (!found_opus) else if (opus_decoder == nullptr)
return DecoderCommand::STOP; return DecoderCommand::STOP;
if (IsOpusTags(packet)) if (IsOpusTags(packet))
@@ -230,7 +229,7 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
{ {
assert(packet.b_o_s); assert(packet.b_o_s);
if (found_opus || !IsOpusHead(packet)) if (opus_decoder != nullptr || !IsOpusHead(packet))
return DecoderCommand::STOP; return DecoderCommand::STOP;
unsigned channels; unsigned channels;
@@ -242,7 +241,6 @@ MPDOpusDecoder::HandleBOS(const ogg_packet &packet)
assert(output_buffer == nullptr); assert(output_buffer == nullptr);
opus_serialno = os.serialno; opus_serialno = os.serialno;
found_opus = true;
/* TODO: parse attributes from the OpusHead (sample rate, /* TODO: parse attributes from the OpusHead (sample rate,
channels, ...) */ channels, ...) */