Bug 1043695 - Wrap FrameRef in an nsAutoPtr. r=cpearce

Everything else auto-releases, might as well do this too.

content/media/fmp4/apple/AppleVTDecoder.cpp

@@ -159,8 +159,6 @@ PlatformCallback(void* decompressionOutputRefCon,
                  CMTime presentationTimeStamp,
                  CMTime presentationDuration)
 {
-  AppleVTDecoder* decoder = static_cast<AppleVTDecoder*>(decompressionOutputRefCon);
-
   LOG("AppleVideoDecoder %s status %d flags %d", __func__, status, flags);
 
   // Validate our arguments.
@@ -176,14 +174,17 @@ PlatformCallback(void* decompressionOutputRefCon,
 
   // Forward the data back to an object method which can access
   // the correct MP4Reader callback.
-  FrameRef* frameRef = static_cast<FrameRef*>(sourceFrameRefCon);
+  AppleVTDecoder* decoder =
+    static_cast<AppleVTDecoder*>(decompressionOutputRefCon);
+  nsAutoPtr<FrameRef> frameRef =
+    nsAutoPtr<FrameRef>(static_cast<FrameRef*>(sourceFrameRefCon));
   decoder->OutputFrame(image, frameRef);
 }
 
 // Copy and return a decoded frame.
 nsresult
 AppleVTDecoder::OutputFrame(CVPixelBufferRef aImage,
-                            FrameRef* aFrameRef)
+                            nsAutoPtr<FrameRef> aFrameRef)
 {
   size_t width = CVPixelBufferGetWidth(aImage);
   size_t height = CVPixelBufferGetHeight(aImage);
@@ -262,7 +263,6 @@ AppleVTDecoder::OutputFrame(CVPixelBufferRef aImage,
   CVPixelBufferUnlockBaseAddress(aImage, kCVPixelBufferLock_ReadOnly);
 
   mCallback->Output(data.forget());
-  delete aFrameRef;
   return NS_OK;
 }
 

content/media/fmp4/apple/AppleVTDecoder.h

@@ -36,7 +36,7 @@ public:
   virtual nsresult Shutdown() MOZ_OVERRIDE;
   // Return hook for VideoToolbox callback.
   nsresult OutputFrame(CVPixelBufferRef aImage,
-                       FrameRef* frameRef);
+                       nsAutoPtr<FrameRef> frameRef);
 private:
   const mp4_demuxer::VideoDecoderConfig& mConfig;
   RefPtr<MediaTaskQueue> mTaskQueue;