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

Side by Side Diff: media/filters/gpu_video_decoder.h

Issue 2621153004: media: Fix a GpuVideoDecoder initialization crash on Android (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « no previous file | media/filters/gpu_video_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // For requesting a suface to render to. If this is null the VDA will return 171 // For requesting a suface to render to. If this is null the VDA will return
172 // normal video frames and not render them to a surface. 172 // normal video frames and not render them to a surface.
173 RequestSurfaceCB request_surface_cb_; 173 RequestSurfaceCB request_surface_cb_;
174 174
175 scoped_refptr<MediaLog> media_log_; 175 scoped_refptr<MediaLog> media_log_;
176 176
177 // Populated during Initialize() (on success) and unchanged until an error 177 // Populated during Initialize() (on success) and unchanged until an error
178 // occurs. 178 // occurs.
179 std::unique_ptr<VideoDecodeAccelerator> vda_; 179 std::unique_ptr<VideoDecodeAccelerator> vda_;
180 180
181 // Whether |vda_->Initialize()| has been called.
sandersd (OOO until July 31) 2017/01/11 21:39:58 This is accurate, but hard to interpret with regar
182 bool vda_initialized_;
183
181 InitCB init_cb_; 184 InitCB init_cb_;
182 OutputCB output_cb_; 185 OutputCB output_cb_;
183 186
184 DecodeCB eos_decode_cb_; 187 DecodeCB eos_decode_cb_;
185 188
186 // Not null only during reset. 189 // Not null only during reset.
187 base::Closure pending_reset_cb_; 190 base::Closure pending_reset_cb_;
188 191
189 State state_; 192 State state_;
190 193
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 // Bound to factories_->GetMessageLoop(). 261 // Bound to factories_->GetMessageLoop().
259 // NOTE: Weak pointers must be invalidated before all other member variables. 262 // NOTE: Weak pointers must be invalidated before all other member variables.
260 base::WeakPtrFactory<GpuVideoDecoder> weak_factory_; 263 base::WeakPtrFactory<GpuVideoDecoder> weak_factory_;
261 264
262 DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder); 265 DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
263 }; 266 };
264 267
265 } // namespace media 268 } // namespace media
266 269
267 #endif // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_ 270 #endif // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/gpu_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698