corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1920429 - Use Opus packet duration when discarding padding in WebM. a=RyanVM

Browse Source 
Original Revision: https://phabricator.services.mozilla.com/D250906

Differential Revision: https://phabricator.services.mozilla.com/D257957
This commit is contained in:
Paul Adenot
2025-07-22 01:59:16 +00:00
committed by rvandermeulen@mozilla.com
parent 8ec28b97d1
commit 83bab56a4b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/external/gkcodecs/gkcodecs.symbols vendored
View File

@@ -97,6 +97,7 @@ opus_multistream_encoder_create
opus_multistream_encoder_ctl
opus_multistream_encoder_destroy
opus_packet_get_nb_channels
opus_packet_get_nb_samples
opus_packet_get_nb_frames
opus_packet_get_samples_per_frame
opus_packet_parse

11
dom/media/webm/WebMDemuxer.cpp
View File

@@ -29,6 +29,7 @@
#include <algorithm>
#include <numeric>
#include <stdint.h>
#include <opus/opus.h>
#define WEBM_DEBUG(arg, ...) \
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
@@ -819,15 +820,19 @@ nsresult WebMDemuxer::GetNextPacket(TrackInfo::TrackType aType,
sample->mDuration = TimeUnit::Invalid();
} else {
TimeUnit padding = TimeUnit::FromNanoseconds(discardPadding);
if (padding > sample->mDuration || mProcessedDiscardPadding) {
size_t samples = opus_packet_get_nb_samples(
sample->Data(), AssertedCast<int32_t>(sample->Size()),
AssertedCast<int32_t>(mInfo.mAudio.mRate));
TimeUnit packetDuration = TimeUnit(samples, mInfo.mAudio.mRate);
if (padding > packetDuration || mProcessedDiscardPadding) {
WEBM_DEBUG(
"Padding frames larger than packet size, flagging the packet for "
"error (padding: %s, duration: %s, already processed: %s)",
padding.ToString().get(), sample->mDuration.ToString().get(),
padding.ToString().get(), packetDuration.ToString().get(),
mProcessedDiscardPadding ? "true" : "false");
sample->mDuration = TimeUnit::Invalid();
} else {
sample->mDuration -= padding;
sample->mDuration = packetDuration - padding;
}
}
mProcessedDiscardPadding = true;