mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
605fde2bb1
- Bug 1236120: [ffmpeg] Use demuxed dimensions to determine picture size and offset. r=gerald (f336c84d0d) - Bug 851530: Part 1 - Added support for decoding uLaw and aLaw enconded wave files. r=jya (72683b69f2) - Bug 851530: Part 2 - Added test cases for uLaw and aLaw wave files. r=jya (ddf431bd28) - Bug 524109 - Added support for 24 bit wav files. r=cpearce (ebfac16a20) - Bug 864780 - Changed handling of the format chunk to skip any extension. r=cpearce (40903839a8) - Bug 1229742: P1. Only clear EOS flag if we have new data. r=gerald (83e69375e4) - Bug 1229742: P2. Don't reject data promise if new data is pending. r=gerald (89d8222809) - Bug 1237809: P2. Detect change of display size. r=cpearce (ec529e2732) - Bug 1237809: [h264] P1. Ensure correct video dimensions are passed to the decoder. r=cpearce (eb241cad10) - Bug 1237809: P3. Ensure element dimensions are up to date. r=jwwang (541e6e74d7) - Bug 1244639: P1. Don't assume MP3 decoding always starts at 0. r=cpearce (b62c27bd04) - Bug 1244639: P2. Don't clamp audio time to seek time if there's no video track. r=cpearce (4720bacc24) - Bug 1205927 - Part 1: [MediaEncoder] Support *.3g2 with EVRC audio format. r=ayang (bbd8aff9d9) - Bug 1205927 - Part 2: Add audio-capture:3gpp2 perimission for certificated and privileged application. r=ayang (63b337e2ab) - Bug 1198157 - Call |NotifyEndOfStream| if the encoder can't been initialized after 30 seconds. r=jwwang (2c21203d36) - minor NL (14d757753b) - Bug 1182426 - Add some asserts to VP8TrackEncoder for sanity. r=roc (79ff4869ca) - Bug 1154213 - Handle timestamps of video/webm vorbis track encoding. r=mreavy, r=rjesup (a9897e4873) - Bug 1137151: Marked destructor of |MuxerOperation| as protected, r=sotaro (94fdcf6457) - Bug 1210232 - Let MP4Decoder handle 3GPP files on B2G. r=cpearce (95a77023ad) - Bug 1227790 - Update GMP API to include new MediaKeyStatus types. r=jwwang (1a6933f2df) - bits of Bug 1186375 - Add GMP EME (6b99660146) - Bug 1221825: Fix logging arguments. r=cpearce (5261e34713) - Bug 1244442 - Warn about Proxy.create and Proxy.createFunction. r=Waldo (718aa94f5b) - fix spaces (720e2114f7) - re-apply Bug 1231224 part 7 - Fix some more places to handle OOM. r=jonco (a4af46894b) - Bug 1246122 - Don't crash in InvokeInterruptCallback if there are no JS scripts on the stack. r=shu (9702df89bc) - Bug 1246607: Recover from OOM in AddClearDefiniteGetterSetterForPrototypeChain; r=jandem (d83c6c6c9b) - Bug 1236546 - Don't deoptimize in ObjectGroup::defaultNewGroup when we have a null proto. r=bhackett (1c2ecc3d09) - Bug 1249588 - Remove unnecessary type information from RegExpObject. r=jandem (9126e17d94) - Bug 1245965 - Fix an OOM in ObjectGroup::newPlainObject; r=till (5192c25b53) - Bug 1240527: Fix tracing of RegExpStaticsObject; r=nbp (b37f2167a5) - Bug 1248094 - Followup to fix a typo; r=fitzgen (8afec429d9) - Bug 1248726 - Simplify PCLocationMap even further; r=fitzgen (39f0b54a04) - Bug 1241311 - Pre-tenure SavedFrame objects. r=terrence (b703f3d78e) - Bug 1241249 - Add an SPS pseudo entry for JS stack capturing; r=shu (c2ae4ee5c2) - Bug 1247299 - Force SavedFrame columns to be 0 in JS_MORE_DETERMINISTIC builds; r=sfink (09b9038448) - Bug 1241701 - Add about:memory reporting for js::SavedStacks::pcLocationMap. r=njn (b663d911fc) - Bug 1166234 - Throw on accessing optimized out values when using Debugger.Frame.prototype.eval. (r=jimb) (19b43b137b) - Bug 1232655 - Fix DebugScopeProxy::has to not lookup .this on non-function scopes. r=shu (3959e98752) - Bug 1216261 - Fix OOM handling of DebugScopes. (r=jonco) (0f8b856ee6) - reorder after mispatch (c292050275) - Bug 1235656 - Followup: Allow extended functions with guessed atoms in self-hosted code. (rs=arai) (a67286cd52) - Bug 1245048: Check call to GetPrototype; r=till (35dbbdc025) - Bug 1132630 - Renumber steps in Function.prototype.bind. r=till (9f11a5a086) - Bug 1246131 - Provide 'dbg(msg)' debug printing utility function for self-hosted code. r=jandem (f436eeb481) - Bug 1246131 - Part 2: Let opt builds compile again, even on a CLOSED TREE. r=bustage (8483b77541) - Bug 1247934 - Handle receiving unboxed exports array from self hosted module code r=shu (fb9c296909) - Bug 1246134 - Fix loading of external self-hosted JS using MOZ_SELFHOSTEDJS. r=efaust (c96059b40a) - Bug 1220502 - ignore not visible text nodes for tree update, r=tbsaunde, roc (eed078abc6) - Bug 1242989 - keep content insertions in a hash, r=tbsaunde (d58fc948a6) - bug 1228400 - null check tabChild before notifying the parent process about new child documents r=davidb (09512e6287) - Bug 1239051 - Labels should expose labeled controllers action. r=tbsaunde (c0d4d801a9) - bug 1243077 - make xpcAccessible::GetFirstChild() work with proxies r=davidb (f539fafe93) - bug 1243077 - make xpcAccessible::GetLastChild() work with proxied accessibles r=davidb (13716f7cc0) - bug 1243077 - implement xpcAccessible::GetChildCount() for proxied accessibles (b8f4598834) - bug 1243077 - make xpcAccessible::GetChildAt() work with proxied accessibles r=davidb (cce0924f7b) - bug 1243077 - make xpcAccessible::GetChildren() work with proxied accessibles r=davidb (a9ec2b1588) - bug 1243077 - remove an unnecessary AddRef() from xpcAccessible::GetChildren() (89a58ac2e0) - bug 1243077 - support proxied accessibles in xpcAccessible::GetRole() r=davidb (2d2a2926c7) - Bug 1246768 - part 1: argument conversion for Atomics.isLockFree in runtime. r=bbouvier (17f3498b84) - Bug 1246750 - fix argument ordering to futexWakeOrRequeue + test cases. r=bbouvier (31825e7096) - Bug 1238911 - initialize canWait with false from constructor, avoid using the variable without initialization. r=lhansen (f4657b3950) - Bug 1235373 - Add an assert to check validity of pointers: mElement->GetPrimaryFrame() and frame. r=surkov (18023f9238) - Bug 1241534 - Use TraceRoot for InterpreterFrame fields. r=terrence (98996dc497) - Bug 1246112 - Fix a bogus assert in InterpreterFrame::initExecuteFrame. r=su (2093ba8a44) - Bug 1243241 - Make RDTSC monotonic. r=jandem (1450a97a94) - Bug 1243242 - Don't make structured cloning O(n**2) in the size of the transferables array. r=sfink (aa38dee282)
186 lines
4.9 KiB
C++
186 lines
4.9 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* 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 "WAVDecoder.h"
|
|
#include "AudioSampleFormat.h"
|
|
#include "nsAutoPtr.h"
|
|
|
|
using mp4_demuxer::ByteReader;
|
|
|
|
namespace mozilla {
|
|
|
|
int16_t
|
|
DecodeALawSample(uint8_t aValue)
|
|
{
|
|
aValue = aValue ^ 0x55;
|
|
int8_t sign = (aValue & 0x80) ? -1 : 1;
|
|
uint8_t exponent = (aValue & 0x70) >> 4;
|
|
uint8_t mantissa = aValue & 0x0F;
|
|
int16_t sample = mantissa << 4;
|
|
switch (exponent) {
|
|
case 0:
|
|
sample += 8;
|
|
break;
|
|
case 1:
|
|
sample += 0x108;
|
|
break;
|
|
default:
|
|
sample += 0x108;
|
|
sample <<= exponent - 1;
|
|
}
|
|
return sign * sample;
|
|
}
|
|
|
|
int16_t
|
|
DecodeULawSample(uint8_t aValue)
|
|
{
|
|
aValue = aValue ^ 0xFF;
|
|
int8_t sign = (aValue & 0x80) ? -1 : 1;
|
|
uint8_t exponent = (aValue & 0x70) >> 4;
|
|
uint8_t mantissa = aValue & 0x0F;
|
|
int16_t sample = (33 + 2 * mantissa) * (2 << (exponent + 1)) - 33;
|
|
return sign * sample;
|
|
}
|
|
|
|
WaveDataDecoder::WaveDataDecoder(const AudioInfo& aConfig,
|
|
FlushableTaskQueue* aTaskQueue,
|
|
MediaDataDecoderCallback* aCallback)
|
|
: mInfo(aConfig)
|
|
, mTaskQueue(aTaskQueue)
|
|
, mCallback(aCallback)
|
|
, mFrames(0)
|
|
{
|
|
}
|
|
|
|
nsresult
|
|
WaveDataDecoder::Shutdown()
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<MediaDataDecoder::InitPromise>
|
|
WaveDataDecoder::Init()
|
|
{
|
|
return InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__);
|
|
}
|
|
|
|
nsresult
|
|
WaveDataDecoder::Input(MediaRawData* aSample)
|
|
{
|
|
nsCOMPtr<nsIRunnable> runnable(
|
|
NS_NewRunnableMethodWithArg<RefPtr<MediaRawData>>(
|
|
this, &WaveDataDecoder::Decode,
|
|
RefPtr<MediaRawData>(aSample)));
|
|
mTaskQueue->Dispatch(runnable.forget());
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
WaveDataDecoder::Decode(MediaRawData* aSample)
|
|
{
|
|
if (!DoDecode(aSample)) {
|
|
mCallback->Error();
|
|
} else if (mTaskQueue->IsEmpty()) {
|
|
mCallback->InputExhausted();
|
|
}
|
|
}
|
|
|
|
bool
|
|
WaveDataDecoder::DoDecode(MediaRawData* aSample)
|
|
{
|
|
size_t aLength = aSample->Size();
|
|
ByteReader aReader = ByteReader(aSample->Data(), aLength);
|
|
int64_t aOffset = aSample->mOffset;
|
|
uint64_t aTstampUsecs = aSample->mTime;
|
|
|
|
int32_t frames = aLength * 8 / mInfo.mBitDepth / mInfo.mChannels;
|
|
|
|
auto buffer = MakeUnique<AudioDataValue[]>(frames * mInfo.mChannels);
|
|
for (int i = 0; i < frames; ++i) {
|
|
for (unsigned int j = 0; j < mInfo.mChannels; ++j) {
|
|
if (mInfo.mProfile == 6) { //ALAW Data
|
|
uint8_t v = aReader.ReadU8();
|
|
int16_t decoded = DecodeALawSample(v);
|
|
buffer[i * mInfo.mChannels + j] =
|
|
IntegerToAudioSample<AudioDataValue>(decoded);
|
|
} else if (mInfo.mProfile == 7) { //ULAW Data
|
|
uint8_t v = aReader.ReadU8();
|
|
int16_t decoded = DecodeULawSample(v);
|
|
buffer[i * mInfo.mChannels + j] =
|
|
IntegerToAudioSample<AudioDataValue>(decoded);
|
|
} else { //PCM Data
|
|
if (mInfo.mBitDepth == 8) {
|
|
uint8_t v = aReader.ReadU8();
|
|
buffer[i * mInfo.mChannels + j] =
|
|
UInt8bitToAudioSample<AudioDataValue>(v);
|
|
} else if (mInfo.mBitDepth == 16) {
|
|
int16_t v = aReader.ReadLE16();
|
|
buffer[i * mInfo.mChannels + j] =
|
|
IntegerToAudioSample<AudioDataValue>(v);
|
|
} else if (mInfo.mBitDepth == 24) {
|
|
int32_t v = aReader.ReadLE24();
|
|
buffer[i * mInfo.mChannels + j] =
|
|
Int24bitToAudioSample<AudioDataValue>(v);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
aReader.DiscardRemaining();
|
|
|
|
int64_t duration = frames / mInfo.mRate;
|
|
|
|
mCallback->Output(new AudioData(aOffset,
|
|
aTstampUsecs,
|
|
duration,
|
|
frames,
|
|
Move(buffer),
|
|
mInfo.mChannels,
|
|
mInfo.mRate));
|
|
mFrames += frames;
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
WaveDataDecoder::DoDrain()
|
|
{
|
|
mCallback->DrainComplete();
|
|
}
|
|
|
|
nsresult
|
|
WaveDataDecoder::Drain()
|
|
{
|
|
nsCOMPtr<nsIRunnable> runnable(
|
|
NS_NewRunnableMethod(this, &WaveDataDecoder::DoDrain));
|
|
mTaskQueue->Dispatch(runnable.forget());
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
WaveDataDecoder::Flush()
|
|
{
|
|
mTaskQueue->Flush();
|
|
mFrames = 0;
|
|
return NS_OK;
|
|
}
|
|
|
|
/* static */
|
|
bool
|
|
WaveDataDecoder::IsWave(const nsACString& aMimeType)
|
|
{
|
|
// Some WebAudio uses "audio/x-wav",
|
|
// WAVdemuxer uses "audio/wave; codecs=aNum".
|
|
return aMimeType.EqualsLiteral("audio/x-wav") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=1") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=6") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=7") ||
|
|
aMimeType.EqualsLiteral("audio/wave; codecs=65534");
|
|
}
|
|
|
|
} // namespace mozilla
|
|
#undef LOG |