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

Side by Side Diff: content/renderer/pepper/pepper_video_decoder_host.h

Issue 2705073003: Remove ScopedVector from content/renderer/. (Closed)
Patch Set: Rebase only Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <list> 10 #include <list>
11 #include <map> 11 #include <map>
12 #include <memory> 12 #include <memory>
13 #include <set> 13 #include <set>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/containers/hash_tables.h" 16 #include "base/containers/hash_tables.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/scoped_vector.h"
19 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
20 #include "media/video/video_decode_accelerator.h" 19 #include "media/video/video_decode_accelerator.h"
21 #include "ppapi/c/pp_codecs.h" 20 #include "ppapi/c/pp_codecs.h"
22 #include "ppapi/host/host_message_context.h" 21 #include "ppapi/host/host_message_context.h"
23 #include "ppapi/host/resource_host.h" 22 #include "ppapi/host/resource_host.h"
24 #include "ppapi/proxy/resource_message_params.h" 23 #include "ppapi/proxy/resource_message_params.h"
25 24
26 namespace base { 25 namespace base {
27 class SharedMemory; 26 class SharedMemory;
28 } 27 }
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 int pending_texture_requests_ = 0; 127 int pending_texture_requests_ = 0;
129 128
130 // Set after software decoder fallback to dismiss all outstanding texture 129 // Set after software decoder fallback to dismiss all outstanding texture
131 // requests. 130 // requests.
132 int assign_textures_messages_to_dismiss_ = 0; 131 int assign_textures_messages_to_dismiss_ = 0;
133 132
134 // A vector holding our shm buffers, in sync with a similar vector in the 133 // A vector holding our shm buffers, in sync with a similar vector in the
135 // resource. We use a buffer's index in these vectors as its id on both sides 134 // resource. We use a buffer's index in these vectors as its id on both sides
136 // of the proxy. Only add buffers or update them in place so as not to 135 // of the proxy. Only add buffers or update them in place so as not to
137 // invalidate these ids. 136 // invalidate these ids.
138 ScopedVector<base::SharedMemory> shm_buffers_; 137 std::vector<std::unique_ptr<base::SharedMemory>> shm_buffers_;
139 // A vector of true/false indicating if a shm buffer is in use by the decoder. 138 // A vector of true/false indicating if a shm buffer is in use by the decoder.
140 // This is parallel to |shm_buffers_|. 139 // This is parallel to |shm_buffers_|.
141 std::vector<uint8_t> shm_buffer_busy_; 140 std::vector<uint8_t> shm_buffer_busy_;
142 141
143 uint32_t min_picture_count_; 142 uint32_t min_picture_count_;
144 typedef std::map<uint32_t, PictureBufferState> PictureBufferMap; 143 typedef std::map<uint32_t, PictureBufferState> PictureBufferMap;
145 PictureBufferMap picture_buffer_map_; 144 PictureBufferMap picture_buffer_map_;
146 145
147 // Keeps list of pending decodes. 146 // Keeps list of pending decodes.
148 PendingDecodeList pending_decodes_; 147 PendingDecodeList pending_decodes_;
149 148
150 ppapi::host::ReplyMessageContext flush_reply_context_; 149 ppapi::host::ReplyMessageContext flush_reply_context_;
151 ppapi::host::ReplyMessageContext reset_reply_context_; 150 ppapi::host::ReplyMessageContext reset_reply_context_;
152 151
153 bool initialized_ = false; 152 bool initialized_ = false;
154 153
155 DISALLOW_COPY_AND_ASSIGN(PepperVideoDecoderHost); 154 DISALLOW_COPY_AND_ASSIGN(PepperVideoDecoderHost);
156 }; 155 };
157 156
158 } // namespace content 157 } // namespace content
159 158
160 #endif // CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_ 159 #endif // CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_DECODER_HOST_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_url_loader_host.cc ('k') | content/renderer/pepper/pepper_video_decoder_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698