diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 08:11:42 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 08:11:42 +0000 |
| commit | 029a771393c2f13579ea342c608b1401beae0523 (patch) | |
| tree | 32b477ede0dac1edc2ebdd63387d049ca222dee4 /webkit/media | |
| parent | 1b68c09ffc0ebdf57de856e80a331b4ca14e30fb (diff) | |
| download | chromium_src-029a771393c2f13579ea342c608b1401beae0523.zip chromium_src-029a771393c2f13579ea342c608b1401beae0523.tar.gz chromium_src-029a771393c2f13579ea342c608b1401beae0523.tar.bz2 | |
Android: Fix compile errors in content_browsertests
Also adding include_dirs as a direct_dependent_setting on the
jni_headers targets in content. This makes depending on these targets
easier.
BUG=138275
Review URL: https://chromiumcodereview.appspot.com/11882011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/crypto/ppapi/clear_key_cdm.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc index 22e3445..32f537b 100644 --- a/webkit/media/crypto/ppapi/clear_key_cdm.cc +++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/time.h" #include "media/base/decoder_buffer.h" +#include "webkit/media/crypto/ppapi/cdm_video_decoder.h" #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) #include "base/basictypes.h" @@ -386,9 +387,9 @@ void ClearKeyCdm::DeinitializeDecoder(cdm::StreamType decoder_type) { video_decoder_->Deinitialize(); break; case cdm::kStreamTypeAudio: -#if !defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) +#if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) audio_decoder_->Deinitialize(); -#else +#elif defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) output_timestamp_base_in_microseconds_ = kNoTimestamp; total_samples_generated_ = 0; #endif @@ -443,6 +444,8 @@ cdm::Status ClearKeyCdm::DecryptAndDecodeSamples( DCHECK(timestamp_in_microseconds != kNoTimestamp); } return GenerateFakeAudioFrames(timestamp_in_microseconds, audio_frames); +#else + return cdm::kSuccess; #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER } |