Bug 1073003 - Fix warnings about calling 'delete' on an object of incomplete type. r=jolin
authorBotond Ballo <botond@mozilla.com>
Fri, 02 Jan 2015 17:27:02 -0500
changeset 239306 35801c7c975cd7d8161e71281b54e23fe4a410b2
parent 239305 7a10ad29050eb40110df345e7a865c1320dc02f3
child 239307 10faada5da34939f780e287b46baa800eda02db3
push id7472
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 20:36:27 +0000
treeherdermozilla-aurora@300ca104f8fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjolin
bugs1073003
milestone37.0a1
Bug 1073003 - Fix warnings about calling 'delete' on an object of incomplete type. r=jolin
dom/media/encoder/OmxTrackEncoder.cpp
dom/media/encoder/OmxTrackEncoder.h
--- a/dom/media/encoder/OmxTrackEncoder.cpp
+++ b/dom/media/encoder/OmxTrackEncoder.cpp
@@ -21,16 +21,23 @@
 
 using namespace android;
 
 namespace mozilla {
 
 #define ENCODER_CONFIG_FRAME_RATE 30 // fps
 #define GET_ENCODED_VIDEO_FRAME_TIMEOUT 100000 // microseconds
 
+OmxVideoTrackEncoder::OmxVideoTrackEncoder()
+  : VideoTrackEncoder()
+{}
+
+OmxVideoTrackEncoder::~OmxVideoTrackEncoder()
+{}
+
 nsresult
 OmxVideoTrackEncoder::Init(int aWidth, int aHeight, int aDisplayWidth,
                            int aDisplayHeight, TrackRate aTrackRate)
 {
   mFrameWidth = aWidth;
   mFrameHeight = aHeight;
   mTrackRate = aTrackRate;
   mDisplayWidth = aDisplayWidth;
@@ -157,16 +164,23 @@ OmxVideoTrackEncoder::GetEncodedTrack(En
   if (outFlags & OMXCodecWrapper::BUFFER_EOS) {
     mEncodingComplete = true;
     OMX_LOG("Done encoding video.");
   }
 
   return NS_OK;
 }
 
+OmxAudioTrackEncoder::OmxAudioTrackEncoder()
+  : AudioTrackEncoder()
+{}
+
+OmxAudioTrackEncoder::~OmxAudioTrackEncoder()
+{}
+
 nsresult
 OmxAudioTrackEncoder::AppendEncodedFrames(EncodedFrameContainer& aContainer)
 {
   nsTArray<uint8_t> frameData;
   int outFlags = 0;
   int64_t outTimeUs = -1;
 
   nsresult rv = mEncoder->GetNextEncodedFrame(&frameData, &outTimeUs, &outFlags,
--- a/dom/media/encoder/OmxTrackEncoder.h
+++ b/dom/media/encoder/OmxTrackEncoder.h
@@ -21,19 +21,18 @@ class OMXAudioEncoder;
  * Bean platform.
  */
 
 namespace mozilla {
 
 class OmxVideoTrackEncoder: public VideoTrackEncoder
 {
 public:
-  OmxVideoTrackEncoder()
-    : VideoTrackEncoder()
-  {}
+  OmxVideoTrackEncoder();
+  ~OmxVideoTrackEncoder();
 
   already_AddRefed<TrackMetadataBase> GetMetadata() MOZ_OVERRIDE;
 
   nsresult GetEncodedTrack(EncodedFrameContainer& aData) MOZ_OVERRIDE;
 
 protected:
   nsresult Init(int aWidth, int aHeight,
                 int aDisplayWidth, int aDisplayHeight,
@@ -41,19 +40,18 @@ protected:
 
 private:
   nsAutoPtr<android::OMXVideoEncoder> mEncoder;
 };
 
 class OmxAudioTrackEncoder : public AudioTrackEncoder
 {
 public:
-  OmxAudioTrackEncoder()
-    : AudioTrackEncoder()
-  {}
+  OmxAudioTrackEncoder();
+  ~OmxAudioTrackEncoder();
 
   already_AddRefed<TrackMetadataBase> GetMetadata() = 0;
 
   nsresult GetEncodedTrack(EncodedFrameContainer& aData) MOZ_OVERRIDE;
 
 protected:
   nsresult Init(int aChannels, int aSamplingRate) = 0;