Convert scoped_ptr_malloc -> scoped_ptr, part 5.

media/ffmpeg/ffmpeg_common.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
 
 // Used for FFmpeg error codes.
 #include <cerrno>
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
+#include "media/ffmpeg/ffmpeg_deleters.h"
 
 // Include FFmpeg header files.
 extern "C" {
 // Temporarily disable possible loss of data warning.
 // TODO(scherkus): fix and upstream the compiler warnings.
 MSVC_PUSH_DISABLE_WARNING(4244);
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 #include <libavutil/audioconvert.h>
 #include <libavutil/avutil.h>
 #include <libavutil/mathematics.h>
 #include <libavutil/log.h>
 #include <libavutil/imgutils.h>
 MSVC_POP_WARNING();
 }  // extern "C"
 
 namespace media {
 
 class AudioDecoderConfig;
 class VideoDecoderConfig;
 
-// Wraps FFmpeg's av_free() in a class that can be passed as a template argument
-// to scoped_ptr_malloc.
-class ScopedPtrAVFree {
- public:
-  inline void operator()(void* x) const {
-    av_free(x);
-  }
-};
+// The following implement the deleters declared in ffmpeg_deleters.h (which
+// contains the declarations needed for use with |scoped_ptr| without #include
+// "pollution").
 
-// This assumes that the AVPacket being captured was allocated outside of
-// FFmpeg via the new operator.  Do not use this with AVPacket instances that
-// are allocated via malloc() or av_malloc().
-class ScopedPtrAVFreePacket {
- public:
-  inline void operator()(void* x) const {
-    AVPacket* packet = static_cast<AVPacket*>(x);
-    av_free_packet(packet);
-    delete packet;
-  }
-};
+inline void ScopedPtrAVFree::operator()(void* x) const {
+  av_free(x);
+}
 
-// Frees an AVCodecContext object in a class that can be passed as a Deleter
-// argument to scoped_ptr_malloc.
-class ScopedPtrAVFreeContext {
- public:
-  inline void operator()(void* x) const {
-    AVCodecContext* codec_context = static_cast<AVCodecContext*>(x);
-    av_free(codec_context->extradata);
-    avcodec_close(codec_context);
-    av_free(codec_context);
-  }
-};
+inline void ScopedPtrAVFreePacket::operator()(void* x) const {
+  AVPacket* packet = static_cast<AVPacket*>(x);
+  av_free_packet(packet);
+  delete packet;
+}
 
-// Frees an AVFrame object in a class that can be passed as a Deleter argument
-// to scoped_ptr_malloc.
-class ScopedPtrAVFreeFrame {
- public:
-  inline void operator()(void* x) const {
-    AVFrame* frame = static_cast<AVFrame*>(x);
-    avcodec_free_frame(&frame);
-  }
-};
+inline void ScopedPtrAVFreeContext::operator()(void* x) const {
+  AVCodecContext* codec_context = static_cast<AVCodecContext*>(x);
+  av_free(codec_context->extradata);
+  avcodec_close(codec_context);
+  av_free(codec_context);
+}
+
+inline void ScopedPtrAVFreeFrame::operator()(void* x) const {
+  AVFrame* frame = static_cast<AVFrame*>(x);
+  avcodec_free_frame(&frame);
+}
 
 // Converts an int64 timestamp in |time_base| units to a base::TimeDelta.
 // For example if |timestamp| equals 11025 and |time_base| equals {1, 44100}
 // then the return value will be a base::TimeDelta for 0.25 seconds since that
 // is how much time 11025/44100ths of a second represents.
 MEDIA_EXPORT base::TimeDelta ConvertFromTimeBase(const AVRational& time_base,
                                                  int64 timestamp);
 
 // Converts a base::TimeDelta into an int64 timestamp in |time_base| units.
 // For example if |timestamp| is 0.5 seconds and |time_base| is {1, 44100}, then
@@ skipping 30 matching lines @@
 
 // Converts FFmpeg's pixel formats to its corresponding supported video format.
 VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format);
 
 // Converts video formats to its corresponding FFmpeg's pixel formats.
 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format);
 
 }  // namespace media
 
 #endif  // MEDIA_FFMPEG_FFMPEG_COMMON_H_