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

Side by Side Diff: content/renderer/media/android/media_source_delegate.cc

Issue 841453006: Fix WeakPtrFactory members in Android media classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/renderer/media/android/media_source_delegate.h" 5 #include "content/renderer/media/android/media_source_delegate.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 video_stream_(NULL), 58 video_stream_(NULL),
59 seeking_(false), 59 seeking_(false),
60 is_video_encrypted_(false), 60 is_video_encrypted_(false),
61 doing_browser_seek_(false), 61 doing_browser_seek_(false),
62 browser_seek_time_(media::kNoTimestamp()), 62 browser_seek_time_(media::kNoTimestamp()),
63 expecting_regular_seek_(false), 63 expecting_regular_seek_(false),
64 access_unit_size_(0), 64 access_unit_size_(0),
65 main_task_runner_(base::MessageLoopProxy::current()), 65 main_task_runner_(base::MessageLoopProxy::current()),
66 media_task_runner_(media_task_runner), 66 media_task_runner_(media_task_runner),
67 main_weak_factory_(this), 67 main_weak_factory_(this),
68 media_weak_factory_(this), 68 media_weak_factory_(this) {
69 main_weak_this_(main_weak_factory_.GetWeakPtr()) { 69 main_weak_this_ = main_weak_factory_.GetWeakPtr();
70 DCHECK(main_task_runner_->BelongsToCurrentThread()); 70 DCHECK(main_task_runner_->BelongsToCurrentThread());
71 } 71 }
72 72
73 MediaSourceDelegate::~MediaSourceDelegate() { 73 MediaSourceDelegate::~MediaSourceDelegate() {
74 DCHECK(main_task_runner_->BelongsToCurrentThread()); 74 DCHECK(main_task_runner_->BelongsToCurrentThread());
75 DVLOG(1) << __FUNCTION__ << " : " << demuxer_client_id_; 75 DVLOG(1) << __FUNCTION__ << " : " << demuxer_client_id_;
76 DCHECK(!chunk_demuxer_); 76 DCHECK(!chunk_demuxer_);
77 DCHECK(!demuxer_client_); 77 DCHECK(!demuxer_client_);
78 DCHECK(!audio_decrypting_demuxer_stream_); 78 DCHECK(!audio_decrypting_demuxer_stream_);
79 DCHECK(!video_decrypting_demuxer_stream_); 79 DCHECK(!video_decrypting_demuxer_stream_);
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 configs->video_size = config.natural_size(); 744 configs->video_size = config.natural_size();
745 configs->is_video_encrypted = config.is_encrypted(); 745 configs->is_video_encrypted = config.is_encrypted();
746 configs->video_extra_data = std::vector<uint8>( 746 configs->video_extra_data = std::vector<uint8>(
747 config.extra_data(), config.extra_data() + config.extra_data_size()); 747 config.extra_data(), config.extra_data() + config.extra_data_size());
748 return true; 748 return true;
749 } 749 }
750 return false; 750 return false;
751 } 751 }
752 752
753 } // namespace content 753 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.h ('k') | media/base/android/media_source_player.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698