Bug 1282154 - add more override declarations for Android-specific code; r=snorp
authorNathan Froyd <froydnj@gmail.com>
Thu, 21 Jul 2016 16:46:41 -0400
changeset 346199 d7988da78c417062fd44170fe8881308b9803dbc
parent 346198 920b164008c2fd1912761a7625c16e1e80d9e094
child 346200 773e4e7c28cf1941f0ffd87afb36854aa0e5696f
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1282154
milestone50.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
Bug 1282154 - add more override declarations for Android-specific code; r=snorp
dom/media/platforms/android/AndroidDecoderModule.cpp
netwerk/protocol/device/AndroidCaptureProvider.h
--- a/dom/media/platforms/android/AndroidDecoderModule.cpp
+++ b/dom/media/platforms/android/AndroidDecoderModule.cpp
@@ -188,17 +188,17 @@ public:
   }
 
   const char* GetDescriptionName() const override
   {
     return "android audio decoder";
   }
 
   nsresult Output(BufferInfo::Param aInfo, void* aBuffer,
-                  MediaFormat::Param aFormat, const TimeUnit& aDuration)
+                  MediaFormat::Param aFormat, const TimeUnit& aDuration) override
   {
     // The output on Android is always 16-bit signed
     nsresult rv;
     int32_t numChannels;
     NS_ENSURE_SUCCESS(rv =
         aFormat->GetInteger(NS_LITERAL_STRING("channel-count"), &numChannels), rv);
     AudioConfig::ChannelLayout layout(numChannels);
     if (!layout.IsValid()) {
--- a/netwerk/protocol/device/AndroidCaptureProvider.h
+++ b/netwerk/protocol/device/AndroidCaptureProvider.h
@@ -20,34 +20,34 @@ class AndroidCaptureProvider final : pub
   private:
     ~AndroidCaptureProvider();
 
   public:
     AndroidCaptureProvider();
 
     NS_DECL_THREADSAFE_ISUPPORTS
 
-    nsresult Init(nsACString& aContentType, nsCaptureParams* aParams, nsIInputStream** aStream);
+    nsresult Init(nsACString& aContentType, nsCaptureParams* aParams, nsIInputStream** aStream) override;
     static AndroidCaptureProvider* sInstance;
 };
 
 class AndroidCameraInputStream final : public nsIAsyncInputStream, mozilla::net::CameraStreamImpl::FrameCallback {
   private:
     ~AndroidCameraInputStream();
 
   public:
     AndroidCameraInputStream();
 
     NS_IMETHODIMP Init(nsACString& aContentType, nsCaptureParams* aParams);
 
     NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIINPUTSTREAM
     NS_DECL_NSIASYNCINPUTSTREAM
 
-    void ReceiveFrame(char* frame, uint32_t length);
+    void ReceiveFrame(char* frame, uint32_t length) override;
 
   protected:
     void NotifyListeners();
     void doClose();
 
     uint32_t mAvailable;
     nsCString mContentType;
     uint32_t mWidth;