author | Jean-Yves Avenard <jyavenard@mozilla.com> |
Mon, 26 Sep 2016 12:33:49 +1000 | |
changeset 315310 | 74cc37d7da2c4f830787a2eb8af5a7543131237f |
parent 315309 | 19e90148741868f6ee0b864696f16147fa121240 |
child 315311 | 77f19f37b30cde2ff3b8eefe8a40e3edf1cd31b4 |
push id | 82125 |
push user | cbook@mozilla.com |
push date | Tue, 27 Sep 2016 09:26:31 +0000 |
treeherder | mozilla-inbound@efca0d71b0c5 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mattwoodrow |
bugs | 1297311 |
milestone | 52.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/ipc/RemoteVideoDecoder.h +++ b/dom/media/ipc/RemoteVideoDecoder.h @@ -56,28 +56,32 @@ private: // protocol class RemoteDecoderModule : public PlatformDecoderModule { public: explicit RemoteDecoderModule(PlatformDecoderModule* aWrapped) : mWrapped(aWrapped) {} - virtual nsresult Startup() override; + nsresult Startup() override; - virtual bool SupportsMimeType(const nsACString& aMimeType, - DecoderDoctorDiagnostics* aDiagnostics) const override; + bool SupportsMimeType(const nsACString& aMimeType, + DecoderDoctorDiagnostics* aDiagnostics) const override; + + ConversionRequired DecoderNeedsConversion( + const TrackInfo& aConfig) const override; - virtual ConversionRequired DecoderNeedsConversion(const TrackInfo& aConfig) const override; + already_AddRefed<MediaDataDecoder> CreateVideoDecoder( + const CreateDecoderParams& aParams) override; - virtual already_AddRefed<MediaDataDecoder> - CreateVideoDecoder(const CreateDecoderParams& aParams) override; - - virtual already_AddRefed<MediaDataDecoder> - CreateAudioDecoder(const CreateDecoderParams& aParams) override { return nullptr; } + already_AddRefed<MediaDataDecoder> CreateAudioDecoder( + const CreateDecoderParams& aParams) override + { + return nullptr; + } private: RefPtr<PlatformDecoderModule> mWrapped; }; } // namespace dom } // namespace mozilla