mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 715323 - Make offset paramater in NotifyDataArrived PRInt64 r=cpearce
This commit is contained in:
parent
4e7ddb3e08
commit
6a271f929d
@ -333,7 +333,7 @@ public:
|
|||||||
virtual PRInt64 VideoQueueMemoryInUse() = 0;
|
virtual PRInt64 VideoQueueMemoryInUse() = 0;
|
||||||
virtual PRInt64 AudioQueueMemoryInUse() = 0;
|
virtual PRInt64 AudioQueueMemoryInUse() = 0;
|
||||||
|
|
||||||
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset) = 0;
|
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset) = 0;
|
||||||
|
|
||||||
// Causes the state machine to switch to buffering state, and to
|
// Causes the state machine to switch to buffering state, and to
|
||||||
// immediately stop playback and buffer downloaded data. Must be called
|
// immediately stop playback and buffer downloaded data. Must be called
|
||||||
@ -504,7 +504,7 @@ class nsBuiltinDecoder : public nsMediaDecoder
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset) {
|
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset) {
|
||||||
if (mDecoderStateMachine) {
|
if (mDecoderStateMachine) {
|
||||||
mDecoderStateMachine->NotifyDataArrived(aBuffer, aLength, aOffset);
|
mDecoderStateMachine->NotifyDataArrived(aBuffer, aLength, aOffset);
|
||||||
}
|
}
|
||||||
|
@ -498,7 +498,7 @@ public:
|
|||||||
|
|
||||||
// Only used by nsWebMReader for now, so stub here rather than in every
|
// Only used by nsWebMReader for now, so stub here rather than in every
|
||||||
// reader than inherits from nsBuiltinDecoderReader.
|
// reader than inherits from nsBuiltinDecoderReader.
|
||||||
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset) {}
|
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset) {}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
@ -1216,7 +1216,7 @@ void nsBuiltinDecoderStateMachine::ResetPlayback()
|
|||||||
|
|
||||||
void nsBuiltinDecoderStateMachine::NotifyDataArrived(const char* aBuffer,
|
void nsBuiltinDecoderStateMachine::NotifyDataArrived(const char* aBuffer,
|
||||||
PRUint32 aLength,
|
PRUint32 aLength,
|
||||||
PRUint32 aOffset)
|
PRInt64 aOffset)
|
||||||
{
|
{
|
||||||
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
|
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
|
||||||
mReader->NotifyDataArrived(aBuffer, aLength, aOffset);
|
mReader->NotifyDataArrived(aBuffer, aLength, aOffset);
|
||||||
|
@ -223,7 +223,7 @@ public:
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset);
|
void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset);
|
||||||
|
|
||||||
PRInt64 GetEndMediaTime() const {
|
PRInt64 GetEndMediaTime() const {
|
||||||
mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
|
mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
|
||||||
|
@ -335,7 +335,7 @@ public:
|
|||||||
|
|
||||||
// Called as data arrives on the stream and is read into the cache. Called
|
// Called as data arrives on the stream and is read into the cache. Called
|
||||||
// on the main thread only.
|
// on the main thread only.
|
||||||
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset) = 0;
|
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset) = 0;
|
||||||
|
|
||||||
// Cleanup internal data structures. Must be called on the main
|
// Cleanup internal data structures. Must be called on the main
|
||||||
// thread by the owning object before that object disposes of this object.
|
// thread by the owning object before that object disposes of this object.
|
||||||
|
@ -257,7 +257,7 @@ void nsWebMBufferedState::CalculateBufferedForRange(nsTimeRanges* aBuffered,
|
|||||||
aBuffered->Add(startTime, endTime);
|
aBuffered->Add(startTime, endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
void nsWebMBufferedState::NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset)
|
void nsWebMBufferedState::NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset)
|
||||||
{
|
{
|
||||||
NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
|
NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
|
||||||
PRUint32 idx;
|
PRUint32 idx;
|
||||||
|
@ -224,7 +224,7 @@ public:
|
|||||||
MOZ_COUNT_DTOR(nsWebMBufferedState);
|
MOZ_COUNT_DTOR(nsWebMBufferedState);
|
||||||
}
|
}
|
||||||
|
|
||||||
void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset);
|
void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset);
|
||||||
void CalculateBufferedForRange(nsTimeRanges* aBuffered,
|
void CalculateBufferedForRange(nsTimeRanges* aBuffered,
|
||||||
PRInt64 aStartOffset, PRInt64 aEndOffset,
|
PRInt64 aStartOffset, PRInt64 aEndOffset,
|
||||||
PRUint64 aTimecodeScale,
|
PRUint64 aTimecodeScale,
|
||||||
|
@ -800,7 +800,7 @@ nsresult nsWebMReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void nsWebMReader::NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset)
|
void nsWebMReader::NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset)
|
||||||
{
|
{
|
||||||
mBufferedState->NotifyDataArrived(aBuffer, aLength, aOffset);
|
mBufferedState->NotifyDataArrived(aBuffer, aLength, aOffset);
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,7 @@ public:
|
|||||||
virtual nsresult ReadMetadata(nsVideoInfo* aInfo);
|
virtual nsresult ReadMetadata(nsVideoInfo* aInfo);
|
||||||
virtual nsresult Seek(PRInt64 aTime, PRInt64 aStartTime, PRInt64 aEndTime, PRInt64 aCurrentTime);
|
virtual nsresult Seek(PRInt64 aTime, PRInt64 aStartTime, PRInt64 aEndTime, PRInt64 aCurrentTime);
|
||||||
virtual nsresult GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime);
|
virtual nsresult GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime);
|
||||||
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRUint32 aOffset);
|
virtual void NotifyDataArrived(const char* aBuffer, PRUint32 aLength, PRInt64 aOffset);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Value passed to NextPacket to determine if we are reading a video or an
|
// Value passed to NextPacket to determine if we are reading a video or an
|
||||||
|
Loading…
Reference in New Issue
Block a user