mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:11:03 +00:00
147c5fa2eb
- Bug 1150437 - Make gmp-clearkey consistently Apache2 licensed. r=edwin,jwwang,kentuckyfriedtakahe (3c954c73dd) - Bug 1223486 - Ensure WrapTexCoord returns 0.0 instead of 1.0 when given a negative whole number. r=Bas (b4af8eb524) - Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin (03359c7730) - Bug 1206763 - Enable SkiaGL canvas on gonk r=mattwoodrow (1588079b23) - Decouple CairoImage from ImageContainer. (bug 1222910, r=roc) (a93a4dad82) - Decouple D3D11ShareHandleImage from ImageContainer. (bug 1222910, r=mattwoodrow) (9642ef1c53) - Bug 1194753 - Wait longer when decoding the first frame of D3D9 DXVA video before deciding it is invalid. r=cpearce (865fe1d2f3) - Decouple D3D9SurfaceImage from ImageContainer. (bug 1222910, r=mattwoodrow) (55bc5abffc) - Bug 1191534 - Implement BlitImageToFramebuffer for IOSurface. r=jgilbert (0da6aff77f) - Decouple EGLImageImage from ImageContainer. (bug 1222910, r=snorp) (cffb7aadcb) - Decouple SurfaceTextureImage from ImageContainer. (bug 1222910, r=snorp) (5b920014d0) - Decouple MacIOSurfaceImage from ImageContainer. (bug 1222910, r=mstange) (ffab69155c) - Decouple SharedRGBImage and PlanarYCbCrImage from ImageContainer. (bug 1222910, r=mattwoodrow) (a9f6e23788) - Remove Gonk usage of ImageContainer::CreateImage. (bug 1222910, r=sotaro) (3f460b901d) - Remove CreateImage() from ImageContainer, ImageFactory, and ImageClient. (bug 1222910, r=roc) (873d5d5e47) - Bug 1212795: P1. Ensure the check if HW acceleration is allowed is performed on the main thread. r=jwwang (7cac257e5a) - Bug 1137529: Prefer Apple's VDA hardware acceleration for Hi-Def videos. r=rillian (a3ffc48e5e) - Bug 1212795: P2. Ensure all frameworks required for video decoding on mac are loaded. r=jwwang (b903b94c60) - Bug 1212795: P3. Make AppleDecoderModule detects if the required modules are loaded. r=jwwang (fb132e36b0) - Bug 1221991 - [1.3] Make SupportsMimeType a const function. r=jya (2450030808) - Bug 1221991 - [2.3] Split DecoderLoop into functions, simplify decoding state and clean up style. r=snorp (7c0e665cf7) - Bug 1221991 - [3.1] Manage module state via accessor functions. r=snorp (491b00f74b) - Bug 1221991 - [4.2] Add AndroidDecoderModule logging. r=snorp (7213505016) - Bug 1153110: Don't prefer VDA for 720p and above. r=rillian (50d5fbfa7c) - remove PR_LOGGING (44f4efbaa2) - Bug 1169653 - Limit use of the speech recognition API in JS to certified apps or apps with the proper flags set. r=smaug (c93a8949b8) - Bug 1133633: Part2. Enable async decoding on mac. r=mattmoodrow (c9740168bd) - Bug 1154896: Report decoding errors back to MP4Reader. r=rillian (26291f72e1) - Bug 1154896: Part2. Ignore kVTDecodeInfo_FrameDropped flag. r=rillian (bfca4c264e) - Bug 1198094: P1. Limit rate at which InputExhausted could be called by mac decoder. r=rillian (e5819c1666) - Bug 1214678 - Allow Apple media decoders to work on iOS r=jya (c475eff0be) - Bug 1219140 - Remove AskMediaCodecAndWait() r=bwu (dbe8d364ec) - fix includes (432c3419b0) - adapted Bug 1159509 - Support audio AMR-NB for Gonk in MP4Reader. r=jya (adaddc5c21) - Bug 1154512 - Remove MediaTaskQueue::SyncDispatch() from PDM. r=cpearce (5bddd082bd) - Bug 1204622 - release codec listener at reader task queue. r=jya (72b062b5d7) - Bug 1097498 - Wait fence for the graphic buffer. r=sotaro (c72f301939) - Bug 1198664 - Refactor: move common behaviors to base class. r=bwu,jya (a754813c5b) - Bug 1198664 - Use looper to process decoder tasks. r=bwu (768315de13) - Bug 1174721 - Use AudioCompactor for GonkAudioDecoderManager. r=sotaro (768e68c946) - Bug 1199809 - Refactor: use RAII to help manage output buffer lifecycle. r=sotaro (9a6e0dceb7) - Bug 1133955 - Record the last seek time to decide the direction to seek. r=sotaro (d0bcdbe68b) - Bug 1210045 - Fix GonkVideoDecoderManager shutdown during initialization r=bwu (b379248ff1) - Bug 1214997 - Use MozPromise in MediaCodecProxy and OMXCodecProxy r=bwu (ab9a92d640) - Bug 1199809 - Make a copy of output buffer after flush(). r=sotaro (17465ecaea) - Bug 1216895 - assert that decoder methods are run on correct thread. r=jya (b8c106c2ca) - Bug 1185018 - Part 1 of 1 - Made speech recognition services language dependent and removed assumption of a single service. r=smaug (f83acf82b4) - Bug 1207416: Add Telemetry for time spent in different Load states in WebRTC r=gcp (e3959b6760) - Bug 1219480 - Replace PRLogModuleInfo with LazyLogModule in the media directory. r=rillian (a9b13ef334) - Bug 1196558: Don't assert should output task not be dispatched. r=edwin (a2569bca73) - Bug 1199193: Ensure DrainComplete() is called once all decoded frames have been output. r=rillian (760fb42753) - Bug 1079621 - Change non-fatal errors to warnings. r=rillian (20c85e7e56) - Bug 1185234 - Implement SpeechRecognition::interimResults. r=smaug (b3d635d8c0) - Bug 1171850 - Remove 'models' dir from MODELSPS_DEST as the dir 'models' now comes from MODELSPS_FILES. r=gps (5515511e3a) - Bug 1183503 - Rename model and dictionary files for recognition in preparation for localization. r=smaug (32c78610af) - Bug 1185235 - Implement SpeechRecognition::maxAlternatives. r=smaug (91eac7f30f) - Bug 1177514 - Remove final text of 'ERROR' on recognition error, should be signaled by SpeechRecognitionError. r=smaug (c8d7b198e0) - Bug 1187791 - Part 1 of 1 - SpeechRecognition::maxAlternatives can't throw; so, rm webidl throws specifier. r=smaug (e295b2bde5) - Bug 1213131: [vpx] Configure libvpx decoder to use multi-threads decoding. r=kentuckyfriedtakahe (f38ba0ef82) - Bug 1206845: Prevent overflows in MediaCache. r=roc (e8a228dcd3) - Bug 1205825 - part 1 - don't reacquire the media cache's monitor in MediaCacheStream::FlushPartialBlockInternal; r=roc (6342592be3) - Bug 1205825 - part 2 - call Get*CachedData*Internal variants from MediaCacheStream::GetCachedRanges; r=roc (f229c8f757)
214 lines
6.0 KiB
C++
214 lines
6.0 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "SourceBufferResource.h"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "nsISeekableStream.h"
|
|
#include "nsISupports.h"
|
|
#include "mozilla/Logging.h"
|
|
#include "MediaData.h"
|
|
|
|
mozilla::LogModule* GetSourceBufferResourceLog()
|
|
{
|
|
static mozilla::LazyLogModule sLogModule("SourceBufferResource");
|
|
return sLogModule;
|
|
}
|
|
|
|
#define SBR_DEBUG(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), mozilla::LogLevel::Debug, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
|
|
#define SBR_DEBUGV(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), mozilla::LogLevel::Verbose, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
|
|
|
|
namespace mozilla {
|
|
|
|
nsresult
|
|
SourceBufferResource::Close()
|
|
{
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
SBR_DEBUG("Close");
|
|
//MOZ_ASSERT(!mClosed);
|
|
mClosed = true;
|
|
mon.NotifyAll();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SourceBufferResource::ReadInternal(char* aBuffer, uint32_t aCount, uint32_t* aBytes, bool aMayBlock)
|
|
{
|
|
mMonitor.AssertCurrentThreadIn();
|
|
MOZ_ASSERT_IF(!aMayBlock, aBytes);
|
|
|
|
// Cache the offset for the read in case mOffset changes while waiting on the
|
|
// monitor below. It's basically impossible to implement these API semantics
|
|
// sanely. :-(
|
|
uint64_t readOffset = mOffset;
|
|
|
|
while (aMayBlock &&
|
|
!mEnded &&
|
|
readOffset + aCount > static_cast<uint64_t>(GetLength())) {
|
|
SBR_DEBUGV("waiting for data");
|
|
mMonitor.Wait();
|
|
// The callers of this function should have checked this, but it's
|
|
// possible that we had an eviction while waiting on the monitor.
|
|
if (readOffset < mInputBuffer.GetOffset()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
uint32_t available = GetLength() - readOffset;
|
|
uint32_t count = std::min(aCount, available);
|
|
SBR_DEBUGV("readOffset=%llu GetLength()=%u available=%u count=%u mEnded=%d",
|
|
readOffset, GetLength(), available, count, mEnded);
|
|
if (available == 0) {
|
|
SBR_DEBUGV("reached EOF");
|
|
*aBytes = 0;
|
|
return NS_OK;
|
|
}
|
|
|
|
mInputBuffer.CopyData(readOffset, count, aBuffer);
|
|
*aBytes = count;
|
|
|
|
// From IRC:
|
|
// <@cpearce>bholley: *this* is why there should only every be a ReadAt() and
|
|
// no Read() on a Stream abstraction! there's no good answer, they all suck.
|
|
mOffset = readOffset + count;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SourceBufferResource::ReadAt(int64_t aOffset, char* aBuffer, uint32_t aCount, uint32_t* aBytes)
|
|
{
|
|
SBR_DEBUG("ReadAt(aOffset=%lld, aBuffer=%p, aCount=%u, aBytes=%p)",
|
|
aOffset, aBytes, aCount, aBytes);
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
return ReadAtInternal(aOffset, aBuffer, aCount, aBytes, /* aMayBlock = */ true);
|
|
}
|
|
|
|
nsresult
|
|
SourceBufferResource::ReadAtInternal(int64_t aOffset, char* aBuffer, uint32_t aCount, uint32_t* aBytes,
|
|
bool aMayBlock)
|
|
{
|
|
mMonitor.AssertCurrentThreadIn();
|
|
nsresult rv = SeekInternal(aOffset);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
return ReadInternal(aBuffer, aCount, aBytes, aMayBlock);
|
|
}
|
|
|
|
nsresult
|
|
SourceBufferResource::SeekInternal(int64_t aOffset)
|
|
{
|
|
mMonitor.AssertCurrentThreadIn();
|
|
|
|
if (mClosed ||
|
|
aOffset < 0 ||
|
|
uint64_t(aOffset) < mInputBuffer.GetOffset() ||
|
|
aOffset > GetLength()) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
mOffset = aOffset;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SourceBufferResource::ReadFromCache(char* aBuffer, int64_t aOffset, uint32_t aCount)
|
|
{
|
|
SBR_DEBUG("ReadFromCache(aBuffer=%p, aOffset=%lld, aCount=%u)",
|
|
aBuffer, aOffset, aCount);
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
uint32_t bytesRead;
|
|
int64_t oldOffset = mOffset;
|
|
nsresult rv = ReadAtInternal(aOffset, aBuffer, aCount, &bytesRead, /* aMayBlock = */ false);
|
|
mOffset = oldOffset; // ReadFromCache isn't supposed to affect the seek position.
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// ReadFromCache return failure if not all the data is cached.
|
|
return bytesRead == aCount ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
uint32_t
|
|
SourceBufferResource::EvictData(uint64_t aPlaybackOffset, uint32_t aThreshold,
|
|
ErrorResult& aRv)
|
|
{
|
|
SBR_DEBUG("EvictData(aPlaybackOffset=%llu,"
|
|
"aThreshold=%u)", aPlaybackOffset, aThreshold);
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
uint32_t result = mInputBuffer.Evict(aPlaybackOffset, aThreshold, aRv);
|
|
if (result > 0) {
|
|
// Wake up any waiting threads in case a ReadInternal call
|
|
// is now invalid.
|
|
mon.NotifyAll();
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void
|
|
SourceBufferResource::EvictBefore(uint64_t aOffset, ErrorResult& aRv)
|
|
{
|
|
SBR_DEBUG("EvictBefore(aOffset=%llu)", aOffset);
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
// If aOffset is past the current playback offset we don't evict.
|
|
if (aOffset < mOffset) {
|
|
mInputBuffer.EvictBefore(aOffset, aRv);
|
|
}
|
|
// Wake up any waiting threads in case a ReadInternal call
|
|
// is now invalid.
|
|
mon.NotifyAll();
|
|
}
|
|
|
|
uint32_t
|
|
SourceBufferResource::EvictAll()
|
|
{
|
|
SBR_DEBUG("EvictAll()");
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
return mInputBuffer.EvictAll();
|
|
}
|
|
|
|
void
|
|
SourceBufferResource::AppendData(MediaByteBuffer* aData)
|
|
{
|
|
SBR_DEBUG("AppendData(aData=%p, aLength=%u)",
|
|
aData->Elements(), aData->Length());
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
mInputBuffer.AppendItem(aData);
|
|
mEnded = false;
|
|
mon.NotifyAll();
|
|
}
|
|
|
|
void
|
|
SourceBufferResource::Ended()
|
|
{
|
|
SBR_DEBUG("");
|
|
ReentrantMonitorAutoEnter mon(mMonitor);
|
|
mEnded = true;
|
|
mon.NotifyAll();
|
|
}
|
|
|
|
SourceBufferResource::~SourceBufferResource()
|
|
{
|
|
SBR_DEBUG("");
|
|
MOZ_COUNT_DTOR(SourceBufferResource);
|
|
}
|
|
|
|
SourceBufferResource::SourceBufferResource(const nsACString& aType)
|
|
: mType(aType)
|
|
, mMonitor("mozilla::SourceBufferResource::mMonitor")
|
|
, mOffset(0)
|
|
, mClosed(false)
|
|
, mEnded(false)
|
|
{
|
|
SBR_DEBUG("");
|
|
MOZ_COUNT_CTOR(SourceBufferResource);
|
|
}
|
|
|
|
#undef SBR_DEBUG
|
|
#undef SBR_DEBUGV
|
|
} // namespace mozilla
|