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

Unified Diff: media/filters/frame_processor.h

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/chunk_demuxer.cc ('k') | media/filters/frame_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/frame_processor.h
diff --git a/media/filters/frame_processor.h b/media/filters/frame_processor.h
index e83c2d16de74caff778e97ad1b10a358d2afb7cd..69a313efaff36dc144cf03f4b11eb5623fdc8163 100644
--- a/media/filters/frame_processor.h
+++ b/media/filters/frame_processor.h
@@ -6,6 +6,7 @@
#define MEDIA_FILTERS_FRAME_PROCESSOR_H_
#include <map>
+#include <memory>
#include "base/callback_forward.h"
#include "base/macros.h"
@@ -80,8 +81,6 @@ class MEDIA_EXPORT FrameProcessor {
private:
friend class FrameProcessorTest;
- typedef std::map<StreamParser::TrackId, MseTrackBuffer*> TrackBufferMap;
-
// If |track_buffers_| contains |id|, returns a pointer to the associated
// MseTrackBuffer. Otherwise, returns NULL.
MseTrackBuffer* FindTrack(StreamParser::TrackId id);
@@ -124,7 +123,8 @@ class MEDIA_EXPORT FrameProcessor {
base::TimeDelta* timestamp_offset);
// TrackId-indexed map of each track's stream.
- TrackBufferMap track_buffers_;
+ std::map<StreamParser::TrackId, std::unique_ptr<MseTrackBuffer>>
+ track_buffers_;
// The last audio buffer seen by the frame processor that was removed because
// it was entirely before the start of the append window.
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/frame_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698