diff options
| author | scottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 22:59:23 +0000 |
|---|---|---|
| committer | scottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 22:59:23 +0000 |
| commit | 28b50a7b55c56a941f948fc4e8de8c06cb46fc3c (patch) | |
| tree | fb8a48602d7845a660ee0153832d09c5149cfcc9 /chrome/browser/media | |
| parent | d527cdd8d20d760114726a0b65d6ff85f7832880 (diff) | |
| download | chromium_src-28b50a7b55c56a941f948fc4e8de8c06cb46fc3c.zip chromium_src-28b50a7b55c56a941f948fc4e8de8c06cb46fc3c.tar.gz chromium_src-28b50a7b55c56a941f948fc4e8de8c06cb46fc3c.tar.bz2 | |
Make MediaInternals handle MediaLogEvents.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7602021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media')
| -rw-r--r-- | chrome/browser/media/media_internals.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc index a563db3..bec8ec8 100644 --- a/chrome/browser/media/media_internals.cc +++ b/chrome/browser/media/media_internals.cc @@ -10,11 +10,13 @@ #include "chrome/browser/media/media_internals_observer.h" #include "content/browser/browser_thread.h" #include "content/browser/webui/web_ui.h" +#include "media/base/media_log.h" #include "media/base/media_log_event.h" // The names of the javascript functions to call with updates. -static const char kDeleteItemFunction[] = "media.onItemDeleted"; static const char kAudioUpdateFunction[] = "media.addAudioStream"; +static const char kDeleteItemFunction[] = "media.onItemDeleted"; +static const char kMediaEventFunction[] = "media.onMediaEvent"; static const char kSendEverythingFunction[] = "media.onReceiveEverything"; MediaInternals::~MediaInternals() {} @@ -50,8 +52,15 @@ void MediaInternals::OnSetAudioStreamVolume( void MediaInternals::OnMediaEvent( int render_process_id, const media::MediaLogEvent& event) { DCHECK(CalledOnValidThread()); - // TODO(scottfr): Handle |event|. Record status information in data_ and pass - // |event| along to observers. + + // Notify observers that |event| has occured. + DictionaryValue dict; + dict.SetInteger("renderer", render_process_id); + dict.SetInteger("player", event.id); + dict.SetString("type", media::MediaLog::EventTypeToString(event.type)); + dict.SetDouble("time", event.time.ToDoubleT()); + dict.Set("params", event.params.DeepCopy()); + SendUpdate(kMediaEventFunction, &dict); } void MediaInternals::AddObserver(MediaInternalsObserver* observer) { |