wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 946027 - Expose subdecoder's owner to avoid breaking DXVA decoding in MSE. r=cpearce

Browse Source
This commit is contained in:
Matthew Gregan 2014-04-27 17:36:00 +12:00
parent a8aafa5022
commit 2ffe11f586
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/media/BufferDecoder.h
View File

@ -72,7 +72,7 @@ public:
virtual void OnReadMetadataCompleted() MOZ_FINAL MOZ_OVERRIDE; virtual void OnReadMetadataCompleted() MOZ_FINAL MOZ_OVERRIDE;
virtual MediaDecoderOwner* GetOwner() MOZ_FINAL MOZ_OVERRIDE; virtual MediaDecoderOwner* GetOwner() MOZ_OVERRIDE;
virtual void NotifyWaitingForResourcesStatusChanged() MOZ_FINAL MOZ_OVERRIDE; virtual void NotifyWaitingForResourcesStatusChanged() MOZ_FINAL MOZ_OVERRIDE;

6
content/media/mediasource/SourceBuffer.cpp
View File

@ -96,6 +96,12 @@ SubBufferDecoder::GetImageContainer()
return mParentDecoder->GetImageContainer(); return mParentDecoder->GetImageContainer();
} }
MediaDecoderOwner*
SubBufferDecoder::GetOwner()
{
return mParentDecoder->GetOwner();
}
int64_t int64_t
SubBufferDecoder::ConvertToByteOffset(double aTime) SubBufferDecoder::ConvertToByteOffset(double aTime)
{ {

1
content/media/mediasource/SubBufferDecoder.h
View File

@ -44,6 +44,7 @@ public:
virtual void SetMediaSeekable(bool aMediaSeekable) MOZ_OVERRIDE; virtual void SetMediaSeekable(bool aMediaSeekable) MOZ_OVERRIDE;
virtual void SetTransportSeekable(bool aTransportSeekable) MOZ_OVERRIDE; virtual void SetTransportSeekable(bool aTransportSeekable) MOZ_OVERRIDE;
virtual layers::ImageContainer* GetImageContainer() MOZ_OVERRIDE; virtual layers::ImageContainer* GetImageContainer() MOZ_OVERRIDE;
virtual MediaDecoderOwner* GetOwner() MOZ_OVERRIDE;
void NotifyDataArrived(const char* aBuffer, uint32_t aLength, int64_t aOffset) void NotifyDataArrived(const char* aBuffer, uint32_t aLength, int64_t aOffset)
{ {