зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1257777 - Part 5: Seperate PDM and data decoders into different files. r=snorp
MozReview-Commit-ID: KP4hAZXLPAU --HG-- extra : rebase_source : 64f4c8c086d10ce1268945c74c813177b2401d58
This commit is contained in:
John Lin
Родитель
f5e84e8425
Коммит
d8af0bb89e
|
|
@ -4,14 +4,12 @@
|
|||
|
||||
#include "AndroidDecoderModule.h"
|
||||
#include "AndroidBridge.h"
|
||||
#include "AndroidSurfaceTexture.h"
|
||||
#include "GLImages.h"
|
||||
|
||||
#include "MediaData.h"
|
||||
#include "MediaCodecDataDecoder.h"
|
||||
|
||||
#include "MediaInfo.h"
|
||||
#include "VPXDecoder.h"
|
||||
|
||||
#include "nsThreadUtils.h"
|
||||
#include "nsPromiseFlatString.h"
|
||||
#include "nsIGfxInfo.h"
|
||||
|
||||
|
|
@ -19,17 +17,8 @@
|
|||
|
||||
#include <jni.h>
|
||||
|
||||
static PRLogModuleInfo* AndroidDecoderModuleLog()
|
||||
{
|
||||
static PRLogModuleInfo* sLogModule = nullptr;
|
||||
if (!sLogModule) {
|
||||
sLogModule = PR_NewLogModule("AndroidDecoderModule");
|
||||
}
|
||||
return sLogModule;
|
||||
}
|
||||
|
||||
#undef LOG
|
||||
#define LOG(arg, ...) MOZ_LOG(AndroidDecoderModuleLog(), \
|
||||
#define LOG(arg, ...) MOZ_LOG(sAndroidDecoderModuleLog, \
|
||||
mozilla::LogLevel::Debug, ("AndroidDecoderModule(%p)::%s: " arg, \
|
||||
this, __func__, ##__VA_ARGS__))
|
||||
|
||||
|
|
@ -40,12 +29,7 @@ using media::TimeUnit;
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
#define INVOKE_CALLBACK(Func, ...) \
|
||||
if (mCallback) { \
|
||||
mCallback->Func(__VA_ARGS__); \
|
||||
} else { \
|
||||
NS_WARNING("Callback not set"); \
|
||||
}
|
||||
mozilla::LazyLogModule sAndroidDecoderModuleLog("AndroidDecoderModule");
|
||||
|
||||
static const char*
|
||||
TranslateMimeType(const nsACString& aMimeType)
|
||||
|
|
@ -58,15 +42,6 @@ TranslateMimeType(const nsACString& aMimeType)
|
|||
return PromiseFlatCString(aMimeType).get();
|
||||
}
|
||||
|
||||
static MediaCodec::LocalRef
|
||||
CreateDecoder(const nsACString& aMimeType)
|
||||
{
|
||||
MediaCodec::LocalRef codec;
|
||||
NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(TranslateMimeType(aMimeType),
|
||||
&codec), nullptr);
|
||||
return codec;
|
||||
}
|
||||
|
||||
static bool
|
||||
GetFeatureStatus(int32_t aFeature)
|
||||
{
|
||||
|
|
@ -79,171 +54,6 @@ GetFeatureStatus(int32_t aFeature)
|
|||
return status == nsIGfxInfo::FEATURE_STATUS_OK;
|
||||
};
|
||||
|
||||
class VideoDataDecoder : public MediaCodecDataDecoder
|
||||
{
|
||||
public:
|
||||
VideoDataDecoder(const VideoInfo& aConfig,
|
||||
MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback,
|
||||
layers::ImageContainer* aImageContainer)
|
||||
: MediaCodecDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mMimeType,
|
||||
aFormat, aCallback)
|
||||
, mImageContainer(aImageContainer)
|
||||
, mConfig(aConfig)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
const char* GetDescriptionName() const override
|
||||
{
|
||||
return "android video decoder";
|
||||
}
|
||||
|
||||
RefPtr<InitPromise> Init() override
|
||||
{
|
||||
mSurfaceTexture = AndroidSurfaceTexture::Create();
|
||||
if (!mSurfaceTexture) {
|
||||
NS_WARNING("Failed to create SurfaceTexture for video decode\n");
|
||||
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
||||
}
|
||||
|
||||
if (NS_FAILED(InitDecoder(mSurfaceTexture->JavaSurface()))) {
|
||||
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
||||
}
|
||||
|
||||
return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__);
|
||||
}
|
||||
|
||||
void Cleanup() override
|
||||
{
|
||||
}
|
||||
|
||||
nsresult Input(MediaRawData* aSample) override
|
||||
{
|
||||
return MediaCodecDataDecoder::Input(aSample);
|
||||
}
|
||||
|
||||
nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat,
|
||||
const TimeUnit& aDuration) override
|
||||
{
|
||||
RefPtr<layers::Image> img =
|
||||
new SurfaceTextureImage(mSurfaceTexture.get(), mConfig.mDisplay,
|
||||
gl::OriginPos::BottomLeft);
|
||||
|
||||
nsresult rv;
|
||||
int32_t flags;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Flags(&flags), rv);
|
||||
|
||||
bool isSync = !!(flags & MediaCodec::BUFFER_FLAG_SYNC_FRAME);
|
||||
|
||||
int32_t offset;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
|
||||
|
||||
int64_t presentationTimeUs;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
|
||||
|
||||
RefPtr<VideoData> v =
|
||||
VideoData::CreateFromImage(mConfig,
|
||||
offset,
|
||||
presentationTimeUs,
|
||||
aDuration.ToMicroseconds(),
|
||||
img,
|
||||
isSync,
|
||||
presentationTimeUs,
|
||||
gfx::IntRect(0, 0,
|
||||
mConfig.mDisplay.width,
|
||||
mConfig.mDisplay.height));
|
||||
INVOKE_CALLBACK(Output, v);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
protected:
|
||||
layers::ImageContainer* mImageContainer;
|
||||
const VideoInfo& mConfig;
|
||||
RefPtr<AndroidSurfaceTexture> mSurfaceTexture;
|
||||
};
|
||||
|
||||
class AudioDataDecoder : public MediaCodecDataDecoder
|
||||
{
|
||||
public:
|
||||
AudioDataDecoder(const AudioInfo& aConfig, MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback)
|
||||
: MediaCodecDataDecoder(MediaData::Type::AUDIO_DATA, aConfig.mMimeType,
|
||||
aFormat, aCallback)
|
||||
{
|
||||
JNIEnv* const env = jni::GetEnvForThread();
|
||||
|
||||
jni::ByteBuffer::LocalRef buffer(env);
|
||||
NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"),
|
||||
&buffer));
|
||||
|
||||
if (!buffer && aConfig.mCodecSpecificConfig->Length() >= 2) {
|
||||
buffer = jni::ByteBuffer::New(
|
||||
aConfig.mCodecSpecificConfig->Elements(),
|
||||
aConfig.mCodecSpecificConfig->Length());
|
||||
NS_ENSURE_SUCCESS_VOID(aFormat->SetByteBuffer(NS_LITERAL_STRING("csd-0"),
|
||||
buffer));
|
||||
}
|
||||
}
|
||||
|
||||
const char* GetDescriptionName() const override
|
||||
{
|
||||
return "android audio decoder";
|
||||
}
|
||||
|
||||
nsresult Output(BufferInfo::Param aInfo, void* aBuffer,
|
||||
MediaFormat::Param aFormat, const TimeUnit& aDuration) override
|
||||
{
|
||||
// The output on Android is always 16-bit signed
|
||||
nsresult rv;
|
||||
int32_t numChannels;
|
||||
NS_ENSURE_SUCCESS(rv =
|
||||
aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &numChannels), rv);
|
||||
AudioConfig::ChannelLayout layout(numChannels);
|
||||
if (!layout.IsValid()) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
int32_t sampleRate;
|
||||
NS_ENSURE_SUCCESS(rv =
|
||||
aFormat->GetInteger(NS_LITERAL_STRING("sample-rate"), &sampleRate), rv);
|
||||
|
||||
int32_t size;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Size(&size), rv);
|
||||
|
||||
int32_t offset;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
|
||||
|
||||
#ifdef MOZ_SAMPLE_TYPE_S16
|
||||
const int32_t numSamples = size / 2;
|
||||
#else
|
||||
#error We only support 16-bit integer PCM
|
||||
#endif
|
||||
|
||||
const int32_t numFrames = numSamples / numChannels;
|
||||
AlignedAudioBuffer audio(numSamples);
|
||||
if (!audio) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
const uint8_t* bufferStart = static_cast<uint8_t*>(aBuffer) + offset;
|
||||
PodCopy(audio.get(), reinterpret_cast<const AudioDataValue*>(bufferStart),
|
||||
numSamples);
|
||||
|
||||
int64_t presentationTimeUs;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
|
||||
|
||||
RefPtr<AudioData> data = new AudioData(0, presentationTimeUs,
|
||||
aDuration.ToMicroseconds(),
|
||||
numFrames,
|
||||
Move(audio),
|
||||
numChannels,
|
||||
sampleRate);
|
||||
INVOKE_CALLBACK(Output, data);
|
||||
return NS_OK;
|
||||
}
|
||||
};
|
||||
|
||||
bool
|
||||
AndroidDecoderModule::SupportsMimeType(const nsACString& aMimeType,
|
||||
DecoderDoctorDiagnostics* aDiagnostics) const
|
||||
|
|
@ -293,10 +103,10 @@ AndroidDecoderModule::CreateVideoDecoder(const CreateDecoderParams& aParams)
|
|||
&format), nullptr);
|
||||
|
||||
RefPtr<MediaDataDecoder> decoder =
|
||||
new VideoDataDecoder(config,
|
||||
format,
|
||||
aParams.mCallback,
|
||||
aParams.mImageContainer);
|
||||
MediaCodecDataDecoder::CreateVideoDecoder(config,
|
||||
format,
|
||||
aParams.mCallback,
|
||||
aParams.mImageContainer);
|
||||
|
||||
return decoder.forget();
|
||||
}
|
||||
|
|
@ -319,7 +129,7 @@ AndroidDecoderModule::CreateAudioDecoder(const CreateDecoderParams& aParams)
|
|||
&format), nullptr);
|
||||
|
||||
RefPtr<MediaDataDecoder> decoder =
|
||||
new AudioDataDecoder(config, format, aParams.mCallback);
|
||||
MediaCodecDataDecoder::CreateAudioDecoder(config, format, aParams.mCallback);
|
||||
|
||||
return decoder.forget();
|
||||
}
|
||||
|
|
@ -333,469 +143,4 @@ AndroidDecoderModule::DecoderNeedsConversion(const TrackInfo& aConfig) const
|
|||
return kNeedNone;
|
||||
}
|
||||
|
||||
MediaCodecDataDecoder::MediaCodecDataDecoder(MediaData::Type aType,
|
||||
const nsACString& aMimeType,
|
||||
MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback)
|
||||
: mType(aType)
|
||||
, mMimeType(aMimeType)
|
||||
, mFormat(aFormat)
|
||||
, mCallback(aCallback)
|
||||
, mInputBuffers(nullptr)
|
||||
, mOutputBuffers(nullptr)
|
||||
, mMonitor("MediaCodecDataDecoder::mMonitor")
|
||||
, mState(kDecoding)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
MediaCodecDataDecoder::~MediaCodecDataDecoder()
|
||||
{
|
||||
Shutdown();
|
||||
}
|
||||
|
||||
RefPtr<MediaDataDecoder::InitPromise>
|
||||
MediaCodecDataDecoder::Init()
|
||||
{
|
||||
nsresult rv = InitDecoder(nullptr);
|
||||
|
||||
TrackInfo::TrackType type =
|
||||
(mType == MediaData::AUDIO_DATA ? TrackInfo::TrackType::kAudioTrack
|
||||
: TrackInfo::TrackType::kVideoTrack);
|
||||
|
||||
return NS_SUCCEEDED(rv) ?
|
||||
InitPromise::CreateAndResolve(type, __func__) :
|
||||
InitPromise::CreateAndReject(
|
||||
MediaDataDecoder::DecoderFailureReason::INIT_ERROR, __func__);
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::InitDecoder(Surface::Param aSurface)
|
||||
{
|
||||
mDecoder = CreateDecoder(mMimeType);
|
||||
if (!mDecoder) {
|
||||
INVOKE_CALLBACK(Error, MediaDataDecoderError::FATAL_ERROR);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
nsresult rv;
|
||||
NS_ENSURE_SUCCESS(rv = mDecoder->Configure(mFormat, aSurface, nullptr, 0), rv);
|
||||
NS_ENSURE_SUCCESS(rv = mDecoder->Start(), rv);
|
||||
|
||||
NS_ENSURE_SUCCESS(rv = ResetInputBuffers(), rv);
|
||||
NS_ENSURE_SUCCESS(rv = ResetOutputBuffers(), rv);
|
||||
|
||||
nsCOMPtr<nsIRunnable> r = NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop);
|
||||
rv = NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread), r);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
// This is in usec, so that's 10ms.
|
||||
static const int64_t kDecoderTimeout = 10000;
|
||||
|
||||
#define BREAK_ON_DECODER_ERROR() \
|
||||
if (NS_FAILED(res)) { \
|
||||
NS_WARNING("Exiting decoder loop due to exception"); \
|
||||
if (State() == kDrainDecoder) { \
|
||||
INVOKE_CALLBACK(DrainComplete); \
|
||||
State(kDecoding); \
|
||||
} \
|
||||
INVOKE_CALLBACK(Error, MediaDataDecoderError::FATAL_ERROR); \
|
||||
break; \
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::GetInputBuffer(
|
||||
JNIEnv* aEnv, int aIndex, jni::Object::LocalRef* aBuffer)
|
||||
{
|
||||
MOZ_ASSERT(aEnv);
|
||||
MOZ_ASSERT(!*aBuffer);
|
||||
|
||||
int numTries = 2;
|
||||
|
||||
while (numTries--) {
|
||||
*aBuffer = jni::Object::LocalRef::Adopt(
|
||||
aEnv->GetObjectArrayElement(mInputBuffers.Get(), aIndex));
|
||||
if (*aBuffer) {
|
||||
return NS_OK;
|
||||
}
|
||||
nsresult res = ResetInputBuffers();
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
}
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
bool
|
||||
MediaCodecDataDecoder::WaitForInput()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
while (State() == kDecoding && mQueue.empty()) {
|
||||
// Signal that we require more input.
|
||||
INVOKE_CALLBACK(InputExhausted);
|
||||
lock.Wait();
|
||||
}
|
||||
|
||||
return State() != kStopping;
|
||||
}
|
||||
|
||||
|
||||
already_AddRefed<MediaRawData>
|
||||
MediaCodecDataDecoder::PeekNextSample()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
if (State() == kFlushing) {
|
||||
mDecoder->Flush();
|
||||
ClearQueue();
|
||||
State(kDecoding);
|
||||
lock.Notify();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (mQueue.empty()) {
|
||||
if (State() == kDrainQueue) {
|
||||
State(kDrainDecoder);
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// We're not stopping or flushing, so try to get a sample.
|
||||
return RefPtr<MediaRawData>(mQueue.front()).forget();
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::QueueSample(const MediaRawData* aSample)
|
||||
{
|
||||
MOZ_ASSERT(aSample);
|
||||
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
||||
|
||||
// We have a sample, try to feed it to the decoder.
|
||||
int32_t inputIndex = -1;
|
||||
nsresult res = mDecoder->DequeueInputBuffer(kDecoderTimeout, &inputIndex);
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
|
||||
if (inputIndex < 0) {
|
||||
// There is no valid input buffer available.
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
jni::Object::LocalRef buffer(frame.GetEnv());
|
||||
res = GetInputBuffer(frame.GetEnv(), inputIndex, &buffer);
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
|
||||
void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
|
||||
|
||||
MOZ_ASSERT(frame.GetEnv()->GetDirectBufferCapacity(buffer.Get()) >=
|
||||
aSample->Size(),
|
||||
"Decoder buffer is not large enough for sample");
|
||||
|
||||
PodCopy(static_cast<uint8_t*>(directBuffer), aSample->Data(), aSample->Size());
|
||||
|
||||
res = mDecoder->QueueInputBuffer(inputIndex, 0, aSample->Size(),
|
||||
aSample->mTime, 0);
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
|
||||
mDurations.push_back(TimeUnit::FromMicroseconds(aSample->mDuration));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::QueueEOS()
|
||||
{
|
||||
mMonitor.AssertCurrentThreadOwns();
|
||||
|
||||
nsresult res = NS_OK;
|
||||
int32_t inputIndex = -1;
|
||||
res = mDecoder->DequeueInputBuffer(kDecoderTimeout, &inputIndex);
|
||||
if (NS_FAILED(res) || inputIndex < 0) {
|
||||
return res;
|
||||
}
|
||||
|
||||
res = mDecoder->QueueInputBuffer(inputIndex, 0, 0, 0,
|
||||
MediaCodec::BUFFER_FLAG_END_OF_STREAM);
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
State(kDrainWaitEOS);
|
||||
mMonitor.Notify();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
void
|
||||
MediaCodecDataDecoder::HandleEOS(int32_t aOutputStatus)
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
if (State() == kDrainWaitEOS) {
|
||||
State(kDecoding);
|
||||
mMonitor.Notify();
|
||||
|
||||
INVOKE_CALLBACK(DrainComplete);
|
||||
}
|
||||
|
||||
mDecoder->ReleaseOutputBuffer(aOutputStatus, false);
|
||||
}
|
||||
|
||||
Maybe<TimeUnit>
|
||||
MediaCodecDataDecoder::GetOutputDuration()
|
||||
{
|
||||
if (mDurations.empty()) {
|
||||
return Nothing();
|
||||
}
|
||||
const Maybe<TimeUnit> duration = Some(mDurations.front());
|
||||
mDurations.pop_front();
|
||||
return duration;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::ProcessOutput(
|
||||
BufferInfo::Param aInfo, MediaFormat::Param aFormat, int32_t aStatus)
|
||||
{
|
||||
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
||||
|
||||
const Maybe<TimeUnit> duration = GetOutputDuration();
|
||||
if (!duration) {
|
||||
// Some devices report failure in QueueSample while actually succeeding at
|
||||
// it, in which case we get an output buffer without having a cached duration
|
||||
// (bug 1273523).
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
const auto buffer = jni::Object::LocalRef::Adopt(
|
||||
frame.GetEnv()->GetObjectArrayElement(mOutputBuffers.Get(), aStatus));
|
||||
|
||||
if (buffer) {
|
||||
// The buffer will be null on Android L if we are decoding to a Surface.
|
||||
void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
|
||||
Output(aInfo, directBuffer, aFormat, duration.value());
|
||||
}
|
||||
|
||||
// The Surface will be updated at this point (for video).
|
||||
mDecoder->ReleaseOutputBuffer(aStatus, true);
|
||||
PostOutput(aInfo, aFormat, duration.value());
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
MediaCodecDataDecoder::DecoderLoop()
|
||||
{
|
||||
bool isOutputDone = false;
|
||||
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
||||
MediaFormat::LocalRef outputFormat(frame.GetEnv());
|
||||
nsresult res = NS_OK;
|
||||
|
||||
while (WaitForInput()) {
|
||||
RefPtr<MediaRawData> sample = PeekNextSample();
|
||||
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
if (State() == kDrainDecoder) {
|
||||
MOZ_ASSERT(!sample, "Shouldn't have a sample when pushing EOF frame");
|
||||
res = QueueEOS();
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
}
|
||||
}
|
||||
|
||||
if (sample) {
|
||||
res = QueueSample(sample);
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
// We've fed this into the decoder, so remove it from the queue.
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
MOZ_RELEASE_ASSERT(mQueue.size(), "Queue may not be empty");
|
||||
mQueue.pop_front();
|
||||
isOutputDone = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (isOutputDone) {
|
||||
continue;
|
||||
}
|
||||
|
||||
BufferInfo::LocalRef bufferInfo;
|
||||
nsresult res = BufferInfo::New(&bufferInfo);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
|
||||
int32_t outputStatus = -1;
|
||||
res = mDecoder->DequeueOutputBuffer(bufferInfo, kDecoderTimeout,
|
||||
&outputStatus);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
|
||||
if (outputStatus == MediaCodec::INFO_TRY_AGAIN_LATER) {
|
||||
// We might want to call mCallback->InputExhausted() here, but there seems
|
||||
// to be some possible bad interactions here with the threading.
|
||||
} else if (outputStatus == MediaCodec::INFO_OUTPUT_BUFFERS_CHANGED) {
|
||||
res = ResetOutputBuffers();
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
} else if (outputStatus == MediaCodec::INFO_OUTPUT_FORMAT_CHANGED) {
|
||||
res = mDecoder->GetOutputFormat(ReturnTo(&outputFormat));
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
} else if (outputStatus < 0) {
|
||||
NS_WARNING("Unknown error from decoder!");
|
||||
INVOKE_CALLBACK(Error, MediaDataDecoderError::DECODE_ERROR);
|
||||
// Don't break here just in case it's recoverable. If it's not, other
|
||||
// stuff will fail later and we'll bail out.
|
||||
} else {
|
||||
// We have a valid buffer index >= 0 here.
|
||||
int32_t flags;
|
||||
nsresult res = bufferInfo->Flags(&flags);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
|
||||
if (flags & MediaCodec::BUFFER_FLAG_END_OF_STREAM) {
|
||||
HandleEOS(outputStatus);
|
||||
isOutputDone = true;
|
||||
// We only queue empty EOF frames, so we're done for now.
|
||||
continue;
|
||||
}
|
||||
|
||||
res = ProcessOutput(bufferInfo, outputFormat, outputStatus);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
}
|
||||
}
|
||||
|
||||
Cleanup();
|
||||
|
||||
// We're done.
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
State(kShutdown);
|
||||
mMonitor.Notify();
|
||||
}
|
||||
|
||||
const char*
|
||||
MediaCodecDataDecoder::ModuleStateStr(ModuleState aState) {
|
||||
static const char* kStr[] = {
|
||||
"Decoding", "Flushing", "DrainQueue", "DrainDecoder", "DrainWaitEOS",
|
||||
"Stopping", "Shutdown"
|
||||
};
|
||||
|
||||
MOZ_ASSERT(aState < sizeof(kStr) / sizeof(kStr[0]));
|
||||
return kStr[aState];
|
||||
}
|
||||
|
||||
MediaCodecDataDecoder::ModuleState
|
||||
MediaCodecDataDecoder::State() const
|
||||
{
|
||||
return mState;
|
||||
}
|
||||
|
||||
bool
|
||||
MediaCodecDataDecoder::State(ModuleState aState)
|
||||
{
|
||||
bool ok = true;
|
||||
|
||||
if (mState == kShutdown) {
|
||||
ok = false;
|
||||
} else if (mState == kStopping) {
|
||||
ok = aState == kShutdown;
|
||||
} else if (aState == kDrainDecoder) {
|
||||
ok = mState == kDrainQueue;
|
||||
} else if (aState == kDrainWaitEOS) {
|
||||
ok = mState == kDrainDecoder;
|
||||
}
|
||||
|
||||
if (ok) {
|
||||
LOG("%s -> %s", ModuleStateStr(mState), ModuleStateStr(aState));
|
||||
mState = aState;
|
||||
}
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
void
|
||||
MediaCodecDataDecoder::ClearQueue()
|
||||
{
|
||||
mMonitor.AssertCurrentThreadOwns();
|
||||
|
||||
mQueue.clear();
|
||||
mDurations.clear();
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Input(MediaRawData* aSample)
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
mQueue.push_back(aSample);
|
||||
lock.NotifyAll();
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::ResetInputBuffers()
|
||||
{
|
||||
return mDecoder->GetInputBuffers(ReturnTo(&mInputBuffers));
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::ResetOutputBuffers()
|
||||
{
|
||||
return mDecoder->GetOutputBuffers(ReturnTo(&mOutputBuffers));
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Flush()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
if (!State(kFlushing)) {
|
||||
return NS_OK;
|
||||
}
|
||||
lock.Notify();
|
||||
|
||||
while (State() == kFlushing) {
|
||||
lock.Wait();
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Drain()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
if (State() == kDrainDecoder || State() == kDrainQueue) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
State(kDrainQueue);
|
||||
lock.Notify();
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Shutdown()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
State(kStopping);
|
||||
lock.Notify();
|
||||
|
||||
while (mThread && State() != kShutdown) {
|
||||
lock.Wait();
|
||||
}
|
||||
|
||||
if (mThread) {
|
||||
mThread->Shutdown();
|
||||
mThread = nullptr;
|
||||
}
|
||||
|
||||
if (mDecoder) {
|
||||
mDecoder->Stop();
|
||||
mDecoder->Release();
|
||||
mDecoder = nullptr;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
} // mozilla
|
||||
|
|
|
|||
|
|
@ -7,18 +7,8 @@
|
|||
|
||||
#include "PlatformDecoderModule.h"
|
||||
|
||||
#include "MediaCodec.h"
|
||||
#include "SurfaceTexture.h"
|
||||
#include "TimeUnits.h"
|
||||
#include "mozilla/Monitor.h"
|
||||
#include "mozilla/Maybe.h"
|
||||
|
||||
#include <deque>
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
typedef std::deque<RefPtr<MediaRawData>> SampleQueue;
|
||||
|
||||
class AndroidDecoderModule : public PlatformDecoderModule {
|
||||
public:
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
|
|
@ -38,100 +28,7 @@ public:
|
|||
DecoderNeedsConversion(const TrackInfo& aConfig) const override;
|
||||
};
|
||||
|
||||
class MediaCodecDataDecoder : public MediaDataDecoder {
|
||||
public:
|
||||
|
||||
MediaCodecDataDecoder(MediaData::Type aType,
|
||||
const nsACString& aMimeType,
|
||||
java::sdk::MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback);
|
||||
|
||||
virtual ~MediaCodecDataDecoder();
|
||||
|
||||
RefPtr<MediaDataDecoder::InitPromise> Init() override;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
const char* GetDescriptionName() const override
|
||||
{
|
||||
return "android decoder";
|
||||
}
|
||||
|
||||
protected:
|
||||
enum ModuleState {
|
||||
kDecoding = 0,
|
||||
kFlushing,
|
||||
kDrainQueue,
|
||||
kDrainDecoder,
|
||||
kDrainWaitEOS,
|
||||
kStopping,
|
||||
kShutdown
|
||||
};
|
||||
|
||||
friend class AndroidDecoderModule;
|
||||
|
||||
static const char* ModuleStateStr(ModuleState aState);
|
||||
|
||||
virtual nsresult InitDecoder(java::sdk::Surface::Param aSurface);
|
||||
|
||||
virtual nsresult Output(java::sdk::BufferInfo::Param aInfo, void* aBuffer,
|
||||
java::sdk::MediaFormat::Param aFormat, const media::TimeUnit& aDuration)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual nsresult PostOutput(java::sdk::BufferInfo::Param aInfo,
|
||||
java::sdk::MediaFormat::Param aFormat, const media::TimeUnit& aDuration)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual void Cleanup() {};
|
||||
|
||||
nsresult ResetInputBuffers();
|
||||
nsresult ResetOutputBuffers();
|
||||
|
||||
nsresult GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer);
|
||||
bool WaitForInput();
|
||||
already_AddRefed<MediaRawData> PeekNextSample();
|
||||
nsresult QueueSample(const MediaRawData* aSample);
|
||||
nsresult QueueEOS();
|
||||
void HandleEOS(int32_t aOutputStatus);
|
||||
Maybe<media::TimeUnit> GetOutputDuration();
|
||||
nsresult ProcessOutput(java::sdk::BufferInfo::Param aInfo,
|
||||
java::sdk::MediaFormat::Param aFormat,
|
||||
int32_t aStatus);
|
||||
ModuleState State() const;
|
||||
// Sets decoder state and returns whether the new state has become effective.
|
||||
bool State(ModuleState aState);
|
||||
void DecoderLoop();
|
||||
|
||||
virtual void ClearQueue();
|
||||
|
||||
MediaData::Type mType;
|
||||
|
||||
nsAutoCString mMimeType;
|
||||
java::sdk::MediaFormat::GlobalRef mFormat;
|
||||
|
||||
MediaDataDecoderCallback* mCallback;
|
||||
|
||||
java::sdk::MediaCodec::GlobalRef mDecoder;
|
||||
|
||||
jni::ObjectArray::GlobalRef mInputBuffers;
|
||||
jni::ObjectArray::GlobalRef mOutputBuffers;
|
||||
|
||||
nsCOMPtr<nsIThread> mThread;
|
||||
|
||||
// Only these members are protected by mMonitor.
|
||||
Monitor mMonitor;
|
||||
|
||||
ModuleState mState;
|
||||
|
||||
SampleQueue mQueue;
|
||||
// Durations are stored in microseconds.
|
||||
std::deque<media::TimeUnit> mDurations;
|
||||
};
|
||||
extern LazyLogModule sAndroidDecoderModuleLog;
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,700 @@
|
|||
/* 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 "MediaCodecDataDecoder.h"
|
||||
|
||||
#include "AndroidBridge.h"
|
||||
#include "AndroidSurfaceTexture.h"
|
||||
#include "GeneratedJNINatives.h"
|
||||
#include "GLImages.h"
|
||||
|
||||
#include "MediaData.h"
|
||||
#include "MediaInfo.h"
|
||||
#include "VPXDecoder.h"
|
||||
|
||||
#include "nsThreadUtils.h"
|
||||
#include "nsPromiseFlatString.h"
|
||||
#include "nsIGfxInfo.h"
|
||||
|
||||
#include "prlog.h"
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
#undef LOG
|
||||
#define LOG(arg, ...) MOZ_LOG(sAndroidDecoderModuleLog, \
|
||||
mozilla::LogLevel::Debug, ("MediaCodecDataDecoder(%p)::%s: " arg, \
|
||||
this, __func__, ##__VA_ARGS__))
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::gl;
|
||||
using namespace mozilla::java;
|
||||
using namespace mozilla::java::sdk;
|
||||
using media::TimeUnit;
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
#define INVOKE_CALLBACK(Func, ...) \
|
||||
if (mCallback) { \
|
||||
mCallback->Func(__VA_ARGS__); \
|
||||
} else { \
|
||||
NS_WARNING("Callback not set"); \
|
||||
}
|
||||
|
||||
static MediaCodec::LocalRef
|
||||
CreateDecoder(const nsACString& aMimeType)
|
||||
{
|
||||
MediaCodec::LocalRef codec;
|
||||
NS_ENSURE_SUCCESS(MediaCodec::CreateDecoderByType(TranslateMimeType(aMimeType),
|
||||
&codec), nullptr);
|
||||
return codec;
|
||||
}
|
||||
|
||||
class VideoDataDecoder : public MediaCodecDataDecoder
|
||||
{
|
||||
public:
|
||||
VideoDataDecoder(const VideoInfo& aConfig,
|
||||
MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback,
|
||||
layers::ImageContainer* aImageContainer)
|
||||
: MediaCodecDataDecoder(MediaData::Type::VIDEO_DATA, aConfig.mMimeType,
|
||||
aFormat, aCallback)
|
||||
, mImageContainer(aImageContainer)
|
||||
, mConfig(aConfig)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
const char* GetDescriptionName() const override
|
||||
{
|
||||
return "Android MediaCodec video decoder";
|
||||
}
|
||||
|
||||
RefPtr<InitPromise> Init() override
|
||||
{
|
||||
mSurfaceTexture = AndroidSurfaceTexture::Create();
|
||||
if (!mSurfaceTexture) {
|
||||
NS_WARNING("Failed to create SurfaceTexture for video decode\n");
|
||||
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
||||
}
|
||||
|
||||
if (NS_FAILED(InitDecoder(mSurfaceTexture->JavaSurface()))) {
|
||||
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
||||
}
|
||||
|
||||
return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__);
|
||||
}
|
||||
|
||||
void Cleanup() override
|
||||
{
|
||||
}
|
||||
|
||||
nsresult Input(MediaRawData* aSample) override
|
||||
{
|
||||
return MediaCodecDataDecoder::Input(aSample);
|
||||
}
|
||||
|
||||
nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat,
|
||||
const TimeUnit& aDuration) override
|
||||
{
|
||||
RefPtr<layers::Image> img =
|
||||
new SurfaceTextureImage(mSurfaceTexture.get(), mConfig.mDisplay,
|
||||
gl::OriginPos::BottomLeft);
|
||||
|
||||
nsresult rv;
|
||||
int32_t flags;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Flags(&flags), rv);
|
||||
|
||||
bool isSync = !!(flags & MediaCodec::BUFFER_FLAG_SYNC_FRAME);
|
||||
|
||||
int32_t offset;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
|
||||
|
||||
int64_t presentationTimeUs;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
|
||||
|
||||
RefPtr<VideoData> v =
|
||||
VideoData::CreateFromImage(mConfig,
|
||||
offset,
|
||||
presentationTimeUs,
|
||||
aDuration.ToMicroseconds(),
|
||||
img,
|
||||
isSync,
|
||||
presentationTimeUs,
|
||||
gfx::IntRect(0, 0,
|
||||
mConfig.mDisplay.width,
|
||||
mConfig.mDisplay.height));
|
||||
INVOKE_CALLBACK(Output, v);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
protected:
|
||||
layers::ImageContainer* mImageContainer;
|
||||
const VideoInfo& mConfig;
|
||||
RefPtr<AndroidSurfaceTexture> mSurfaceTexture;
|
||||
};
|
||||
|
||||
class AudioDataDecoder : public MediaCodecDataDecoder
|
||||
{
|
||||
public:
|
||||
AudioDataDecoder(const AudioInfo& aConfig, MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback)
|
||||
: MediaCodecDataDecoder(MediaData::Type::AUDIO_DATA, aConfig.mMimeType,
|
||||
aFormat, aCallback)
|
||||
{
|
||||
JNIEnv* const env = jni::GetEnvForThread();
|
||||
|
||||
jni::ByteBuffer::LocalRef buffer(env);
|
||||
NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"),
|
||||
&buffer));
|
||||
|
||||
if (!buffer && aConfig.mCodecSpecificConfig->Length() >= 2) {
|
||||
buffer = jni::ByteBuffer::New(
|
||||
aConfig.mCodecSpecificConfig->Elements(),
|
||||
aConfig.mCodecSpecificConfig->Length());
|
||||
NS_ENSURE_SUCCESS_VOID(aFormat->SetByteBuffer(NS_LITERAL_STRING("csd-0"),
|
||||
buffer));
|
||||
}
|
||||
}
|
||||
|
||||
const char* GetDescriptionName() const override
|
||||
{
|
||||
return "android audio decoder";
|
||||
}
|
||||
|
||||
nsresult Output(BufferInfo::Param aInfo, void* aBuffer,
|
||||
MediaFormat::Param aFormat, const TimeUnit& aDuration)
|
||||
{
|
||||
// The output on Android is always 16-bit signed
|
||||
nsresult rv;
|
||||
int32_t numChannels;
|
||||
NS_ENSURE_SUCCESS(rv =
|
||||
aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &numChannels), rv);
|
||||
AudioConfig::ChannelLayout layout(numChannels);
|
||||
if (!layout.IsValid()) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
int32_t sampleRate;
|
||||
NS_ENSURE_SUCCESS(rv =
|
||||
aFormat->GetInteger(NS_LITERAL_STRING("sample-rate"), &sampleRate), rv);
|
||||
|
||||
int32_t size;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Size(&size), rv);
|
||||
|
||||
int32_t offset;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->Offset(&offset), rv);
|
||||
|
||||
#ifdef MOZ_SAMPLE_TYPE_S16
|
||||
const int32_t numSamples = size / 2;
|
||||
#else
|
||||
#error We only support 16-bit integer PCM
|
||||
#endif
|
||||
|
||||
const int32_t numFrames = numSamples / numChannels;
|
||||
AlignedAudioBuffer audio(numSamples);
|
||||
if (!audio) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
const uint8_t* bufferStart = static_cast<uint8_t*>(aBuffer) + offset;
|
||||
PodCopy(audio.get(), reinterpret_cast<const AudioDataValue*>(bufferStart),
|
||||
numSamples);
|
||||
|
||||
int64_t presentationTimeUs;
|
||||
NS_ENSURE_SUCCESS(rv = aInfo->PresentationTimeUs(&presentationTimeUs), rv);
|
||||
|
||||
RefPtr<AudioData> data = new AudioData(0, presentationTimeUs,
|
||||
aDuration.ToMicroseconds(),
|
||||
numFrames,
|
||||
Move(audio),
|
||||
numChannels,
|
||||
sampleRate);
|
||||
INVOKE_CALLBACK(Output, data);
|
||||
return NS_OK;
|
||||
}
|
||||
};
|
||||
|
||||
MediaDataDecoder*
|
||||
MediaCodecDataDecoder::CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback)
|
||||
{
|
||||
return new AudioDataDecoder(aConfig, aFormat, aCallback);
|
||||
}
|
||||
|
||||
MediaDataDecoder*
|
||||
MediaCodecDataDecoder::CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback,
|
||||
layers::ImageContainer* aImageContainer)
|
||||
{
|
||||
return new VideoDataDecoder(aConfig, aFormat, aCallback, aImageContainer);
|
||||
}
|
||||
|
||||
MediaCodecDataDecoder::MediaCodecDataDecoder(MediaData::Type aType,
|
||||
const nsACString& aMimeType,
|
||||
MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback)
|
||||
: mType(aType)
|
||||
, mMimeType(aMimeType)
|
||||
, mFormat(aFormat)
|
||||
, mCallback(aCallback)
|
||||
, mInputBuffers(nullptr)
|
||||
, mOutputBuffers(nullptr)
|
||||
, mMonitor("MediaCodecDataDecoder::mMonitor")
|
||||
, mState(kDecoding)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
MediaCodecDataDecoder::~MediaCodecDataDecoder()
|
||||
{
|
||||
Shutdown();
|
||||
}
|
||||
|
||||
RefPtr<MediaDataDecoder::InitPromise>
|
||||
MediaCodecDataDecoder::Init()
|
||||
{
|
||||
nsresult rv = InitDecoder(nullptr);
|
||||
|
||||
TrackInfo::TrackType type =
|
||||
(mType == MediaData::AUDIO_DATA ? TrackInfo::TrackType::kAudioTrack
|
||||
: TrackInfo::TrackType::kVideoTrack);
|
||||
|
||||
return NS_SUCCEEDED(rv) ?
|
||||
InitPromise::CreateAndResolve(type, __func__) :
|
||||
InitPromise::CreateAndReject(
|
||||
MediaDataDecoder::DecoderFailureReason::INIT_ERROR, __func__);
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::InitDecoder(Surface::Param aSurface)
|
||||
{
|
||||
mDecoder = CreateDecoder(mMimeType);
|
||||
if (!mDecoder) {
|
||||
INVOKE_CALLBACK(Error, MediaDataDecoderError::FATAL_ERROR);
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
nsresult rv;
|
||||
NS_ENSURE_SUCCESS(rv = mDecoder->Configure(mFormat, aSurface, nullptr, 0), rv);
|
||||
NS_ENSURE_SUCCESS(rv = mDecoder->Start(), rv);
|
||||
|
||||
NS_ENSURE_SUCCESS(rv = ResetInputBuffers(), rv);
|
||||
NS_ENSURE_SUCCESS(rv = ResetOutputBuffers(), rv);
|
||||
|
||||
nsCOMPtr<nsIRunnable> r = NewRunnableMethod(this, &MediaCodecDataDecoder::DecoderLoop);
|
||||
rv = NS_NewNamedThread("MC Decoder", getter_AddRefs(mThread), r);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
// This is in usec, so that's 10ms.
|
||||
static const int64_t kDecoderTimeout = 10000;
|
||||
|
||||
#define BREAK_ON_DECODER_ERROR() \
|
||||
if (NS_FAILED(res)) { \
|
||||
NS_WARNING("Exiting decoder loop due to exception"); \
|
||||
if (State() == kDrainDecoder) { \
|
||||
INVOKE_CALLBACK(DrainComplete); \
|
||||
State(kDecoding); \
|
||||
} \
|
||||
INVOKE_CALLBACK(Error, MediaDataDecoderError::FATAL_ERROR); \
|
||||
break; \
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::GetInputBuffer(
|
||||
JNIEnv* aEnv, int aIndex, jni::Object::LocalRef* aBuffer)
|
||||
{
|
||||
MOZ_ASSERT(aEnv);
|
||||
MOZ_ASSERT(!*aBuffer);
|
||||
|
||||
int numTries = 2;
|
||||
|
||||
while (numTries--) {
|
||||
*aBuffer = jni::Object::LocalRef::Adopt(
|
||||
aEnv->GetObjectArrayElement(mInputBuffers.Get(), aIndex));
|
||||
if (*aBuffer) {
|
||||
return NS_OK;
|
||||
}
|
||||
nsresult res = ResetInputBuffers();
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
}
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
bool
|
||||
MediaCodecDataDecoder::WaitForInput()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
while (State() == kDecoding && mQueue.empty()) {
|
||||
// Signal that we require more input.
|
||||
INVOKE_CALLBACK(InputExhausted);
|
||||
lock.Wait();
|
||||
}
|
||||
|
||||
return State() != kStopping;
|
||||
}
|
||||
|
||||
|
||||
already_AddRefed<MediaRawData>
|
||||
MediaCodecDataDecoder::PeekNextSample()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
if (State() == kFlushing) {
|
||||
mDecoder->Flush();
|
||||
ClearQueue();
|
||||
State(kDecoding);
|
||||
lock.Notify();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (mQueue.empty()) {
|
||||
if (State() == kDrainQueue) {
|
||||
State(kDrainDecoder);
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// We're not stopping or flushing, so try to get a sample.
|
||||
return RefPtr<MediaRawData>(mQueue.front()).forget();
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::QueueSample(const MediaRawData* aSample)
|
||||
{
|
||||
MOZ_ASSERT(aSample);
|
||||
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
||||
|
||||
// We have a sample, try to feed it to the decoder.
|
||||
int32_t inputIndex = -1;
|
||||
nsresult res = mDecoder->DequeueInputBuffer(kDecoderTimeout, &inputIndex);
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
|
||||
if (inputIndex < 0) {
|
||||
// There is no valid input buffer available.
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
jni::Object::LocalRef buffer(frame.GetEnv());
|
||||
res = GetInputBuffer(frame.GetEnv(), inputIndex, &buffer);
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
|
||||
void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
|
||||
|
||||
MOZ_ASSERT(frame.GetEnv()->GetDirectBufferCapacity(buffer.Get()) >=
|
||||
aSample->Size(),
|
||||
"Decoder buffer is not large enough for sample");
|
||||
|
||||
PodCopy(static_cast<uint8_t*>(directBuffer), aSample->Data(), aSample->Size());
|
||||
|
||||
res = mDecoder->QueueInputBuffer(inputIndex, 0, aSample->Size(),
|
||||
aSample->mTime, 0);
|
||||
if (NS_FAILED(res)) {
|
||||
return res;
|
||||
}
|
||||
|
||||
mDurations.push_back(TimeUnit::FromMicroseconds(aSample->mDuration));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::QueueEOS()
|
||||
{
|
||||
mMonitor.AssertCurrentThreadOwns();
|
||||
|
||||
nsresult res = NS_OK;
|
||||
int32_t inputIndex = -1;
|
||||
res = mDecoder->DequeueInputBuffer(kDecoderTimeout, &inputIndex);
|
||||
if (NS_FAILED(res) || inputIndex < 0) {
|
||||
return res;
|
||||
}
|
||||
|
||||
res = mDecoder->QueueInputBuffer(inputIndex, 0, 0, 0,
|
||||
MediaCodec::BUFFER_FLAG_END_OF_STREAM);
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
State(kDrainWaitEOS);
|
||||
mMonitor.Notify();
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
void
|
||||
MediaCodecDataDecoder::HandleEOS(int32_t aOutputStatus)
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
if (State() == kDrainWaitEOS) {
|
||||
State(kDecoding);
|
||||
mMonitor.Notify();
|
||||
|
||||
INVOKE_CALLBACK(DrainComplete);
|
||||
}
|
||||
|
||||
mDecoder->ReleaseOutputBuffer(aOutputStatus, false);
|
||||
}
|
||||
|
||||
Maybe<TimeUnit>
|
||||
MediaCodecDataDecoder::GetOutputDuration()
|
||||
{
|
||||
if (mDurations.empty()) {
|
||||
return Nothing();
|
||||
}
|
||||
const Maybe<TimeUnit> duration = Some(mDurations.front());
|
||||
mDurations.pop_front();
|
||||
return duration;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::ProcessOutput(
|
||||
BufferInfo::Param aInfo, MediaFormat::Param aFormat, int32_t aStatus)
|
||||
{
|
||||
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
||||
|
||||
const Maybe<TimeUnit> duration = GetOutputDuration();
|
||||
if (!duration) {
|
||||
// Some devices report failure in QueueSample while actually succeeding at
|
||||
// it, in which case we get an output buffer without having a cached duration
|
||||
// (bug 1273523).
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
const auto buffer = jni::Object::LocalRef::Adopt(
|
||||
frame.GetEnv()->GetObjectArrayElement(mOutputBuffers.Get(), aStatus));
|
||||
|
||||
if (buffer) {
|
||||
// The buffer will be null on Android L if we are decoding to a Surface.
|
||||
void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
|
||||
Output(aInfo, directBuffer, aFormat, duration.value());
|
||||
}
|
||||
|
||||
// The Surface will be updated at this point (for video).
|
||||
mDecoder->ReleaseOutputBuffer(aStatus, true);
|
||||
PostOutput(aInfo, aFormat, duration.value());
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
MediaCodecDataDecoder::DecoderLoop()
|
||||
{
|
||||
bool isOutputDone = false;
|
||||
AutoLocalJNIFrame frame(jni::GetEnvForThread(), 1);
|
||||
MediaFormat::LocalRef outputFormat(frame.GetEnv());
|
||||
nsresult res = NS_OK;
|
||||
|
||||
while (WaitForInput()) {
|
||||
RefPtr<MediaRawData> sample = PeekNextSample();
|
||||
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
if (State() == kDrainDecoder) {
|
||||
MOZ_ASSERT(!sample, "Shouldn't have a sample when pushing EOF frame");
|
||||
res = QueueEOS();
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
}
|
||||
}
|
||||
|
||||
if (sample) {
|
||||
res = QueueSample(sample);
|
||||
if (NS_SUCCEEDED(res)) {
|
||||
// We've fed this into the decoder, so remove it from the queue.
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
MOZ_RELEASE_ASSERT(mQueue.size(), "Queue may not be empty");
|
||||
mQueue.pop_front();
|
||||
isOutputDone = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (isOutputDone) {
|
||||
continue;
|
||||
}
|
||||
|
||||
BufferInfo::LocalRef bufferInfo;
|
||||
nsresult res = BufferInfo::New(&bufferInfo);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
|
||||
int32_t outputStatus = -1;
|
||||
res = mDecoder->DequeueOutputBuffer(bufferInfo, kDecoderTimeout,
|
||||
&outputStatus);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
|
||||
if (outputStatus == MediaCodec::INFO_TRY_AGAIN_LATER) {
|
||||
// We might want to call mCallback->InputExhausted() here, but there seems
|
||||
// to be some possible bad interactions here with the threading.
|
||||
} else if (outputStatus == MediaCodec::INFO_OUTPUT_BUFFERS_CHANGED) {
|
||||
res = ResetOutputBuffers();
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
} else if (outputStatus == MediaCodec::INFO_OUTPUT_FORMAT_CHANGED) {
|
||||
res = mDecoder->GetOutputFormat(ReturnTo(&outputFormat));
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
} else if (outputStatus < 0) {
|
||||
NS_WARNING("Unknown error from decoder!");
|
||||
INVOKE_CALLBACK(Error, MediaDataDecoderError::DECODE_ERROR);
|
||||
// Don't break here just in case it's recoverable. If it's not, other
|
||||
// stuff will fail later and we'll bail out.
|
||||
} else {
|
||||
// We have a valid buffer index >= 0 here.
|
||||
int32_t flags;
|
||||
nsresult res = bufferInfo->Flags(&flags);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
|
||||
if (flags & MediaCodec::BUFFER_FLAG_END_OF_STREAM) {
|
||||
HandleEOS(outputStatus);
|
||||
isOutputDone = true;
|
||||
// We only queue empty EOF frames, so we're done for now.
|
||||
continue;
|
||||
}
|
||||
|
||||
res = ProcessOutput(bufferInfo, outputFormat, outputStatus);
|
||||
BREAK_ON_DECODER_ERROR();
|
||||
}
|
||||
}
|
||||
|
||||
Cleanup();
|
||||
|
||||
// We're done.
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
State(kShutdown);
|
||||
mMonitor.Notify();
|
||||
}
|
||||
|
||||
const char*
|
||||
MediaCodecDataDecoder::ModuleStateStr(ModuleState aState) {
|
||||
static const char* kStr[] = {
|
||||
"Decoding", "Flushing", "DrainQueue", "DrainDecoder", "DrainWaitEOS",
|
||||
"Stopping", "Shutdown"
|
||||
};
|
||||
|
||||
MOZ_ASSERT(aState < sizeof(kStr) / sizeof(kStr[0]));
|
||||
return kStr[aState];
|
||||
}
|
||||
|
||||
MediaCodecDataDecoder::ModuleState
|
||||
MediaCodecDataDecoder::State() const
|
||||
{
|
||||
return mState;
|
||||
}
|
||||
|
||||
bool
|
||||
MediaCodecDataDecoder::State(ModuleState aState)
|
||||
{
|
||||
bool ok = true;
|
||||
|
||||
if (mState == kShutdown) {
|
||||
ok = false;
|
||||
} else if (mState == kStopping) {
|
||||
ok = aState == kShutdown;
|
||||
} else if (aState == kDrainDecoder) {
|
||||
ok = mState == kDrainQueue;
|
||||
} else if (aState == kDrainWaitEOS) {
|
||||
ok = mState == kDrainDecoder;
|
||||
}
|
||||
|
||||
if (ok) {
|
||||
LOG("%s -> %s", ModuleStateStr(mState), ModuleStateStr(aState));
|
||||
mState = aState;
|
||||
}
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
void
|
||||
MediaCodecDataDecoder::ClearQueue()
|
||||
{
|
||||
mMonitor.AssertCurrentThreadOwns();
|
||||
|
||||
mQueue.clear();
|
||||
mDurations.clear();
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Input(MediaRawData* aSample)
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
mQueue.push_back(aSample);
|
||||
lock.NotifyAll();
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::ResetInputBuffers()
|
||||
{
|
||||
return mDecoder->GetInputBuffers(ReturnTo(&mInputBuffers));
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::ResetOutputBuffers()
|
||||
{
|
||||
return mDecoder->GetOutputBuffers(ReturnTo(&mOutputBuffers));
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Flush()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
if (!State(kFlushing)) {
|
||||
return NS_OK;
|
||||
}
|
||||
lock.Notify();
|
||||
|
||||
while (State() == kFlushing) {
|
||||
lock.Wait();
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Drain()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
if (State() == kDrainDecoder || State() == kDrainQueue) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
State(kDrainQueue);
|
||||
lock.Notify();
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
nsresult
|
||||
MediaCodecDataDecoder::Shutdown()
|
||||
{
|
||||
MonitorAutoLock lock(mMonitor);
|
||||
|
||||
State(kStopping);
|
||||
lock.Notify();
|
||||
|
||||
while (mThread && State() != kShutdown) {
|
||||
lock.Wait();
|
||||
}
|
||||
|
||||
if (mThread) {
|
||||
mThread->Shutdown();
|
||||
mThread = nullptr;
|
||||
}
|
||||
|
||||
if (mDecoder) {
|
||||
mDecoder->Stop();
|
||||
mDecoder->Release();
|
||||
mDecoder = nullptr;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
} // mozilla
|
||||
|
|
@ -0,0 +1,127 @@
|
|||
/* 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 MediaCodecDataDecoder_h_
|
||||
#define MediaCodecDataDecoder_h_
|
||||
|
||||
#include "AndroidDecoderModule.h"
|
||||
|
||||
#include "MediaCodec.h"
|
||||
#include "SurfaceTexture.h"
|
||||
#include "TimeUnits.h"
|
||||
#include "mozilla/Monitor.h"
|
||||
#include "mozilla/Maybe.h"
|
||||
|
||||
#include <deque>
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
typedef std::deque<RefPtr<MediaRawData>> SampleQueue;
|
||||
|
||||
class MediaCodecDataDecoder : public MediaDataDecoder {
|
||||
public:
|
||||
static MediaDataDecoder* CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
java::sdk::MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback);
|
||||
|
||||
static MediaDataDecoder* CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
java::sdk::MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback,
|
||||
layers::ImageContainer* aImageContainer);
|
||||
|
||||
virtual ~MediaCodecDataDecoder();
|
||||
|
||||
RefPtr<MediaDataDecoder::InitPromise> Init() override;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
const char* GetDescriptionName() const override
|
||||
{
|
||||
return "Android MediaCodec decoder";
|
||||
}
|
||||
|
||||
protected:
|
||||
enum ModuleState {
|
||||
kDecoding = 0,
|
||||
kFlushing,
|
||||
kDrainQueue,
|
||||
kDrainDecoder,
|
||||
kDrainWaitEOS,
|
||||
kStopping,
|
||||
kShutdown
|
||||
};
|
||||
|
||||
friend class AndroidDecoderModule;
|
||||
|
||||
MediaCodecDataDecoder(MediaData::Type aType,
|
||||
const nsACString& aMimeType,
|
||||
java::sdk::MediaFormat::Param aFormat,
|
||||
MediaDataDecoderCallback* aCallback);
|
||||
|
||||
static const char* ModuleStateStr(ModuleState aState);
|
||||
|
||||
virtual nsresult InitDecoder(java::sdk::Surface::Param aSurface);
|
||||
|
||||
virtual nsresult Output(java::sdk::BufferInfo::Param aInfo, void* aBuffer,
|
||||
java::sdk::MediaFormat::Param aFormat, const media::TimeUnit& aDuration)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual nsresult PostOutput(java::sdk::BufferInfo::Param aInfo,
|
||||
java::sdk::MediaFormat::Param aFormat, const media::TimeUnit& aDuration)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual void Cleanup() {};
|
||||
|
||||
nsresult ResetInputBuffers();
|
||||
nsresult ResetOutputBuffers();
|
||||
|
||||
nsresult GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer);
|
||||
bool WaitForInput();
|
||||
already_AddRefed<MediaRawData> PeekNextSample();
|
||||
nsresult QueueSample(const MediaRawData* aSample);
|
||||
nsresult QueueEOS();
|
||||
void HandleEOS(int32_t aOutputStatus);
|
||||
Maybe<media::TimeUnit> GetOutputDuration();
|
||||
nsresult ProcessOutput(java::sdk::BufferInfo::Param aInfo,
|
||||
java::sdk::MediaFormat::Param aFormat,
|
||||
int32_t aStatus);
|
||||
ModuleState State() const;
|
||||
// Sets decoder state and returns whether the new state has become effective.
|
||||
bool State(ModuleState aState);
|
||||
void DecoderLoop();
|
||||
|
||||
virtual void ClearQueue();
|
||||
|
||||
MediaData::Type mType;
|
||||
|
||||
nsAutoCString mMimeType;
|
||||
java::sdk::MediaFormat::GlobalRef mFormat;
|
||||
|
||||
MediaDataDecoderCallback* mCallback;
|
||||
|
||||
java::sdk::MediaCodec::GlobalRef mDecoder;
|
||||
|
||||
jni::ObjectArray::GlobalRef mInputBuffers;
|
||||
jni::ObjectArray::GlobalRef mOutputBuffers;
|
||||
|
||||
nsCOMPtr<nsIThread> mThread;
|
||||
|
||||
// Only these members are protected by mMonitor.
|
||||
Monitor mMonitor;
|
||||
|
||||
ModuleState mState;
|
||||
|
||||
SampleQueue mQueue;
|
||||
// Durations are stored in microseconds.
|
||||
std::deque<media::TimeUnit> mDurations;
|
||||
};
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
#endif
|
||||
|
|
@ -84,6 +84,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
|||
]
|
||||
UNIFIED_SOURCES += [
|
||||
'android/AndroidDecoderModule.cpp',
|
||||
'android/MediaCodecDataDecoder.cpp',
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче