diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 21:32:54 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 21:32:54 +0000 |
| commit | 68013e64c6e2fe20116352f987299605245c56a3 (patch) | |
| tree | b5fbda962efecf8e42d5de1d5684cbe386c1d1e3 /webkit/media | |
| parent | fa4a458315fa15f2077a63ce3f5578bc499655be (diff) | |
| download | chromium_src-68013e64c6e2fe20116352f987299605245c56a3.zip chromium_src-68013e64c6e2fe20116352f987299605245c56a3.tar.gz chromium_src-68013e64c6e2fe20116352f987299605245c56a3.tar.bz2 | |
Upstream WebVideoFrameAndroid and fix some bugs in MediaPlayerBridge code
This CL includes the following changes:
1. upstream WebVideoFrameAndroid to prepare for the WebMediaPlayerAndroid upstreaming
2. introduced one more enum to capture undocumentde error types.
3. Changed SetDataSource() function in MediaPlayerBridge so WebMediaPlayerAndroid don't need to handle the url headers
BUG=
TEST=
Review URL: http://codereview.chromium.org/10051019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/android/audio_decoder_android.cc (renamed from webkit/media/audio_decoder_android.cc) | 2 | ||||
| -rw-r--r-- | webkit/media/webkit_media.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/media/audio_decoder_android.cc b/webkit/media/android/audio_decoder_android.cc index 474e083..637b32b 100644 --- a/webkit/media/audio_decoder_android.cc +++ b/webkit/media/android/audio_decoder_android.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi index 34aa506..fb62d19 100644 --- a/webkit/media/webkit_media.gypi +++ b/webkit/media/webkit_media.gypi @@ -14,11 +14,11 @@ '<(DEPTH)/skia/skia.gyp:skia', ], 'sources': [ + 'android/audio_decoder_android.cc', 'active_loader.cc', 'active_loader.h', 'audio_decoder.cc', 'audio_decoder.h', - 'audio_decoder_android.cc', 'buffered_data_source.cc', 'buffered_data_source.h', 'buffered_resource_loader.cc', |