Index: chromecast/browser/media/cma_message_filter_host.cc |
diff --git a/chromecast/browser/media/cma_message_filter_host.cc b/chromecast/browser/media/cma_message_filter_host.cc |
index 246c03477af27840a1530fb76c8d7ed07a19711f..21ad2932ac2064bb02c271a6472d0eb7e4001c2b 100644 |
--- a/chromecast/browser/media/cma_message_filter_host.cc |
+++ b/chromecast/browser/media/cma_message_filter_host.cc |
@@ -96,7 +96,7 @@ bool CmaMessageFilterHost::OnMessageReceived(const IPC::Message& message) { |
} |
void CmaMessageFilterHost::DeleteEntries() { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
for (MediaPipelineMap::iterator it = media_pipelines_.begin(); |
it != media_pipelines_.end(); ) { |
@@ -119,7 +119,7 @@ MediaPipelineHost* CmaMessageFilterHost::LookupById(int media_id) { |
// *** Handle incoming messages *** |
void CmaMessageFilterHost::CreateMedia(int media_id, LoadType load_type) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
scoped_ptr<MediaPipelineHost> media_pipeline_host(new MediaPipelineHost()); |
MediaPipelineClient client; |
@@ -144,7 +144,7 @@ void CmaMessageFilterHost::CreateMedia(int media_id, LoadType load_type) { |
} |
void CmaMessageFilterHost::DestroyMedia(int media_id) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineMap::iterator it = media_pipelines_.find(media_id); |
if (it == media_pipelines_.end()) |
@@ -160,7 +160,7 @@ void CmaMessageFilterHost::DestroyMedia(int media_id) { |
void CmaMessageFilterHost::SetCdm(int media_id, |
int render_frame_id, |
int cdm_id) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) |
return; |
@@ -195,7 +195,7 @@ void CmaMessageFilterHost::SetCdmOnUiThread( |
void CmaMessageFilterHost::CreateAvPipe( |
int media_id, TrackId track_id, size_t shared_mem_size) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
base::FileDescriptor foreign_socket_handle; |
base::SharedMemoryHandle foreign_memory_handle; |
@@ -275,7 +275,7 @@ void CmaMessageFilterHost::OnAvPipeSet( |
void CmaMessageFilterHost::AudioInitialize( |
int media_id, TrackId track_id, const ::media::AudioDecoderConfig& config) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) { |
Send(new CmaMsg_TrackStateChanged( |
@@ -304,7 +304,7 @@ void CmaMessageFilterHost::AudioInitialize( |
void CmaMessageFilterHost::VideoInitialize( |
int media_id, TrackId track_id, const ::media::VideoDecoderConfig& config) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) { |
Send(new CmaMsg_TrackStateChanged( |
@@ -338,7 +338,7 @@ void CmaMessageFilterHost::VideoInitialize( |
void CmaMessageFilterHost::StartPlayingFrom( |
int media_id, base::TimeDelta time) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) |
return; |
@@ -346,7 +346,7 @@ void CmaMessageFilterHost::StartPlayingFrom( |
} |
void CmaMessageFilterHost::Flush(int media_id) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) { |
Send(new CmaMsg_MediaStateChanged( |
@@ -360,7 +360,7 @@ void CmaMessageFilterHost::Flush(int media_id) { |
} |
void CmaMessageFilterHost::Stop(int media_id) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) |
return; |
@@ -372,7 +372,7 @@ void CmaMessageFilterHost::Stop(int media_id) { |
void CmaMessageFilterHost::SetPlaybackRate( |
int media_id, float playback_rate) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) |
return; |
@@ -381,7 +381,7 @@ void CmaMessageFilterHost::SetPlaybackRate( |
void CmaMessageFilterHost::SetVolume( |
int media_id, TrackId track_id, float volume) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) |
return; |
@@ -389,7 +389,7 @@ void CmaMessageFilterHost::SetVolume( |
} |
void CmaMessageFilterHost::NotifyPipeWrite(int media_id, TrackId track_id) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
MediaPipelineHost* media_pipeline = LookupById(media_id); |
if (!media_pipeline) |
return; |
@@ -400,7 +400,7 @@ void CmaMessageFilterHost::NotifyExternalSurface( |
int surface_id, |
const gfx::PointF& p0, const gfx::PointF& p1, |
const gfx::PointF& p2, const gfx::PointF& p3) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&UpdateVideoSurfaceHost, surface_id, |
@@ -411,18 +411,18 @@ void CmaMessageFilterHost::NotifyExternalSurface( |
void CmaMessageFilterHost::OnMediaStateChanged( |
int media_id, ::media::PipelineStatus status) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_MediaStateChanged(media_id, status)); |
} |
void CmaMessageFilterHost::OnTrackStateChanged( |
int media_id, TrackId track_id, ::media::PipelineStatus status) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_TrackStateChanged(media_id, track_id, status)); |
} |
void CmaMessageFilterHost::OnPipeReadActivity(int media_id, TrackId track_id) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_NotifyPipeRead(media_id, track_id)); |
} |
@@ -431,37 +431,37 @@ void CmaMessageFilterHost::OnTimeUpdate( |
base::TimeDelta media_time, |
base::TimeDelta max_media_time, |
base::TimeTicks stc) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_TimeUpdate(media_id, |
media_time, max_media_time, stc)); |
} |
void CmaMessageFilterHost::OnBufferingNotification( |
int media_id, ::media::BufferingState state) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_BufferingNotification(media_id, state)); |
} |
void CmaMessageFilterHost::OnEos(int media_id, TrackId track_id) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_Eos(media_id, track_id)); |
} |
void CmaMessageFilterHost::OnPlaybackError( |
int media_id, TrackId track_id, ::media::PipelineStatus status) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_PlaybackError(media_id, track_id, status)); |
} |
void CmaMessageFilterHost::OnStatisticsUpdated( |
int media_id, TrackId track_id, const ::media::PipelineStatistics& stats) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_PlaybackStatistics(media_id, track_id, stats)); |
} |
void CmaMessageFilterHost::OnNaturalSizeChanged( |
int media_id, TrackId track_id, const gfx::Size& size) { |
- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
Send(new CmaMsg_NaturalSizeChanged(media_id, track_id, size)); |
} |