summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-28 04:08:08 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-28 04:08:08 +0000
commit39c36df426e55c3705c138b0596a59e976aa728f (patch)
tree31e04e5be1b978d9b6d65f5c32ec1a86c2ea97d8 /media
parentd848820ff4a1324245f070b77daa22d0daea66cf (diff)
downloadchromium_src-39c36df426e55c3705c138b0596a59e976aa728f.zip
chromium_src-39c36df426e55c3705c138b0596a59e976aa728f.tar.gz
chromium_src-39c36df426e55c3705c138b0596a59e976aa728f.tar.bz2
Cleanup: Remove ScopedGenericObj usage in media/.
Review URL: https://chromiumcodereview.appspot.com/15659006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/webm/chromeos/webm_encoder.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/media/webm/chromeos/webm_encoder.cc b/media/webm/chromeos/webm_encoder.cc
index 26dcdac..af4d871 100644
--- a/media/webm/chromeos/webm_encoder.cc
+++ b/media/webm/chromeos/webm_encoder.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/memory/scoped_generic_obj.h"
+#include "base/memory/scoped_ptr.h"
#include "libyuv/convert.h"
#include "libyuv/video_common.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -36,16 +36,14 @@ static void Ebml_SerializeUnsigned32(EbmlGlobal* ebml,
}
// Wrapper functor for vpx_codec_destroy().
-class VpxCodecDestroyHelper {
- public:
+struct VpxCodecDeleter {
void operator()(vpx_codec_ctx_t* codec) {
vpx_codec_destroy(codec);
}
};
// Wrapper functor for vpx_img_free().
-class VpxImgFreeHelper {
- public:
+struct VpxImgDeleter {
void operator()(vpx_image_t* image) {
vpx_img_free(image);
}
@@ -89,7 +87,7 @@ bool WebmEncoder::EncodeFromSprite(const SkBitmap& sprite,
vpx_image_t image;
vpx_img_alloc(&image, VPX_IMG_FMT_I420, width_, height_, 16);
// Ensure that image is freed after return.
- ScopedGenericObj<vpx_image_t*, VpxImgFreeHelper> image_ptr(&image);
+ scoped_ptr<vpx_image_t, VpxImgDeleter> image_ptr(&image);
const vpx_codec_iface_t* codec_iface = vpx_codec_vp8_cx();
DCHECK(codec_iface);
@@ -113,7 +111,7 @@ bool WebmEncoder::EncodeFromSprite(const SkBitmap& sprite,
if (ret != VPX_CODEC_OK)
return false;
// Ensure that codec context is freed after return.
- ScopedGenericObj<vpx_codec_ctx_t*, VpxCodecDestroyHelper> codec_ptr(&codec);
+ scoped_ptr<vpx_codec_ctx_t, VpxCodecDeleter> codec_ptr(&codec);
SkAutoLockPixels lock_sprite(sprite);