зеркало из https://github.com/mozilla/gecko-dev.git
bug 962719 use unsigned ints for FrameID and ProducerID for defined overflow behavior r=roc
--HG-- extra : rebase_source : 0375f04a60a548975547b80e60e5cf5dada2f86f
This commit is contained in:
Родитель
795135daf2
Коммит
ea84d39947
|
@ -308,7 +308,7 @@ public:
|
||||||
bool aKeyframe,
|
bool aKeyframe,
|
||||||
int64_t aTimecode,
|
int64_t aTimecode,
|
||||||
IntSize aDisplay,
|
IntSize aDisplay,
|
||||||
int32_t aFrameID);
|
uint32_t aFrameID);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
~VideoData();
|
~VideoData();
|
||||||
|
|
|
@ -2541,7 +2541,7 @@ void MediaDecoderStateMachine::RenderVideoFrames(int32_t aMaxFrames,
|
||||||
img->mFrameID = frame->mFrameID;
|
img->mFrameID = frame->mFrameID;
|
||||||
img->mProducerID = mProducerID;
|
img->mProducerID = mProducerID;
|
||||||
|
|
||||||
VERBOSE_LOG("playing video frame %lld (id=%d) (queued=%i, state-machine=%i, decoder-queued=%i)",
|
VERBOSE_LOG("playing video frame %lld (id=%x) (queued=%i, state-machine=%i, decoder-queued=%i)",
|
||||||
frame->mTime, frame->mFrameID,
|
frame->mTime, frame->mFrameID,
|
||||||
VideoQueue().GetSize() + mReader->SizeOfVideoQueueInFrames(),
|
VideoQueue().GetSize() + mReader->SizeOfVideoQueueInFrames(),
|
||||||
VideoQueue().GetSize(), mReader->SizeOfVideoQueueInFrames());
|
VideoQueue().GetSize(), mReader->SizeOfVideoQueueInFrames());
|
||||||
|
|
|
@ -288,8 +288,8 @@ public:
|
||||||
|
|
||||||
explicit ImageContainer(ImageContainer::Mode flag = SYNCHRONOUS);
|
explicit ImageContainer(ImageContainer::Mode flag = SYNCHRONOUS);
|
||||||
|
|
||||||
typedef int32_t FrameID;
|
typedef uint32_t FrameID;
|
||||||
typedef int32_t ProducerID;
|
typedef uint32_t ProducerID;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -392,8 +392,8 @@ struct TimedTexture {
|
||||||
MaybeFence fence;
|
MaybeFence fence;
|
||||||
TimeStamp timeStamp;
|
TimeStamp timeStamp;
|
||||||
IntRect picture;
|
IntRect picture;
|
||||||
int32_t frameID;
|
uint32_t frameID;
|
||||||
int32_t producerID;
|
uint32_t producerID;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -487,8 +487,8 @@ struct ImageCompositeNotification {
|
||||||
PImageContainer imageContainer;
|
PImageContainer imageContainer;
|
||||||
TimeStamp imageTimeStamp;
|
TimeStamp imageTimeStamp;
|
||||||
TimeStamp firstCompositeTimeStamp;
|
TimeStamp firstCompositeTimeStamp;
|
||||||
int32_t frameID;
|
uint32_t frameID;
|
||||||
int32_t producerID;
|
uint32_t producerID;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Unit of a "changeset reply". This is a weird abstraction, probably
|
// Unit of a "changeset reply". This is a weird abstraction, probably
|
||||||
|
|
Загрузка…
Ссылка в новой задаче