mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 18:18:27 +00:00
4ded173333
- Bug 1204419: P1. Fix webm headers. r=kinetik (c1ea10947) - Bug 1184002: Add about:media plugin support with new MSE. r=cpearce (fb3082eb0) - Bug 1186257 - Add missing mediasource includes. r=jya Add missing includes, forward declarations, and fix up namespace references so dom/media/mediasource compiles in a non-unified build. (2c1b8a854) - Bug 1204419: P2. Remove old MediaSource implementation. r=cpearce (6096661f6) - Bug 1204419: P3. Remove now unused MediaDecoderReader functions. r=cpearce (4e6559178) - partial Bug 1190897 - Add MP3Demuxer logging. r=kinetik (fd968e13d) - Bug 1190238: P1. Remove MediaResource::Read/Seek. r=cpearce This functionality is now replaced with a dedicated new MediaResourceIndex class. This allows for concurrent Read/Seek use of the MediaResource without having side effects. (a70d55a8e) - Bug 1190238: P2. Have MediaResourceIndex::ReadAt() only stop early when reaching EOS or error. r=cpearce (e982980df) - Bug 1190238: P3. Do not loop calling MediaResource::Read or ReadAt, let MediaResourceIndex do it for us. r=cpearce (4e6ea1da2) - Bug 1196591: Initialize member. r=me Small correction introduced in bug 1190238 (97c73437f) - Bug 1191813: [mp3] P1. Avoid false positive EOS detection. r=esawin We do so by using blocking reads via the MediaSourceIndex::ReadAt convenience method. (bf5286b47) - Bug 1204419: P4. Remove MediaDataDemuxer API no longer used. r=cpearce (4bc26d7ac) - Bug 1204419: P5. Remove no longer used prefs. r=cpearce (99989669d) - Bug 1193603. Part 1 - Fix indentation and include order. r=jya. (6b4add1df) - Bug 1193603. Part 2 - Fix miscalculation in converting micro seconds to seconds. r=jya. (7d2fb63b9) - Bug 1193117. Add an exclusive mode to allow at most one listener. r=kinetik. (bfcdbfb73) - Bug 1194112. Part 1 - extract event dispatch code from ListenerImpl to its own class. r=kinetik. (cfd49d7d8) - Bug 1194112. Part 2 - small code refactoring to reduce typing. r=kinetik. (fcd3399b1) - Bug 1194112. Part 3 - use perfect forwarding in MediaEventProducer::Notify() so MediaEventSource can decide whether to copy or move according to its ListenerMode. r=kinetik. (3d1fddf6b) - Bug 1194112. Part 4 - reimplement Listener/ListenerImpl to support Move. r=kinetik. (0c55cf863) - Bug 1194112. Part 5 - remove dead code. r=kinetik. (28ba52bfd) - Bug 1194112. Part 6 - add a test case to test the exclusive mode. r=kinetik. (cb7f3edd0)
98 lines
2.3 KiB
C++
98 lines
2.3 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/. */
|
|
|
|
#ifndef MP4_STREAM_H_
|
|
#define MP4_STREAM_H_
|
|
|
|
#include "mp4_demuxer/Stream.h"
|
|
|
|
#include "MediaResource.h"
|
|
|
|
#include "mozilla/Maybe.h"
|
|
#include "mozilla/Monitor.h"
|
|
|
|
namespace mozilla {
|
|
|
|
class Monitor;
|
|
|
|
class MP4Stream : public mp4_demuxer::Stream {
|
|
public:
|
|
explicit MP4Stream(MediaResource* aResource);
|
|
virtual ~MP4Stream();
|
|
bool BlockingReadIntoCache(int64_t aOffset, size_t aCount, Monitor* aToUnlock);
|
|
virtual bool ReadAt(int64_t aOffset, void* aBuffer, size_t aCount,
|
|
size_t* aBytesRead) override;
|
|
virtual bool CachedReadAt(int64_t aOffset, void* aBuffer, size_t aCount,
|
|
size_t* aBytesRead) override;
|
|
virtual bool Length(int64_t* aSize) override;
|
|
|
|
struct ReadRecord {
|
|
ReadRecord(int64_t aOffset, size_t aCount) : mOffset(aOffset), mCount(aCount) {}
|
|
bool operator==(const ReadRecord& aOther) { return mOffset == aOther.mOffset && mCount == aOther.mCount; }
|
|
int64_t mOffset;
|
|
size_t mCount;
|
|
};
|
|
bool LastReadFailed(ReadRecord* aOut)
|
|
{
|
|
if (mFailedRead.isSome()) {
|
|
*aOut = mFailedRead.ref();
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void ClearFailedRead() { mFailedRead.reset(); }
|
|
|
|
void Pin()
|
|
{
|
|
mResource.GetResource()->Pin();
|
|
++mPinCount;
|
|
}
|
|
|
|
void Unpin()
|
|
{
|
|
mResource.GetResource()->Unpin();
|
|
MOZ_ASSERT(mPinCount);
|
|
--mPinCount;
|
|
if (mPinCount == 0) {
|
|
mCache.Clear();
|
|
}
|
|
}
|
|
|
|
private:
|
|
MediaResourceIndex mResource;
|
|
Maybe<ReadRecord> mFailedRead;
|
|
uint32_t mPinCount;
|
|
|
|
struct CacheBlock {
|
|
CacheBlock(int64_t aOffset, size_t aCount)
|
|
: mOffset(aOffset), mCount(aCount), mBuffer(nullptr) {}
|
|
int64_t mOffset;
|
|
size_t mCount;
|
|
|
|
bool Init()
|
|
{
|
|
mBuffer = new (fallible) char[mCount];
|
|
return !!mBuffer;
|
|
}
|
|
|
|
char* Buffer()
|
|
{
|
|
MOZ_ASSERT(mBuffer.get());
|
|
return mBuffer.get();
|
|
}
|
|
|
|
private:
|
|
nsAutoArrayPtr<char> mBuffer;
|
|
};
|
|
nsTArray<CacheBlock> mCache;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif
|