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

Bug 952033 - Part d: Use IntSize in MediaDecoder; r=roc

Browse Source
This commit is contained in:
Ms2ger
2014-02-09 09:04:38 +01:00
parent 77d335da23
commit 7de0308a23
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
content/media/MediaDecoderStateMachine.cpp
View File

@@ -39,6 +39,7 @@ namespace mozilla {
using namespace mozilla::layers;
using namespace mozilla::dom;
using namespace mozilla::gfx;
#ifdef PR_LOGGING
extern PRLogModuleInfo* gMediaDecoderLog;
@@ -614,11 +615,12 @@ void MediaDecoderStateMachine::SendStreamAudio(AudioData* aAudio,
}
static void WriteVideoToMediaStream(layers::Image* aImage,
int64_t aDuration, const gfxIntSize& aIntrinsicSize,
int64_t aDuration,
const IntSize& aIntrinsicSize,
VideoSegment* aOutput)
{
nsRefPtr<layers::Image> image = aImage;
aOutput->AppendFrame(image.forget(), aDuration, aIntrinsicSize);
aOutput->AppendFrame(image.forget(), aDuration, ThebesIntSize(aIntrinsicSize));
}
static const TrackID TRACK_AUDIO = 1;
@@ -710,11 +712,11 @@ void MediaDecoderStateMachine::SendStreamData()
mDecoder.get(), v->mTime, mediaStream,
v->GetEndTime() - stream->mNextVideoTime));
WriteVideoToMediaStream(v->mImage,
v->GetEndTime() - stream->mNextVideoTime, ThebesIntSize(v->mDisplay),
v->GetEndTime() - stream->mNextVideoTime, v->mDisplay,
&output);
stream->mNextVideoTime = v->GetEndTime();
stream->mLastVideoImage = v->mImage;
stream->mLastVideoImageDisplaySize = ThebesIntSize(v->mDisplay);
stream->mLastVideoImageDisplaySize = v->mDisplay;
} else {
DECODER_LOG(PR_LOG_DEBUG, ("%p Decoder skipping writing video frame %lldus (end %lldus) to MediaStream",
mDecoder.get(), v->mTime, v->GetEndTime()));