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

Unified Diff: media/filters/chunk_demuxer.h

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/audio_timestamp_validator_unittest.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index b8572216309e71dd6ee4c86e3c65000eedea6698..17dc59bf5e9bd9cd18bec24292ef8e5b3de279cf 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -96,12 +96,9 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
// Called when midstream config updates occur.
// Returns true if the new config is accepted.
// Returns false if the new config should trigger an error.
- bool UpdateAudioConfig(const AudioDecoderConfig& config,
- const scoped_refptr<MediaLog>& media_log);
- bool UpdateVideoConfig(const VideoDecoderConfig& config,
- const scoped_refptr<MediaLog>& media_log);
- void UpdateTextConfig(const TextTrackConfig& config,
- const scoped_refptr<MediaLog>& media_log);
+ bool UpdateAudioConfig(const AudioDecoderConfig& config, MediaLog* media_log);
+ bool UpdateVideoConfig(const VideoDecoderConfig& config, MediaLog* media_log);
+ void UpdateTextConfig(const TextTrackConfig& config, MediaLog* media_log);
void MarkEndOfStream();
void UnmarkEndOfStream();
@@ -184,7 +181,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// |media_log| Used to report content and engine debug messages.
ChunkDemuxer(const base::Closure& open_cb,
const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
- const scoped_refptr<MediaLog>& media_log);
+ MediaLog* media_log);
~ChunkDemuxer() override;
// Demuxer implementation.
@@ -410,7 +407,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
bool enable_text_;
// MediaLog for reporting messages and properties to debug content and engine.
- scoped_refptr<MediaLog> media_log_;
+ MediaLog* media_log_;
PipelineStatusCB init_cb_;
// Callback to execute upon seek completion.
« no previous file with comments | « media/filters/audio_timestamp_validator_unittest.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698