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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index d9d5607ec6359ac8c581c5f4cced7660ce019737..f8a7c46dfbe6ddfb5e913e05ad50433e4d93c6c5 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -186,9 +186,8 @@ void ChunkDemuxerStream::OnStartOfCodedFrameGroup(
stream_->OnStartOfCodedFrameGroup(start_timestamp);
}
-bool ChunkDemuxerStream::UpdateAudioConfig(
- const AudioDecoderConfig& config,
- const scoped_refptr<MediaLog>& media_log) {
+bool ChunkDemuxerStream::UpdateAudioConfig(const AudioDecoderConfig& config,
+ MediaLog* media_log) {
DCHECK(config.IsValidConfig());
DCHECK_EQ(type_, AUDIO);
base::AutoLock auto_lock(lock_);
@@ -208,9 +207,8 @@ bool ChunkDemuxerStream::UpdateAudioConfig(
return stream_->UpdateAudioConfig(config);
}
-bool ChunkDemuxerStream::UpdateVideoConfig(
- const VideoDecoderConfig& config,
- const scoped_refptr<MediaLog>& media_log) {
+bool ChunkDemuxerStream::UpdateVideoConfig(const VideoDecoderConfig& config,
+ MediaLog* media_log) {
DCHECK(config.IsValidConfig());
DCHECK_EQ(type_, VIDEO);
base::AutoLock auto_lock(lock_);
@@ -224,9 +222,8 @@ bool ChunkDemuxerStream::UpdateVideoConfig(
return stream_->UpdateVideoConfig(config);
}
-void ChunkDemuxerStream::UpdateTextConfig(
- const TextTrackConfig& config,
- const scoped_refptr<MediaLog>& media_log) {
+void ChunkDemuxerStream::UpdateTextConfig(const TextTrackConfig& config,
+ MediaLog* media_log) {
DCHECK_EQ(type_, TEXT);
base::AutoLock auto_lock(lock_);
DCHECK(!stream_);
@@ -402,7 +399,7 @@ void ChunkDemuxerStream::CompletePendingReadIfPossible_Locked() {
ChunkDemuxer::ChunkDemuxer(
const base::Closure& open_cb,
const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
- const scoped_refptr<MediaLog>& media_log)
+ MediaLog* media_log)
: state_(WAITING_FOR_INIT),
cancel_next_seek_(false),
host_(NULL),
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698