Commit 4244e612 authored by Max Kellermann's avatar Max Kellermann

decoder/opus: simplify indentation in HandleAudio()

parent 46eab050
...@@ -250,34 +250,36 @@ MPDOpusDecoder::HandleAudio(const ogg_packet &packet) ...@@ -250,34 +250,36 @@ MPDOpusDecoder::HandleAudio(const ogg_packet &packet)
packet.bytes, packet.bytes,
output_buffer, opus_output_buffer_frames, output_buffer, opus_output_buffer_frames,
0); 0);
if (nframes < 0) if (gcc_unlikely(nframes <= 0)) {
throw FormatRuntimeError("libopus error: %s", if (nframes < 0)
opus_strerror(nframes)); throw FormatRuntimeError("libopus error: %s",
opus_strerror(nframes));
if (nframes > 0) { else
/* apply the "skip" value */
if (skip >= (unsigned)nframes) {
skip -= nframes;
return; return;
} }
/* apply the "skip" value */
if (skip >= (unsigned)nframes) {
skip -= nframes;
return;
}
const opus_int16 *data = output_buffer; const opus_int16 *data = output_buffer;
data += skip * previous_channels; data += skip * previous_channels;
nframes -= skip; nframes -= skip;
skip = 0; skip = 0;
/* submit decoded samples to the DecoderClient */ /* submit decoded samples to the DecoderClient */
const size_t nbytes = nframes * frame_size; const size_t nbytes = nframes * frame_size;
auto cmd = client.SubmitData(input_stream, auto cmd = client.SubmitData(input_stream,
data, nbytes, data, nbytes,
0); 0);
if (cmd != DecoderCommand::NONE) if (cmd != DecoderCommand::NONE)
throw cmd; throw cmd;
if (packet.granulepos > 0) if (packet.granulepos > 0)
client.SubmitTimestamp(FloatDuration(packet.granulepos - pre_skip) client.SubmitTimestamp(FloatDuration(packet.granulepos - pre_skip)
/ opus_sample_rate); / opus_sample_rate);
}
} }
bool bool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment