mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
fef8b08889
- Bug 1237842 - Unlock mMutex before calling CloseActive. r=cpearce (d0677f1981) - Bug 1230857 - Ensure GMPService has sufficient file permissions to delete GMPs. r=gerald (e7f0c4b2b6) - Bug 1236380 - GMPStorage::mShutdown=true until Init() succeeds - r=cpearce (fde2025f4f) - Bug 1254311: [mp4] Ignore empty raw sample. r=cpearce (216a9417c3) - Bug 1215115 - part1: Replace the vorbis by opus in MediaEncoder and also reomve the VorbisTrackEncoder files. r=rillian (760c559e3c) - Bug 1215115 - part2: Mux opus into webm, remove bitdepth. r=rillian (1c996f0aee) - Bug 1215115 - part3: Fix gtest. Remove TestVorbisTrackEncoder.cpp. r=rillian (5a68915a4a) - Bug 1215115 - part4: Enable MOZ_WEBM_ENCODER by default. r=ted (6638b7fffb) - Bug 1257318: Pass TRACK_EVENT_ENDED events through to the TrackEncoders r=padenot (b92b2dcc94) - Bug 1261007 - Part 3 - Remove the same/redundant code of checking the unique image. r=jolin (608e6477bc) - Bug 1243611 - When EOS, call vpx_codec_encode correctly. r=rillian (83887c89c8) - Bug 1260353 - Remove unnecessary method AnimValuesStyleRule::AddPropertiesToSet() r=hiro (36f5e7fcc9) - Bug 1213775: VP8 automatic resizing breaks ffmpeg-based players; turn it off in VP8TrackEncoder r=jya (23c2a27371) - Bug 1185171 - Modify gmp-test-output-protection.h to prevent failure on machines without a physical monitor attached. r=bobowen (8375c5075d) - Bug 1185171: Add 0xc02625e5 as a valid failure code for GMPOutputProtection test. r=cpearce (1d10a75aeb) - Bug 1151746 - Origin tuples in should include schemes. r=edwin (32610b0cfa) - Bug 1180101 - Test 0 length atom inside moov; r=jya (3fae8aee45) - Bug 1244523: [mp4] P4. Add gtest. r=kentuckyfriedtakahe (3f71b5060a) - Bug 1255626: [gtest] Properly shutdown task queue should error occurs. r=gerald (4ec1bf360e) - Bug 1224363 - Added vp8/ivf test case - r=rillian Bug 1224369 - p1: Test cases given as list - r=rillian Bug 1224369 - p2: Added vp8/ivf test case - r=rillian Bug 1224361 - Added vp8/ivf test case - r=rillian (595ebe09be) - Bug 1231075. Respect the timestamp of video frames and don't pop frames as fast as we can in real-time mode. r=roc. (b72329c0fa) - Bug 1237160: Do not count frames not composited as dropped. r=cpearce (e7e18d0700) - Bug 1233648 - Fix some insufficient includes. r=kinetik. (e36cdd3e05) - Bug 1216460 - [1.1] Refactor data types, fix logs and prevent harmful type promotions in SourceBuffer eviction handling. r=jya (047a7ca64f) - Bug 1259916: [MSE] P1. Fix eviction. r=gerald (13195f392b) - Bug 1216460 - [2.2] Refactor SourceBuffer frame eviction and threshold defaults. r=jya (105962c942) - Bug 1259274: [MSE] P1. Remove unnecessary abstraction layer. r=gerald (e7b7603f30) - Bug 1259274: [MSE] P2. Remove unused code path. r=gerald (dce9fa447c) - Bug 1259274: [MSE] P3. Refactor handling of tasks so they only ever run concurrently. r=gerald (9c3f40d9b8) - Bug 1259274: [MSE] P4. Add AutoTaskQueue convenience class. r=gerald Just like TaskQueue, but doesn't require to be shutdown. (0310ff2b7f) - Bug 1259274: [MSE] P5. Use new AutoTaskQueue with MSE objects. r=gerald (3f72558eb2) - Bug 1259916: [MSE] P2. Bump audio source buffer eviction threshold to 30MB. r=gerald (2ffe148c1a) - Bug 1259916: [MSE] P3. Simplify eviction calculation logic. r=gerald (11250c02bc) - Bug 1199879: [MSE] Use latest demux end time to detect discontinuities. r=gerald (f89bdd763f) - Bug 1239983 - Diags around TrackBuffersMgr promises - r=jya (57f3e58636) - Bug 1258410: [MSE] P1. Abort if mInputDemuxer has been reset. r=gerald (07ca58adb0) - Bug 1258410: [MSE] P2. Disconnect init promise if any pending. r=gerald (0627c5a174) - Bug 1259985 - Add missing return after null-check - r=jya (b6ee457b89) - bit of Bwqug 1259274: [MSE] P3 (200d743676) - Bug 1216560 - [3.1] Make eviction thresholds const. r=jya (b44c78f999) - Bug 1259473 - per comment 14, move actions involving |this| to Init() from the constructor. r=jya. (30c402aacb) - Bug 1258562: MSE] Abort if MediaSource has been shutdown. r=gerald (6fce6bc9db) - Bug 1246358: [MSE] Take pre-roll time into consideration when seeking. r=gerald (dacbcd7f36) - spaces (abbb56d413) - Bug 657791 - Update WebM demuxer to clamp cueless seeks instead of failing. r=kinetik (785ae83126) - Bug 1219178 - [9.1] Make SeekPosition available with tests disabled. a=me for fixing build problems (cd1bdef203) - minor format (4a718e47f2) - Bug 1265399 - Replace 0.7071 with sqrt(0.5) in downmixing equations; r=padenot (2243d331c5) - Bug 1265794: P1. Ensure we can always fit a complete audio frame in an audio buffer. r=rillian (37f575184c) - Bug 1256626. Workaround Microsoft macro silliness. r=me (18930fbccd) - Bug 1264898 - Remove unnecessary |FinishAddTracks| call in |DOMHwMediaStream::Init|. r=jesup, r=pehrsons (1b610cdb4f) - Bug 848994 - p5. Check Silverlight presence - r=cpearce (98b4521ae3) - Bug 848994 - p6. Analyze Windows issues - r=cpearce (9de769166a) - Bug 848994 - p7. Filter front-end notifications - r=cpearce (e3aab89a95) - Bug 1256533 - Use std::deque<int32_t> instead of nsDeque - r=cpearce (e21c02fcab)
386 lines
11 KiB
C++
386 lines
11 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 "OmxTrackEncoder.h"
|
|
#include "OMXCodecWrapper.h"
|
|
#include "VideoUtils.h"
|
|
#include "ISOTrackMetadata.h"
|
|
#include "GeckoProfiler.h"
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
#include <android/log.h>
|
|
#define OMX_LOG(args...) \
|
|
do { \
|
|
__android_log_print(ANDROID_LOG_INFO, "OmxTrackEncoder", ##args); \
|
|
} while (0)
|
|
#else
|
|
#define OMX_LOG(args, ...)
|
|
#endif
|
|
|
|
using namespace android;
|
|
|
|
namespace mozilla {
|
|
|
|
#define ENCODER_CONFIG_FRAME_RATE 30 // fps
|
|
#define GET_ENCODED_VIDEO_FRAME_TIMEOUT 100000 // microseconds
|
|
|
|
OmxVideoTrackEncoder::OmxVideoTrackEncoder()
|
|
: VideoTrackEncoder()
|
|
{}
|
|
|
|
OmxVideoTrackEncoder::~OmxVideoTrackEncoder()
|
|
{}
|
|
|
|
nsresult
|
|
OmxVideoTrackEncoder::Init(int aWidth, int aHeight, int aDisplayWidth,
|
|
int aDisplayHeight, TrackRate aTrackRate)
|
|
{
|
|
mFrameWidth = aWidth;
|
|
mFrameHeight = aHeight;
|
|
mTrackRate = aTrackRate;
|
|
mDisplayWidth = aDisplayWidth;
|
|
mDisplayHeight = aDisplayHeight;
|
|
|
|
mEncoder = OMXCodecWrapper::CreateAVCEncoder();
|
|
NS_ENSURE_TRUE(mEncoder, NS_ERROR_FAILURE);
|
|
|
|
nsresult rv = mEncoder->Configure(mFrameWidth, mFrameHeight,
|
|
ENCODER_CONFIG_FRAME_RATE);
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
mInitialized = (rv == NS_OK);
|
|
|
|
mReentrantMonitor.NotifyAll();
|
|
|
|
return rv;
|
|
}
|
|
|
|
already_AddRefed<TrackMetadataBase>
|
|
OmxVideoTrackEncoder::GetMetadata()
|
|
{
|
|
PROFILER_LABEL("OmxVideoTrackEncoder", "GetMetadata",
|
|
js::ProfileEntry::Category::OTHER);
|
|
{
|
|
// Wait if mEncoder is not initialized nor is being canceled.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
while (!mCanceled && !mInitialized) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<AVCTrackMetadata> meta = new AVCTrackMetadata();
|
|
meta->mWidth = mFrameWidth;
|
|
meta->mHeight = mFrameHeight;
|
|
meta->mDisplayWidth = mDisplayWidth;
|
|
meta->mDisplayHeight = mDisplayHeight;
|
|
meta->mFrameRate = ENCODER_CONFIG_FRAME_RATE;
|
|
return meta.forget();
|
|
}
|
|
|
|
nsresult
|
|
OmxVideoTrackEncoder::GetEncodedTrack(EncodedFrameContainer& aData)
|
|
{
|
|
PROFILER_LABEL("OmxVideoTrackEncoder", "GetEncodedTrack",
|
|
js::ProfileEntry::Category::OTHER);
|
|
VideoSegment segment;
|
|
{
|
|
// Move all the samples from mRawSegment to segment. We only hold the
|
|
// monitor in this block.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
// Wait if mEncoder is not initialized nor is being canceled.
|
|
while (!mCanceled && (!mInitialized ||
|
|
(mRawSegment.GetDuration() == 0 && !mEndOfStream))) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
segment.AppendFrom(&mRawSegment);
|
|
}
|
|
|
|
nsresult rv;
|
|
// Start queuing raw frames to the input buffers of OMXCodecWrapper.
|
|
VideoSegment::ChunkIterator iter(segment);
|
|
while (!iter.IsEnded()) {
|
|
VideoChunk chunk = *iter;
|
|
|
|
uint64_t totalDurationUs = mTotalFrameDuration * USECS_PER_S / mTrackRate;
|
|
layers::Image* img = (chunk.IsNull() || chunk.mFrame.GetForceBlack()) ?
|
|
nullptr : chunk.mFrame.GetImage();
|
|
rv = mEncoder->Encode(img, mFrameWidth, mFrameHeight, totalDurationUs);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
mTotalFrameDuration += chunk.GetDuration();
|
|
|
|
iter.Next();
|
|
}
|
|
|
|
// Send the EOS signal to OMXCodecWrapper.
|
|
if (mEndOfStream && iter.IsEnded() && !mEosSetInEncoder) {
|
|
uint64_t totalDurationUs = mTotalFrameDuration * USECS_PER_S / mTrackRate;
|
|
layers::Image* img = (!mLastFrame.GetImage() || mLastFrame.GetForceBlack())
|
|
? nullptr : mLastFrame.GetImage();
|
|
rv = mEncoder->Encode(img, mFrameWidth, mFrameHeight, totalDurationUs,
|
|
OMXCodecWrapper::BUFFER_EOS, &mEosSetInEncoder);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
// Dequeue an encoded frame from the output buffers of OMXCodecWrapper.
|
|
nsTArray<uint8_t> buffer;
|
|
int outFlags = 0;
|
|
int64_t outTimeStampUs = 0;
|
|
rv = mEncoder->GetNextEncodedFrame(&buffer, &outTimeStampUs, &outFlags,
|
|
GET_ENCODED_VIDEO_FRAME_TIMEOUT);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
if (!buffer.IsEmpty()) {
|
|
RefPtr<EncodedFrame> videoData = new EncodedFrame();
|
|
if (outFlags & OMXCodecWrapper::BUFFER_CODEC_CONFIG) {
|
|
videoData->SetFrameType(EncodedFrame::AVC_CSD);
|
|
} else {
|
|
videoData->SetFrameType((outFlags & OMXCodecWrapper::BUFFER_SYNC_FRAME) ?
|
|
EncodedFrame::AVC_I_FRAME : EncodedFrame::AVC_P_FRAME);
|
|
}
|
|
videoData->SwapInFrameData(buffer);
|
|
videoData->SetTimeStamp(outTimeStampUs);
|
|
aData.AppendEncodedFrame(videoData);
|
|
}
|
|
|
|
if (outFlags & OMXCodecWrapper::BUFFER_EOS) {
|
|
mEncodingComplete = true;
|
|
OMX_LOG("Done encoding video.");
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
OmxAudioTrackEncoder::OmxAudioTrackEncoder()
|
|
: AudioTrackEncoder()
|
|
{}
|
|
|
|
OmxAudioTrackEncoder::~OmxAudioTrackEncoder()
|
|
{}
|
|
|
|
nsresult
|
|
OmxAudioTrackEncoder::AppendEncodedFrames(EncodedFrameContainer& aContainer)
|
|
{
|
|
nsTArray<uint8_t> frameData;
|
|
int outFlags = 0;
|
|
int64_t outTimeUs = -1;
|
|
|
|
nsresult rv = mEncoder->GetNextEncodedFrame(&frameData, &outTimeUs, &outFlags,
|
|
3000); // wait up to 3ms
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
if (!frameData.IsEmpty() || outFlags & OMXCodecWrapper::BUFFER_EOS) { // Some hw codec may send out EOS with an empty frame
|
|
bool isCSD = false;
|
|
if (outFlags & OMXCodecWrapper::BUFFER_CODEC_CONFIG) { // codec specific data
|
|
isCSD = true;
|
|
} else if (outFlags & OMXCodecWrapper::BUFFER_EOS) { // last frame
|
|
mEncodingComplete = true;
|
|
}
|
|
|
|
RefPtr<EncodedFrame> audiodata = new EncodedFrame();
|
|
if (mEncoder->GetCodecType() == OMXCodecWrapper::AAC_ENC) {
|
|
audiodata->SetFrameType(isCSD ?
|
|
EncodedFrame::AAC_CSD : EncodedFrame::AAC_AUDIO_FRAME);
|
|
} else if (mEncoder->GetCodecType() == OMXCodecWrapper::AMR_NB_ENC){
|
|
audiodata->SetFrameType(isCSD ?
|
|
EncodedFrame::AMR_AUDIO_CSD : EncodedFrame::AMR_AUDIO_FRAME);
|
|
} else if (mEncoder->GetCodecType() == OMXCodecWrapper::EVRC_ENC){
|
|
audiodata->SetFrameType(isCSD ?
|
|
EncodedFrame::EVRC_AUDIO_CSD : EncodedFrame::EVRC_AUDIO_FRAME);
|
|
} else {
|
|
MOZ_ASSERT(false, "audio codec not supported");
|
|
}
|
|
audiodata->SetTimeStamp(outTimeUs);
|
|
audiodata->SwapInFrameData(frameData);
|
|
aContainer.AppendEncodedFrame(audiodata);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
OmxAudioTrackEncoder::GetEncodedTrack(EncodedFrameContainer& aData)
|
|
{
|
|
PROFILER_LABEL("OmxAACAudioTrackEncoder", "GetEncodedTrack",
|
|
js::ProfileEntry::Category::OTHER);
|
|
AudioSegment segment;
|
|
bool EOS;
|
|
// Move all the samples from mRawSegment to segment. We only hold
|
|
// the monitor in this block.
|
|
{
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
// Wait if mEncoder is not initialized nor canceled.
|
|
while (!mInitialized && !mCanceled) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
segment.AppendFrom(&mRawSegment);
|
|
EOS = mEndOfStream;
|
|
}
|
|
|
|
nsresult rv;
|
|
if (segment.GetDuration() == 0) {
|
|
// Notify EOS at least once, even if segment is empty.
|
|
if (EOS && !mEosSetInEncoder) {
|
|
rv = mEncoder->Encode(segment, OMXCodecWrapper::BUFFER_EOS,
|
|
&mEosSetInEncoder);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
// Nothing to encode but encoder could still have encoded data for earlier
|
|
// input.
|
|
return AppendEncodedFrames(aData);
|
|
}
|
|
|
|
// OMX encoder has limited input buffers only so we have to feed input and get
|
|
// output more than once if there are too many samples pending in segment.
|
|
while (segment.GetDuration() > 0) {
|
|
rv = mEncoder->Encode(segment, 0);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = AppendEncodedFrames(aData);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
OmxAACAudioTrackEncoder::Init(int aChannels, int aSamplingRate)
|
|
{
|
|
mChannels = aChannels;
|
|
mSamplingRate = aSamplingRate;
|
|
|
|
mEncoder = OMXCodecWrapper::CreateAACEncoder();
|
|
NS_ENSURE_TRUE(mEncoder, NS_ERROR_FAILURE);
|
|
|
|
nsresult rv = mEncoder->Configure(mChannels, mSamplingRate, mSamplingRate);
|
|
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
mInitialized = (rv == NS_OK);
|
|
|
|
mReentrantMonitor.NotifyAll();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<TrackMetadataBase>
|
|
OmxAACAudioTrackEncoder::GetMetadata()
|
|
{
|
|
PROFILER_LABEL("OmxAACAudioTrackEncoder", "GetMetadata",
|
|
js::ProfileEntry::Category::OTHER);
|
|
{
|
|
// Wait if mEncoder is not initialized nor is being canceled.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
while (!mCanceled && !mInitialized) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return nullptr;
|
|
}
|
|
RefPtr<AACTrackMetadata> meta = new AACTrackMetadata();
|
|
meta->mChannels = mChannels;
|
|
meta->mSampleRate = mSamplingRate;
|
|
meta->mFrameSize = OMXCodecWrapper::kAACFrameSize;
|
|
meta->mFrameDuration = OMXCodecWrapper::kAACFrameDuration;
|
|
return meta.forget();
|
|
}
|
|
|
|
nsresult
|
|
OmxAMRAudioTrackEncoder::Init(int aChannels, int aSamplingRate)
|
|
{
|
|
mChannels = aChannels;
|
|
mSamplingRate = aSamplingRate;
|
|
|
|
mEncoder = OMXCodecWrapper::CreateAMRNBEncoder();
|
|
NS_ENSURE_TRUE(mEncoder, NS_ERROR_FAILURE);
|
|
|
|
nsresult rv = mEncoder->Configure(mChannels, mSamplingRate, AMR_NB_SAMPLERATE);
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
mInitialized = (rv == NS_OK);
|
|
|
|
mReentrantMonitor.NotifyAll();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<TrackMetadataBase>
|
|
OmxAMRAudioTrackEncoder::GetMetadata()
|
|
{
|
|
PROFILER_LABEL("OmxAMRAudioTrackEncoder", "GetMetadata",
|
|
js::ProfileEntry::Category::OTHER);
|
|
{
|
|
// Wait if mEncoder is not initialized nor is being canceled.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
while (!mCanceled && !mInitialized) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<AMRTrackMetadata> meta = new AMRTrackMetadata();
|
|
return meta.forget();
|
|
}
|
|
|
|
nsresult
|
|
OmxEVRCAudioTrackEncoder::Init(int aChannels, int aSamplingRate)
|
|
{
|
|
mChannels = aChannels;
|
|
mSamplingRate = aSamplingRate;
|
|
|
|
mEncoder = OMXCodecWrapper::CreateEVRCEncoder();
|
|
NS_ENSURE_TRUE(mEncoder, NS_ERROR_FAILURE);
|
|
|
|
nsresult rv = mEncoder->Configure(mChannels, mSamplingRate, EVRC_SAMPLERATE);
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
mInitialized = (rv == NS_OK);
|
|
|
|
mReentrantMonitor.NotifyAll();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<TrackMetadataBase>
|
|
OmxEVRCAudioTrackEncoder::GetMetadata()
|
|
{
|
|
PROFILER_LABEL("OmxEVRCAudioTrackEncoder", "GetMetadata",
|
|
js::ProfileEntry::Category::OTHER);
|
|
{
|
|
// Wait if mEncoder is not initialized nor is being canceled.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
while (!mCanceled && !mInitialized) {
|
|
mReentrantMonitor.Wait();
|
|
}
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<EVRCTrackMetadata> meta = new EVRCTrackMetadata();
|
|
meta->mChannels = mChannels;
|
|
return meta.forget();
|
|
}
|
|
|
|
}
|