diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:24:39 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 20:24:39 +0000 |
| commit | 89dc473469cff2c31b24845af1cb7421e90fc49b (patch) | |
| tree | fd639a488ebcac282404b560a47c4658c31d277e /media | |
| parent | 79e965153927f18cc6a8cae50dba3e394458a050 (diff) | |
| download | chromium_src-89dc473469cff2c31b24845af1cb7421e90fc49b.zip chromium_src-89dc473469cff2c31b24845af1cb7421e90fc49b.tar.gz chromium_src-89dc473469cff2c31b24845af1cb7421e90fc49b.tar.bz2 | |
Revert 195111 "Expose MEDIA_STATISTICS stats to chrome://media-i..."
> Expose MEDIA_STATISTICS stats to chrome://media-internals.
>
> Introduce MEDIA_STATISTICS parameters, such as decodedVideoFrameCount and friends, to chrome://media-internals properties.
>
> BUG=178563
>
> Review URL: https://chromiumcodereview.appspot.com/13870004
The high frequency nature of the events caused a CPU% increase: http://crbug.com/234377
Reverting until rate limiting is implemented: http://crbug.com/235096
BUG=234377
TBR=changbin.shao@intel.com
Review URL: https://codereview.chromium.org/13896027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_log.cc | 12 | ||||
| -rw-r--r-- | media/base/media_log.h | 2 | ||||
| -rw-r--r-- | media/base/media_log_event.h | 7 | ||||
| -rw-r--r-- | media/base/pipeline.cc | 2 |
4 files changed, 0 insertions, 23 deletions
diff --git a/media/base/media_log.cc b/media/base/media_log.cc index 8ac5171..abd845b 100644 --- a/media/base/media_log.cc +++ b/media/base/media_log.cc @@ -56,8 +56,6 @@ const char* MediaLog::EventTypeToString(MediaLogEvent::Type type) { return "BUFFERED_EXTENTS_CHANGED"; case MediaLogEvent::MEDIA_SOURCE_ERROR: return "MEDIA_SOURCE_ERROR"; - case MediaLogEvent::PIPELINE_STATISTICS_CHANGED: - return "PIPELINE_STATISTICS_CHANGED"; } NOTREACHED(); return NULL; @@ -198,14 +196,4 @@ scoped_ptr<MediaLogEvent> MediaLog::CreateMediaSourceErrorEvent( return event.Pass(); } -scoped_ptr<MediaLogEvent> MediaLog::CreatePipelineStatisticsChangedEvent( - const PipelineStatistics& stats) { - scoped_ptr<MediaLogEvent> event( - CreateEvent(MediaLogEvent::PIPELINE_STATISTICS_CHANGED)); - event->params.SetInteger("decoded_audio_bytes", stats.audio_bytes_decoded); - event->params.SetInteger("decoded_video_bytes", stats.video_bytes_decoded); - event->params.SetInteger("decoded_video_frames", stats.video_frames_decoded); - event->params.SetInteger("dropped_video_frames", stats.video_frames_dropped); - return event.Pass(); -} } //namespace media diff --git a/media/base/media_log.h b/media/base/media_log.h index cfb16e0..e776ef6 100644 --- a/media/base/media_log.h +++ b/media/base/media_log.h @@ -67,8 +67,6 @@ class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> { size_t start, size_t current, size_t end); scoped_ptr<MediaLogEvent> CreateMediaSourceErrorEvent( const std::string& error); - scoped_ptr<MediaLogEvent> CreatePipelineStatisticsChangedEvent( - const PipelineStatistics& stats); protected: friend class base::RefCountedThreadSafe<MediaLog>; diff --git a/media/base/media_log_event.h b/media/base/media_log_event.h index 11ef5a0..9b0f6e1 100644 --- a/media/base/media_log_event.h +++ b/media/base/media_log_event.h @@ -72,13 +72,6 @@ struct MediaLogEvent { // Errors reported by Media Source Extensions code. MEDIA_SOURCE_ERROR, // params: "error": Error string describing the error detected. - - // Statistics for pipeline. - // params: "decoded_audio_bytes": <decoded audio bytes of the video> - // "decoded_video_bytes": <decoded video bytes of the video> - // "decoded_video_frames": <decoded video frames of the video> - // "dropped_video_frames": <dropped video frames of the video> - PIPELINE_STATISTICS_CHANGED, }; int32 id; diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index 45c61a9..bf93a9a 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -723,8 +723,6 @@ void Pipeline::OnUpdateStatistics(const PipelineStatistics& stats) { statistics_.video_bytes_decoded += stats.video_bytes_decoded; statistics_.video_frames_decoded += stats.video_frames_decoded; statistics_.video_frames_dropped += stats.video_frames_dropped; - media_log_->AddEvent( - media_log_->CreatePipelineStatisticsChangedEvent(statistics_)); } void Pipeline::StartTask(scoped_ptr<FilterCollection> filter_collection, |