Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1486)

Unified Diff: media/filters/vpx_video_decoder.cc

Issue 2371783002: Remove stl_util's deletion functions from media/. (Closed)
Patch Set: wolenetz Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/media_source_state.cc ('k') | media/formats/mp2t/mp2t_stream_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/vpx_video_decoder.cc
diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
index e95de6d068104c1d7a0426c3a213b3d361c5b6d1..41d9d6af7f113b47ae7bcd1a896e37739b70d12e 100644
--- a/media/filters/vpx_video_decoder.cc
+++ b/media/filters/vpx_video_decoder.cc
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <algorithm>
+#include <memory>
#include <string>
#include <vector>
@@ -18,8 +19,8 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/sys_byteorder.h"
#include "base/sys_info.h"
@@ -223,7 +224,7 @@ class VpxVideoDecoder::MemoryPool
void OnVideoFrameDestroyed(VP9FrameBuffer* frame_buffer);
// Frame buffers to be used by libvpx for VP9 Decoding.
- std::vector<VP9FrameBuffer*> frame_buffers_;
+ std::vector<std::unique_ptr<VP9FrameBuffer>> frame_buffers_;
DISALLOW_COPY_AND_ASSIGN(MemoryPool);
};
@@ -234,7 +235,6 @@ VpxVideoDecoder::MemoryPool::MemoryPool() {
}
VpxVideoDecoder::MemoryPool::~MemoryPool() {
- base::STLDeleteElements(&frame_buffers_);
base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
this);
}
@@ -250,13 +250,13 @@ VpxVideoDecoder::MemoryPool::GetFreeFrameBuffer(size_t min_size) {
if (i == frame_buffers_.size()) {
// Create a new frame buffer.
- frame_buffers_.push_back(new VP9FrameBuffer());
+ frame_buffers_.push_back(base::MakeUnique<VP9FrameBuffer>());
}
// Resize the frame buffer if necessary.
if (frame_buffers_[i]->data.size() < min_size)
frame_buffers_[i]->data.resize(min_size);
- return frame_buffers_[i];
+ return frame_buffers_[i].get();
}
int32_t VpxVideoDecoder::MemoryPool::GetVP9FrameBuffer(
@@ -317,7 +317,7 @@ bool VpxVideoDecoder::MemoryPool::OnMemoryDump(
->system_allocator_pool_name());
size_t bytes_used = 0;
size_t bytes_reserved = 0;
- for (const VP9FrameBuffer* frame_buffer : frame_buffers_) {
+ for (const auto& frame_buffer : frame_buffers_) {
if (frame_buffer->ref_cnt)
bytes_used += frame_buffer->data.size();
bytes_reserved += frame_buffer->data.size();
« no previous file with comments | « media/filters/media_source_state.cc ('k') | media/formats/mp2t/mp2t_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698