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

Unified Diff: media/filters/gpu_video_decoder.cc

Issue 10067035: RefCounted types should not have public destructors, media/ and gpu/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 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/gpu_video_decoder.h ('k') | media/filters/video_frame_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/gpu_video_decoder.cc
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
index 17b46fab8e7a9786f7b9941e746b5934a5a998cd..74b3b1abbdde6e5365249ba54dae330ea149db76 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -58,22 +58,6 @@ GpuVideoDecoder::GpuVideoDecoder(
DCHECK(gvd_loop_proxy_ && factories_);
}
-GpuVideoDecoder::~GpuVideoDecoder() {
- DCHECK(!vda_); // Stop should have been already called.
- DCHECK(pending_read_cb_.is_null());
- for (size_t i = 0; i < available_shm_segments_.size(); ++i) {
- available_shm_segments_[i]->shm->Close();
- delete available_shm_segments_[i];
- }
- available_shm_segments_.clear();
- for (std::map<int32, BufferPair>::iterator it =
- bitstream_buffers_in_decoder_.begin();
- it != bitstream_buffers_in_decoder_.end(); ++it) {
- it->second.shm_buffer->shm->Close();
- }
- bitstream_buffers_in_decoder_.clear();
-}
-
void GpuVideoDecoder::Reset(const base::Closure& closure) {
if (!gvd_loop_proxy_->BelongsToCurrentThread() ||
state_ == kDrainingDecoder) {
@@ -472,6 +456,22 @@ void GpuVideoDecoder::NotifyEndOfBitstreamBuffer(int32 id) {
}
}
+GpuVideoDecoder::~GpuVideoDecoder() {
+ DCHECK(!vda_); // Stop should have been already called.
+ DCHECK(pending_read_cb_.is_null());
+ for (size_t i = 0; i < available_shm_segments_.size(); ++i) {
+ available_shm_segments_[i]->shm->Close();
+ delete available_shm_segments_[i];
+ }
+ available_shm_segments_.clear();
+ for (std::map<int32, BufferPair>::iterator it =
+ bitstream_buffers_in_decoder_.begin();
+ it != bitstream_buffers_in_decoder_.end(); ++it) {
+ it->second.shm_buffer->shm->Close();
+ }
+ bitstream_buffers_in_decoder_.clear();
+}
+
void GpuVideoDecoder::EnsureDemuxOrDecode() {
DCHECK(gvd_loop_proxy_->BelongsToCurrentThread());
if (demuxer_read_in_progress_)
« no previous file with comments | « media/filters/gpu_video_decoder.h ('k') | media/filters/video_frame_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698