corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1291045 (Part 3) - Handle interactions with the SurfaceCache in DecodingTask. r=dholbert,edwin

Browse Source
This commit is contained in:
Seth Fowler
2016-08-04 18:59:10 -07:00
parent 35e9d64ec9
commit 2c64c4a4f9
5 changed files with 110 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
image/IDecodingTask.cpp
View File

@@ -6,11 +6,13 @@
#include "IDecodingTask.h"
#include "gfxPrefs.h"
#include "nsProxyRelease.h"
#include "nsThreadUtils.h"
#include "Decoder.h"
#include "DecodePool.h"
#include "RasterImage.h"
#include "SurfaceCache.h"
namespace mozilla {
@@ -88,8 +90,10 @@ IDecodingTask::Resume()
// DecodingTask implementation.
///////////////////////////////////////////////////////////////////////////////
DecodingTask::DecodingTask(NotNull<Decoder*> aDecoder)
: mDecoder(aDecoder)
DecodingTask::DecodingTask(NotNull<RasterImage*> aImage,
NotNull<Decoder*> aDecoder)
: mImage(aImage)
, mDecoder(aDecoder)
{
MOZ_ASSERT(!mDecoder->IsMetadataDecode(),
"Use MetadataDecodingTask for metadata decodes");
@@ -97,34 +101,72 @@ DecodingTask::DecodingTask(NotNull<Decoder*> aDecoder)
"Use AnimationDecodingTask for animation decodes");
}
DecodingTask::~DecodingTask()
{
// RasterImage objects need to be destroyed on the main thread.
RefPtr<RasterImage> image = mImage;
NS_ReleaseOnMainThread(image.forget());
}
void
DecodingTask::Run()
{
while (true) {
LexerResult result = mDecoder->Decode(WrapNotNull(this));
LexerResult result = mDecoder->Decode(WrapNotNull(this));
if (result.is<TerminalState>()) {
NotifyDecodeComplete(mDecoder->GetImage(), mDecoder);
return; // We're done.
// If the decoder hadn't produced a surface up to this point, see if a surface
// is now available.
if (!mSurface) {
mSurface = mDecoder->GetCurrentFrameRef().get();
if (mSurface) {
// There's a new surface available; insert it into the SurfaceCache.
NotNull<RefPtr<ISurfaceProvider>> provider =
WrapNotNull(new SimpleSurfaceProvider(WrapNotNull(mSurface.get())));
InsertOutcome outcome =
SurfaceCache::Insert(provider, ImageKey(mImage.get()),
RasterSurfaceKey(mDecoder->OutputSize(),
mDecoder->GetSurfaceFlags(),
/* aFrameNum = */ 0));
if (outcome == InsertOutcome::FAILURE) {
// We couldn't insert the surface, almost certainly due to low memory. We
// treat this as a permanent error to help the system recover; otherwise,
// we might just end up attempting to decode this image again immediately.
result = mDecoder->TerminateFailure();
} else if (outcome == InsertOutcome::FAILURE_ALREADY_PRESENT) {
// Another decoder beat us to decoding this frame. We abort this decoder
// rather than treat this as a real error.
mDecoder->Abort();
result = mDecoder->TerminateFailure();
}
}
MOZ_ASSERT(result.is<Yield>());
// Notify for the progress we've made so far.
if (mDecoder->HasProgress()) {
NotifyProgress(mDecoder->GetImage(), mDecoder);
}
if (result == LexerResult(Yield::NEED_MORE_DATA)) {
// We can't make any more progress right now. The decoder itself will
// ensure that we get reenqueued when more data is available; just return
// for now.
return;
}
// Right now we don't do anything special for other kinds of yields, so just
// keep working.
}
MOZ_ASSERT(mSurface.get() == mDecoder->GetCurrentFrameRef().get(),
"DecodingTask and Decoder have different surfaces?");
if (result.is<TerminalState>()) {
NotifyDecodeComplete(mImage, mDecoder);
return; // We're done.
}
MOZ_ASSERT(result.is<Yield>());
// Notify for the progress we've made so far.
if (mDecoder->HasProgress()) {
NotifyProgress(mImage, mDecoder);
}
if (result == LexerResult(Yield::NEED_MORE_DATA)) {
// We can't make any more progress right now. The decoder itself will ensure
// that we get reenqueued when more data is available; just return for now.
return;
}
// Other kinds of yields shouldn't happen during single-frame image decodes.
MOZ_ASSERT_UNREACHABLE("Unexpected yield during single-frame image decode");
mDecoder->TerminateFailure();
NotifyDecodeComplete(mImage, mDecoder);
}
bool