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

decoder/opus: keep track of the granulepos

Browse Source 
Will be needed for End Trimming (RFC7845 4.4,
https://github.com/MusicPlayerDaemon/MPD/issues/867).
This commit is contained in:
Max Kellermann 2020-07-01 21:15:59 +02:00
parent 4244e61214
commit 7befab7e83
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,13 @@ class MPDOpusDecoder final : public OggDecoder {
size_t frame_size; size_t frame_size;
/**
* The granulepos of the next sample to be submitted to
* DecoderClient::SubmitData(). Negative if unkown.
* Initialized by OnOggBeginning().
*/
ogg_int64_t granulepos;
public: public:
explicit MPDOpusDecoder(DecoderReader &reader) explicit MPDOpusDecoder(DecoderReader &reader)
:OggDecoder(reader) {} :OggDecoder(reader) {}
@ -114,6 +121,13 @@ public:
bool Seek(uint64_t where_frame); bool Seek(uint64_t where_frame);
private: private:
void AddGranulepos(ogg_int64_t n) noexcept {
assert(n >= 0);
if (granulepos >= 0)
granulepos += n;
}
void HandleTags(const ogg_packet &packet); void HandleTags(const ogg_packet &packet);
void HandleAudio(const ogg_packet &packet); void HandleAudio(const ogg_packet &packet);
@ -154,6 +168,7 @@ MPDOpusDecoder::OnOggBeginning(const ogg_packet &packet)
!audio_valid_channel_count(channels)) !audio_valid_channel_count(channels))
throw std::runtime_error("Malformed BOS packet"); throw std::runtime_error("Malformed BOS packet");
granulepos = 0;
skip = pre_skip; skip = pre_skip;
assert(opus_decoder == nullptr); assert(opus_decoder == nullptr);
@ -261,12 +276,14 @@ MPDOpusDecoder::HandleAudio(const ogg_packet &packet)
/* apply the "skip" value */ /* apply the "skip" value */
if (skip >= (unsigned)nframes) { if (skip >= (unsigned)nframes) {
skip -= nframes; skip -= nframes;
AddGranulepos(nframes);
return; 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;
AddGranulepos(skip);
skip = 0; skip = 0;
/* submit decoded samples to the DecoderClient */ /* submit decoded samples to the DecoderClient */
@ -277,9 +294,12 @@ MPDOpusDecoder::HandleAudio(const ogg_packet &packet)
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) granulepos = packet.granulepos;
client.SubmitTimestamp(FloatDuration(granulepos - pre_skip)
/ opus_sample_rate); / opus_sample_rate);
} else
AddGranulepos(nframes);
} }
bool bool
@ -291,6 +311,11 @@ MPDOpusDecoder::Seek(uint64_t where_frame)
const ogg_int64_t where_granulepos(where_frame); const ogg_int64_t where_granulepos(where_frame);
/* we don't know the exact granulepos after seeking, so let's
set it to -1 - it will be set after the next packet which
declares its granulepos */
granulepos = -1;
try { try {
SeekGranulePos(where_granulepos); SeekGranulePos(where_granulepos);