Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[media] Revise OpusAudioDecoder::Reset() via OPUS_RESET_STATE #2727

Merged
merged 1 commit into from
Apr 11, 2024
Merged

[media] Revise OpusAudioDecoder::Reset() via OPUS_RESET_STATE #2727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions starboard/shared/opus/opus_audio_decoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ OpusAudioDecoder::OpusAudioDecoder(const AudioStreamInfo& audio_stream_info)
}

OpusAudioDecoder::~OpusAudioDecoder() {
if (is_valid()) {
opus_multistream_decoder_ctl(decoder_, OPUS_RESET_STATE);
}
TeardownCodec();
}

Expand Down Expand Up @@ -218,8 +221,9 @@ void OpusAudioDecoder::InitializeCodec() {
}

void OpusAudioDecoder::TeardownCodec() {
if (decoder_) {
if (is_valid()) {
opus_multistream_decoder_destroy(decoder_);
decoder_ = NULL;
}
}

Expand All @@ -241,9 +245,19 @@ scoped_refptr<OpusAudioDecoder::DecodedAudio> OpusAudioDecoder::Read(
void OpusAudioDecoder::Reset() {
SB_DCHECK(BelongsToCurrentThread());

TeardownCodec();
InitializeCodec();
if (is_valid()) {
int error = opus_multistream_decoder_ctl(decoder_, OPUS_RESET_STATE);
if (error != OPUS_OK) {
SB_LOG(ERROR) << "Failed to reset OpusAudioDecoder with error: "
<< opus_strerror(error);

// If fail to reset opus decoder, re-create it.
TeardownCodec();
InitializeCodec();
}
}

frames_per_au_ = kMaxOpusFramesPerAU;
stream_ended_ = false;
while (!decoded_audios_.empty()) {
decoded_audios_.pop();
Expand Down
Loading