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

Unified Diff: media/base/android/media_decoder_job.cc

Issue 650223002: Revert "Removes MediaDecoderJob virtual method call from destructor." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index e727493f19e71631c4d5a119f578f0ad24f3a1de..ed2216a5f859eaeb9ef5d2325cc5a05312c48a5b 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -48,7 +48,7 @@ MediaDecoderJob::MediaDecoderJob(
}
MediaDecoderJob::~MediaDecoderJob() {
- DCHECK(!media_codec_bridge_);
+ ReleaseMediaCodecBridge();
}
void MediaDecoderJob::OnDataReceived(const DemuxerData& data) {
@@ -232,7 +232,6 @@ void MediaDecoderJob::Release() {
return;
}
- ReleaseMediaCodecBridge();
delete this;
}
@@ -501,7 +500,6 @@ void MediaDecoderJob::OnDecodeCompleted(
if (destroy_pending_) {
DVLOG(1) << __FUNCTION__ << " : completing pending deletion";
- ReleaseMediaCodecBridge();
delete this;
return;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698