mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-07-08 08:09:59 +00:00
8a0a002cf2
- Bug 1148708: Add missing 'override' annotations in DocAccessibleChild.h. rs=ehsan (d606358545)
- Bug 1210408 - make nsMaiInterfaceAction work with proxies, r=tbsaunde (f7c819c6ae)
- Bug 1210407 - teach nsMaiInterfaceTable to use proxies, r=tbsaunde (4ca4f10b5f)
- bug 1185157 make sure we don't send an event to a destroyed ipc document r=billm (23acf53f75)
- bug 1214864 - make SetCarretOffset() async r=davidb (e3079e9b2d)
- missing of Bug 1139972 - IPC Proxy for charAt, r=tbsaunde (e9593ed752)
- bug 1191598 - Pass MOZ_CURRENT_PROJECT in environment when running post-build automation steps for universal mac builds. r=gps (fc342c6ced)
- Bug 1164596 - Add mach android-emulator command; r=ahal (afeb9b27d1)
- Bug 1223149 - Add basic usage documentation for mach build; r=glandium (bfb802d175)
- Bug 1182301 - Improve 'mach build' notifications. r=gps (2c65a122d1)
- Bug 1184696 - Add clobber targets to |mach clobber|; Ability to clobber compiled python files, r=gps (35d8be292e)
- Bug 1117958 - Allow any debugging options to the run or gtest mach subcommands to automatically enable debugging. r=gps (32f986af4b)
- Bug 1180081 - Properly rebuild gtest/libxul before running gtests. r=gps (80db9a3d49)
- Bug 1171647, part 1 - Define a new function to convert the mode to a string. r=njn (61ad16f5ba)
- Bug 1171647, part 2 - Remove redundant assertion for dark matter mode. r=njn (b5ac9519f3)
- Bug 1058178, part 1 - Implement DMD heap scanning mode. r=njn (60e1079536)
- Bug 1058178, part 2 - Implement address clamping analysis for DMD scan logs. r=njn (45c0326b93)
- Bug 1102388 - Fix DMD static constructor ordering dependency. r=mccr8 (59b87897a1)
- Bug 1128705 - Don't redefine PAGE_SIZE in DMD if it's already defined. r=erahm (49216348ee)
- Bug 1179042 - Add a script for analyzing memory blocks using a heap scan DMD log. r=njn DONTBUILD (1c08d2d66e)
- Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat (1c999d139b)
- Bug 1158772 - fix non-idiomatic memset call in nsDeque.cpp; r=erahm (de6b555245)
- Bug 1199400 - Part 1: Use CheckedInt when growing nsDeque capacity. r=froydnj (dfdf6814a3)
- Bug 1199400 - Part 0: Remove unused nsDequeIterator. r=froydnj (38d69d7f47)
- Bug 1199400 - Part 2: Add tests for possible nsDeque corner cases. r=froydnj (931baff195)
- Bug 1201997 - Part 1 - Converted compiled test to gtest for nsDeque class. Added tests to test untested methods. r=froydn (e893916651)
- Bug 1201997 - Part 2 - Removing unused methods from the nsDeque class. r=froydn (41595a90ac)
- Bug 1201997 - Part 3 - Make internally used methods private. r=froydn (8cd3afd96f)
- Bug 1201997 - Part 4 - Change size and offset variables to size_t.r=froydn (73eabc8d60)
- Bug 1215140 P1 Add an nsIConsoleReportCollector interface to support navigation channel logging. r=bz (8a41535e2b)
- Bug 1215140 P2 Make HttpBaseChannel implement nsIConsoleReportCollector. r=bz (75fca301f2)
- Bug 1197679 - If nsUnknownDecoder is involved in e10s DivertToParent can break. r=jduell (5d94a12504)
- Bug 1178991 - smartptr for http converter r=hurley (8e7fbc8443)
- bug 366559 - patch 2, fix nsHTTPCompressConv indentation r=bagder (ba762da587)
- bug 366559 - patch 3, fix nsHTTPCompressConv bracing style r=bagder (54195ab451)
- bits of bug 366559 - patch 7, content-encoding brotli for http (f0b4051022)
- Bug 1205112 - Make PushEvent.data nullable. r=mt,smaug (775db32856)
- Bug 1193414 - SharedWorkers thread should be kept alive also when the SharedWorker object is CCed, r=khuey (b77ea8125c)
- Bug 1206520: Add about:config prefs to enable throwing on asm.js validation failures; r=bz (c42126665d)
- Bug 1193414 - Telemetry for SharedWorker spawning. r=bkelly (77984b7bcc)
- Bug 1205676 - Enable WPT service-worker/unregister-then-register-new-script.https.html in e10s, r=nsm (ec24939cf6)
- Bug 1193133 - Throw when calling postMessage from a Service Worker dom object with no global. r=bkelly (526dcacfab)
- Bug 1181871 P1 Only enforce Cache Context shared data destruction on target thread after init. r=ehsan (cdbf3ed3a8)
- Bug 1181871 P2 Fix ServiceWorkerManager usage of stack-based ErrorResult. r=ehsan (c449195d90)
- minor cleanup and missing bit of 1198230 (02f459db05)
- Bug 1143717 - Implement the ServiceWorkerMessageEvent interface. r=baku (027b3465f2)
- fix misspatch (708eee4e84)
- Bug 1188545 - Disentangle service workers from shared workers and refactor event dispatching code into a separate class. r=nsm,mrbkap (fb5b5341c9)
- Bug 1205228 - Change PackagedAppVerifier to notify the verification result asynchronously. r=valentin. (9edda0fa00)
- Bug 1178518 - Packaged App Utils. r=valentin (f60f3b7a93)
- Bug 1213150 - Part 1: Add a nsContentUtils::IsNonSubresourceRequest helper; r=jdm (b509cc3cc9)
- Bug 1213150 - Part 2: Rework ShouldPrepareForIntercept() in terms of subresource requests; r=jdm (2e92fe8780)
- Bug 1213150 - Part 3: Remove nsIInterceptedChannel.isNavigation; r=jdm (becf1cc12f)
- Bug 1213150 follow-up: fix build bustage (8d73d6ca73)
- Bug 1198394 - Part 1: Allow interception of HSTS upgraded connections in non-e10s mode; r=mcmanus (f504c5be08)
- Bug 1198394 - Part 2: Add a test for interception of HSTS upgraded connections; r=jdm (054e984eef)
- Bug 1187011 - Don't allow response body with null body status. r=bkelly (b1860741d1)
- missing bit of 1140788 (29d319712e)
- Bug 1213436 - Reject core dumps with node IDs that don't fit in an IEEE 754 double; r=sfink (3c1f6fdda0)
- Bug 1211006 - Add Debugger.Source.prototype.canonicalId; r=ejpbruel (eef7b79fce)
- Bug 1199218 - Implement JS::ubi::Node::size for js::LazyScript referents; r=sfink (098a48d240)
- Bug 1220031 - Add JS::ubi::Node::scriptFilename; r=sfink (6b824ae680)
- Bug 1143575. Remove unused MediaQueue::Empty. r=cpearce (de737f3433)
- Bug 1209933 - Make sure all parent runtime pointers are the topmost parent, r=billm. (fe824d967d)
- Bug 1197012 - Fix ThrowTypeError in Notification. r=mccr8 (0b1a097526)
- Bug 1197893 - Check the number of arguments for ThrowTypeError() and ThrowRangeError() at compile time. r=peterv (d98c7d78a0)
- Bug 1142083 - Add test for IDN Unicode domain redirect. r=mcmanus (0c8961fe17)
- Bug 1187159 - Add mochitest for loading packaged apps (iframe+fetch+mozapp) r=jduell (ce90ea561b)
- Bug 1186290 - Notify TabParent to switch process when loading a signed package. r=honzab, r=kanru. (c58a14554a)
- fix (15e2df75eb)
- Bug 1206124 P1 Fix "same-origin" CORS credentials in FetchDriver. r=ehsan (fae1bb6ab3)
- Bug 1206124 P2 Test fetch() with credentials and redirects. r=ehsan (ffc6254112)
- Bug 1211751: Remove nsIChannelEventSink-forwarding from EventSource and FetchDriver. It's never needed. r=smaug (adafe5737a)
- Bug 1212433 Fail fetch() calls that require preflight and also redirect. r=sicking a=abillings (c0d6742b9e)
- Bug 1193128 - Fix base64 decoding when fetching data URIs. r=baku (80bafa291a)
- Bug 1195167 part 1: Let necko handle all protocols. r=bkelly (bb932b0ada)
- Bug 1195167 part 2: Remove redundant aCORSFlag argument and instead use mCORSFlagEverSet. r=bkelly (beadafcad0)
- Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly (d00b38db9e)
- Bug 1195167 part 4: Remove FetchDriver::BasicFetch since it is empty. r=bkelly (c5ed097267)
- Bug 1210413 P2 Test CORS credentials on cross-origin redirects. r=sicking a=dveditz (b4eeb8aac0)
- Bug 1210413 P1 Propagate new channel load flags from child to parent on redirect. r=jduell a=dveditz (8b329af4fa)
- Bug 1195167 part 5: Make FetchDriver use AsyncOpen2. r=bkelly (cc217c4cc1)
- Bug 1195167 part 6: Some code simplification since necko handles fetch recursion. r=bkelly (f3b6da2262)
- Bug 1195167: Followup to fix test which I forgot to change (81e7439a2e)
- Bug 1215746: Remove RequestMode::Cors_with_forced_preflight. r=bkelly (0336e812b6)
- Bug 1211000: Move CORS preflight logic from nsCORSListenerProxy to nsCORSPreflightListener. r=ehsan (bf2f71cf22)
- missing bit of Bug 1211443 - Drop scheduled update if decoder initialization isn't done yet. r=jya (f6bc074e33)
- Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb (5af6fa7442)
- fix (e40c8e7625)
- Bug 1173811 - Part 1: Propagate the response URL to intercepted channels when necessary (non-e10s). r=mayhemer,bkelly (26f4f13c28)
- Bug 1173811 - Part 2: Propagate the response URL to intercepted channels when necessary (e10s). r=mayhemer,bkelly (a603fe1df2)
- Bug 1154309 - Add New Resource Timing Fields r=bz,hurley (1d14eb6bef)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (a5d18bb637)
- Bug 1175685 - add OriginAttribute to LoadInfo. r=jonas, r=ckerschb, r=michal (fb07d2c8aa)
- Bug 1212904 P1 Add a LoadTainting enumeration. r=jduell (a1db8a3e99)
- Bug 1212904 P2 Add LoadTainting information to nsILoadInfo. r=jduell (2482e5e334)
- Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell (aae73129b6)
- Bug 1045891 - CSP 2 child-src implementation r=ckerschb (792920aeb9)
- Bug 1219931 - CSP: Don't allow removing a policy (r=sicking) (9daaab4186)
- Bug 1208661 - Dump client-side layer textures. r=BenWa (1f2d17d515)
444 lines
15 KiB
C++
444 lines
15 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
#include "OpusTrackEncoder.h"
|
|
#include "nsString.h"
|
|
#include "GeckoProfiler.h"
|
|
|
|
#include <opus/opus.h>
|
|
|
|
#undef LOG
|
|
#ifdef MOZ_WIDGET_GONK
|
|
#include <android/log.h>
|
|
#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "MediaEncoder", ## args);
|
|
#else
|
|
#define LOG(args, ...)
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
|
|
// The Opus format supports up to 8 channels, and supports multitrack audio up
|
|
// to 255 channels, but the current implementation supports only mono and
|
|
// stereo, and downmixes any more than that.
|
|
static const int MAX_SUPPORTED_AUDIO_CHANNELS = 8;
|
|
|
|
// http://www.opus-codec.org/docs/html_api-1.0.2/group__opus__encoder.html
|
|
// In section "opus_encoder_init", channels must be 1 or 2 of input signal.
|
|
static const int MAX_CHANNELS = 2;
|
|
|
|
// A maximum data bytes for Opus to encode.
|
|
static const int MAX_DATA_BYTES = 4096;
|
|
|
|
// http://tools.ietf.org/html/draft-ietf-codec-oggopus-00#section-4
|
|
// Second paragraph, " The granule position of an audio data page is in units
|
|
// of PCM audio samples at a fixed rate of 48 kHz."
|
|
static const int kOpusSamplingRate = 48000;
|
|
|
|
// The duration of an Opus frame, and it must be 2.5, 5, 10, 20, 40 or 60 ms.
|
|
static const int kFrameDurationMs = 20;
|
|
|
|
// The supported sampling rate of input signal (Hz),
|
|
// must be one of the following. Will resampled to 48kHz otherwise.
|
|
static const int kOpusSupportedInputSamplingRates[] =
|
|
{8000, 12000, 16000, 24000, 48000};
|
|
|
|
namespace {
|
|
|
|
// An endian-neutral serialization of integers. Serializing T in little endian
|
|
// format to aOutput, where T is a 16 bits or 32 bits integer.
|
|
template<typename T>
|
|
static void
|
|
SerializeToBuffer(T aValue, nsTArray<uint8_t>* aOutput)
|
|
{
|
|
for (uint32_t i = 0; i < sizeof(T); i++) {
|
|
aOutput->AppendElement((uint8_t)(0x000000ff & (aValue >> (i * 8))));
|
|
}
|
|
}
|
|
|
|
static inline void
|
|
SerializeToBuffer(const nsCString& aComment, nsTArray<uint8_t>* aOutput)
|
|
{
|
|
// Format of serializing a string to buffer is, the length of string (32 bits,
|
|
// little endian), and the string.
|
|
SerializeToBuffer((uint32_t)(aComment.Length()), aOutput);
|
|
aOutput->AppendElements(aComment.get(), aComment.Length());
|
|
}
|
|
|
|
|
|
static void
|
|
SerializeOpusIdHeader(uint8_t aChannelCount, uint16_t aPreskip,
|
|
uint32_t aInputSampleRate, nsTArray<uint8_t>* aOutput)
|
|
{
|
|
// The magic signature, null terminator has to be stripped off from strings.
|
|
static const uint8_t magic[] = "OpusHead";
|
|
aOutput->AppendElements(magic, sizeof(magic) - 1);
|
|
|
|
// The version must always be 1 (8 bits, unsigned).
|
|
aOutput->AppendElement(1);
|
|
|
|
// Number of output channels (8 bits, unsigned).
|
|
aOutput->AppendElement(aChannelCount);
|
|
|
|
// Number of samples (at 48 kHz) to discard from the decoder output when
|
|
// starting playback (16 bits, unsigned, little endian).
|
|
SerializeToBuffer(aPreskip, aOutput);
|
|
|
|
// The sampling rate of input source (32 bits, unsigned, little endian).
|
|
SerializeToBuffer(aInputSampleRate, aOutput);
|
|
|
|
// Output gain, an encoder should set this field to zero (16 bits, signed,
|
|
// little endian).
|
|
SerializeToBuffer((int16_t)0, aOutput);
|
|
|
|
// Channel mapping family. Family 0 allows only 1 or 2 channels (8 bits,
|
|
// unsigned).
|
|
aOutput->AppendElement(0);
|
|
}
|
|
|
|
static void
|
|
SerializeOpusCommentHeader(const nsCString& aVendor,
|
|
const nsTArray<nsCString>& aComments,
|
|
nsTArray<uint8_t>* aOutput)
|
|
{
|
|
// The magic signature, null terminator has to be stripped off.
|
|
static const uint8_t magic[] = "OpusTags";
|
|
aOutput->AppendElements(magic, sizeof(magic) - 1);
|
|
|
|
// The vendor; Should append in the following order:
|
|
// vendor string length (32 bits, unsigned, little endian)
|
|
// vendor string.
|
|
SerializeToBuffer(aVendor, aOutput);
|
|
|
|
// Add comments; Should append in the following order:
|
|
// comment list length (32 bits, unsigned, little endian)
|
|
// comment #0 string length (32 bits, unsigned, little endian)
|
|
// comment #0 string
|
|
// comment #1 string length (32 bits, unsigned, little endian)
|
|
// comment #1 string ...
|
|
SerializeToBuffer((uint32_t)aComments.Length(), aOutput);
|
|
for (uint32_t i = 0; i < aComments.Length(); ++i) {
|
|
SerializeToBuffer(aComments[i], aOutput);
|
|
}
|
|
}
|
|
|
|
} // Anonymous namespace.
|
|
|
|
OpusTrackEncoder::OpusTrackEncoder()
|
|
: AudioTrackEncoder()
|
|
, mEncoder(nullptr)
|
|
, mLookahead(0)
|
|
, mResampler(nullptr)
|
|
{
|
|
}
|
|
|
|
OpusTrackEncoder::~OpusTrackEncoder()
|
|
{
|
|
if (mEncoder) {
|
|
opus_encoder_destroy(mEncoder);
|
|
}
|
|
if (mResampler) {
|
|
speex_resampler_destroy(mResampler);
|
|
mResampler = nullptr;
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
OpusTrackEncoder::Init(int aChannels, int aSamplingRate)
|
|
{
|
|
// This monitor is used to wake up other methods that are waiting for encoder
|
|
// to be completely initialized.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
NS_ENSURE_TRUE((aChannels <= MAX_SUPPORTED_AUDIO_CHANNELS) && (aChannels > 0),
|
|
NS_ERROR_FAILURE);
|
|
|
|
// This version of encoder API only support 1 or 2 channels,
|
|
// So set the mChannels less or equal 2 and
|
|
// let InterleaveTrackData downmix pcm data.
|
|
mChannels = aChannels > MAX_CHANNELS ? MAX_CHANNELS : aChannels;
|
|
|
|
// Reject non-audio sample rates.
|
|
NS_ENSURE_TRUE(aSamplingRate >= 8000, NS_ERROR_INVALID_ARG);
|
|
NS_ENSURE_TRUE(aSamplingRate <= 192000, NS_ERROR_INVALID_ARG);
|
|
|
|
// According to www.opus-codec.org, creating an opus encoder requires the
|
|
// sampling rate of source signal be one of 8000, 12000, 16000, 24000, or
|
|
// 48000. If this constraint is not satisfied, we resample the input to 48kHz.
|
|
nsTArray<int> supportedSamplingRates;
|
|
supportedSamplingRates.AppendElements(kOpusSupportedInputSamplingRates,
|
|
ArrayLength(kOpusSupportedInputSamplingRates));
|
|
if (!supportedSamplingRates.Contains(aSamplingRate)) {
|
|
int error;
|
|
mResampler = speex_resampler_init(mChannels,
|
|
aSamplingRate,
|
|
kOpusSamplingRate,
|
|
SPEEX_RESAMPLER_QUALITY_DEFAULT,
|
|
&error);
|
|
|
|
if (error != RESAMPLER_ERR_SUCCESS) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
mSamplingRate = aSamplingRate;
|
|
NS_ENSURE_TRUE(mSamplingRate > 0, NS_ERROR_FAILURE);
|
|
|
|
int error = 0;
|
|
mEncoder = opus_encoder_create(GetOutputSampleRate(), mChannels,
|
|
OPUS_APPLICATION_AUDIO, &error);
|
|
|
|
mInitialized = (error == OPUS_OK);
|
|
|
|
if (mAudioBitrate) {
|
|
opus_encoder_ctl(mEncoder, OPUS_SET_BITRATE(static_cast<int>(mAudioBitrate)));
|
|
}
|
|
|
|
mReentrantMonitor.NotifyAll();
|
|
|
|
return error == OPUS_OK ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
int
|
|
OpusTrackEncoder::GetOutputSampleRate()
|
|
{
|
|
return mResampler ? kOpusSamplingRate : mSamplingRate;
|
|
}
|
|
|
|
int
|
|
OpusTrackEncoder::GetPacketDuration()
|
|
{
|
|
return GetOutputSampleRate() * kFrameDurationMs / 1000;
|
|
}
|
|
|
|
already_AddRefed<TrackMetadataBase>
|
|
OpusTrackEncoder::GetMetadata()
|
|
{
|
|
PROFILER_LABEL("OpusTrackEncoder", "GetMetadata",
|
|
js::ProfileEntry::Category::OTHER);
|
|
{
|
|
// Wait if mEncoder is not initialized.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
while (!mCanceled && !mInitialized) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<OpusMetadata> meta = new OpusMetadata();
|
|
|
|
mLookahead = 0;
|
|
int error = opus_encoder_ctl(mEncoder, OPUS_GET_LOOKAHEAD(&mLookahead));
|
|
if (error != OPUS_OK) {
|
|
mLookahead = 0;
|
|
}
|
|
|
|
// The ogg time stamping and pre-skip is always timed at 48000.
|
|
SerializeOpusIdHeader(mChannels, mLookahead * (kOpusSamplingRate /
|
|
GetOutputSampleRate()), mSamplingRate,
|
|
&meta->mIdHeader);
|
|
|
|
nsCString vendor;
|
|
vendor.AppendASCII(opus_get_version_string());
|
|
|
|
nsTArray<nsCString> comments;
|
|
comments.AppendElement(NS_LITERAL_CSTRING("ENCODER=Mozilla" MOZ_APP_UA_VERSION));
|
|
|
|
SerializeOpusCommentHeader(vendor, comments,
|
|
&meta->mCommentHeader);
|
|
|
|
return meta.forget();
|
|
}
|
|
|
|
nsresult
|
|
OpusTrackEncoder::GetEncodedTrack(EncodedFrameContainer& aData)
|
|
{
|
|
PROFILER_LABEL("OpusTrackEncoder", "GetEncodedTrack",
|
|
js::ProfileEntry::Category::OTHER);
|
|
{
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
// Wait until initialized or cancelled.
|
|
while (!mCanceled && !mInitialized) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
if (mCanceled || mEncodingComplete) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
// calculation below depends on the truth that mInitialized is true.
|
|
MOZ_ASSERT(mInitialized);
|
|
|
|
// re-sampled frames left last time which didn't fit into an Opus packet duration.
|
|
const int framesLeft = mResampledLeftover.Length() / mChannels;
|
|
// When framesLeft is 0, (GetPacketDuration() - framesLeft) is a multiple
|
|
// of kOpusSamplingRate. There is not precision loss in the integer division
|
|
// in computing framesToFetch. If frameLeft > 0, we need to add 1 to
|
|
// framesToFetch to ensure there will be at least n frames after re-sampling.
|
|
const int frameRoundUp = framesLeft ? 1 : 0;
|
|
|
|
MOZ_ASSERT(GetPacketDuration() >= framesLeft);
|
|
// Try to fetch m frames such that there will be n frames
|
|
// where (n + frameLeft) >= GetPacketDuration() after re-sampling.
|
|
const int framesToFetch = !mResampler ? GetPacketDuration()
|
|
: (GetPacketDuration() - framesLeft) * mSamplingRate / kOpusSamplingRate
|
|
+ frameRoundUp;
|
|
{
|
|
// Move all the samples from mRawSegment to mSourceSegment. We only hold
|
|
// the monitor in this block.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
// Wait until enough raw data, end of stream or cancelled.
|
|
while (!mCanceled && mRawSegment.GetDuration() +
|
|
mSourceSegment.GetDuration() < framesToFetch &&
|
|
!mEndOfStream) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
mSourceSegment.AppendFrom(&mRawSegment);
|
|
|
|
// Pad |mLookahead| samples to the end of source stream to prevent lost of
|
|
// original data, the pcm duration will be calculated at rate 48K later.
|
|
if (mEndOfStream && !mEosSetInEncoder) {
|
|
mEosSetInEncoder = true;
|
|
mSourceSegment.AppendNullData(mLookahead);
|
|
}
|
|
}
|
|
|
|
// Start encoding data.
|
|
nsAutoTArray<AudioDataValue, 9600> pcm;
|
|
pcm.SetLength(GetPacketDuration() * mChannels);
|
|
AudioSegment::ChunkIterator iter(mSourceSegment);
|
|
int frameCopied = 0;
|
|
|
|
while (!iter.IsEnded() && frameCopied < framesToFetch) {
|
|
AudioChunk chunk = *iter;
|
|
|
|
// Chunk to the required frame size.
|
|
int frameToCopy = chunk.GetDuration();
|
|
if (frameCopied + frameToCopy > framesToFetch) {
|
|
frameToCopy = framesToFetch - frameCopied;
|
|
}
|
|
|
|
if (!chunk.IsNull()) {
|
|
// Append the interleaved data to the end of pcm buffer.
|
|
AudioTrackEncoder::InterleaveTrackData(chunk, frameToCopy, mChannels,
|
|
pcm.Elements() + frameCopied * mChannels);
|
|
} else {
|
|
memset(pcm.Elements() + frameCopied * mChannels, 0,
|
|
frameToCopy * mChannels * sizeof(AudioDataValue));
|
|
}
|
|
|
|
frameCopied += frameToCopy;
|
|
iter.Next();
|
|
}
|
|
|
|
RefPtr<EncodedFrame> audiodata = new EncodedFrame();
|
|
audiodata->SetFrameType(EncodedFrame::OPUS_AUDIO_FRAME);
|
|
int framesInPCM = frameCopied;
|
|
if (mResampler) {
|
|
nsAutoTArray<AudioDataValue, 9600> resamplingDest;
|
|
// We want to consume all the input data, so we slightly oversize the
|
|
// resampled data buffer so we can fit the output data in. We cannot really
|
|
// predict the output frame count at each call.
|
|
uint32_t outframes = frameCopied * kOpusSamplingRate / mSamplingRate + 1;
|
|
uint32_t inframes = frameCopied;
|
|
|
|
resamplingDest.SetLength(outframes * mChannels);
|
|
|
|
#if MOZ_SAMPLE_TYPE_S16
|
|
short* in = reinterpret_cast<short*>(pcm.Elements());
|
|
short* out = reinterpret_cast<short*>(resamplingDest.Elements());
|
|
speex_resampler_process_interleaved_int(mResampler, in, &inframes,
|
|
out, &outframes);
|
|
#else
|
|
float* in = reinterpret_cast<float*>(pcm.Elements());
|
|
float* out = reinterpret_cast<float*>(resamplingDest.Elements());
|
|
speex_resampler_process_interleaved_float(mResampler, in, &inframes,
|
|
out, &outframes);
|
|
#endif
|
|
|
|
MOZ_ASSERT(pcm.Length() >= mResampledLeftover.Length());
|
|
PodCopy(pcm.Elements(), mResampledLeftover.Elements(),
|
|
mResampledLeftover.Length());
|
|
|
|
uint32_t outframesToCopy = std::min(outframes,
|
|
static_cast<uint32_t>(GetPacketDuration() - framesLeft));
|
|
|
|
MOZ_ASSERT(pcm.Length() - mResampledLeftover.Length() >=
|
|
outframesToCopy * mChannels);
|
|
PodCopy(pcm.Elements() + mResampledLeftover.Length(),
|
|
resamplingDest.Elements(), outframesToCopy * mChannels);
|
|
int frameLeftover = outframes - outframesToCopy;
|
|
mResampledLeftover.SetLength(frameLeftover * mChannels);
|
|
PodCopy(mResampledLeftover.Elements(),
|
|
resamplingDest.Elements() + outframesToCopy * mChannels,
|
|
mResampledLeftover.Length());
|
|
// This is always at 48000Hz.
|
|
framesInPCM = framesLeft + outframesToCopy;
|
|
audiodata->SetDuration(framesInPCM);
|
|
} else {
|
|
// The ogg time stamping and pre-skip is always timed at 48000.
|
|
audiodata->SetDuration(frameCopied * (kOpusSamplingRate / mSamplingRate));
|
|
}
|
|
|
|
// Remove the raw data which has been pulled to pcm buffer.
|
|
// The value of frameCopied should equal to (or smaller than, if eos)
|
|
// GetPacketDuration().
|
|
mSourceSegment.RemoveLeading(frameCopied);
|
|
|
|
// Has reached the end of input stream and all queued data has pulled for
|
|
// encoding.
|
|
if (mSourceSegment.GetDuration() == 0 && mEndOfStream) {
|
|
mEncodingComplete = true;
|
|
LOG("[Opus] Done encoding.");
|
|
}
|
|
|
|
MOZ_ASSERT(mEndOfStream || framesInPCM == GetPacketDuration());
|
|
|
|
// Append null data to pcm buffer if the leftover data is not enough for
|
|
// opus encoder.
|
|
if (framesInPCM < GetPacketDuration() && mEndOfStream) {
|
|
PodZero(pcm.Elements() + framesInPCM * mChannels,
|
|
(GetPacketDuration() - framesInPCM) * mChannels);
|
|
}
|
|
nsTArray<uint8_t> frameData;
|
|
// Encode the data with Opus Encoder.
|
|
frameData.SetLength(MAX_DATA_BYTES);
|
|
// result is returned as opus error code if it is negative.
|
|
int result = 0;
|
|
#ifdef MOZ_SAMPLE_TYPE_S16
|
|
const opus_int16* pcmBuf = static_cast<opus_int16*>(pcm.Elements());
|
|
result = opus_encode(mEncoder, pcmBuf, GetPacketDuration(),
|
|
frameData.Elements(), MAX_DATA_BYTES);
|
|
#else
|
|
const float* pcmBuf = static_cast<float*>(pcm.Elements());
|
|
result = opus_encode_float(mEncoder, pcmBuf, GetPacketDuration(),
|
|
frameData.Elements(), MAX_DATA_BYTES);
|
|
#endif
|
|
frameData.SetLength(result >= 0 ? result : 0);
|
|
|
|
if (result < 0) {
|
|
LOG("[Opus] Fail to encode data! Result: %s.", opus_strerror(result));
|
|
}
|
|
if (mEncodingComplete) {
|
|
if (mResampler) {
|
|
speex_resampler_destroy(mResampler);
|
|
mResampler = nullptr;
|
|
}
|
|
mResampledLeftover.SetLength(0);
|
|
}
|
|
|
|
audiodata->SwapInFrameData(frameData);
|
|
aData.AppendEncodedFrame(audiodata);
|
|
return result >= 0 ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
} // namespace mozilla
|