diff options
| author | mlamouri <mlamouri@chromium.org> | 2015-07-06 13:24:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-06 20:25:22 +0000 |
| commit | 76d3284edd73d83a652e067ef2c510679dca4b6a (patch) | |
| tree | 04082b11f6cff0e190aed342ed76f12d89b8f0c9 /media | |
| parent | 882864dad4f07dd73708eb15f1f68faf23ec393a (diff) | |
| download | chromium_src-76d3284edd73d83a652e067ef2c510679dca4b6a.zip chromium_src-76d3284edd73d83a652e067ef2c510679dca4b6a.tar.gz chromium_src-76d3284edd73d83a652e067ef2c510679dca4b6a.tar.bz2 | |
Fix unused variables errors in media/.
This is fixing the build errors on Linux when building media/ with
DISALLOW_COPY_AND_ASSIGN using "=delete".
BUG=447445
Review URL: https://codereview.chromium.org/1224803002
Cr-Commit-Position: refs/heads/master@{#337462}
Diffstat (limited to 'media')
| -rw-r--r-- | media/cdm/proxy_decryptor.cc | 2 | ||||
| -rw-r--r-- | media/cdm/proxy_decryptor.h | 3 | ||||
| -rw-r--r-- | media/filters/audio_clock.cc | 1 | ||||
| -rw-r--r-- | media/filters/audio_clock.h | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc index a568211..28143f9 100644 --- a/media/cdm/proxy_decryptor.cc +++ b/media/cdm/proxy_decryptor.cc @@ -43,7 +43,9 @@ ProxyDecryptor::ProxyDecryptor(MediaPermission* media_permission, const KeyErrorCB& key_error_cb, const KeyMessageCB& key_message_cb) : is_creating_cdm_(false), +#if defined(OS_CHROMEOS) || defined(OS_ANDROID) media_permission_(media_permission), +#endif use_hw_secure_codecs_(use_hw_secure_codecs), key_added_cb_(key_added_cb), key_error_cb_(key_error_cb), diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h index 8103739..c7f60b9 100644 --- a/media/cdm/proxy_decryptor.h +++ b/media/cdm/proxy_decryptor.h @@ -131,7 +131,10 @@ class MEDIA_EXPORT ProxyDecryptor { // The real MediaKeys that manages key operations for the ProxyDecryptor. scoped_ptr<MediaKeys> media_keys_; +#if defined(OS_CHROMEOS) || defined(OS_ANDROID) MediaPermission* media_permission_; +#endif + bool use_hw_secure_codecs_; // Callbacks for firing key events. diff --git a/media/filters/audio_clock.cc b/media/filters/audio_clock.cc index d93db1d..03af719 100644 --- a/media/filters/audio_clock.cc +++ b/media/filters/audio_clock.cc @@ -13,7 +13,6 @@ namespace media { AudioClock::AudioClock(base::TimeDelta start_timestamp, int sample_rate) : start_timestamp_(start_timestamp), - sample_rate_(sample_rate), microseconds_per_frame_( static_cast<double>(base::Time::kMicrosecondsPerSecond) / sample_rate), diff --git a/media/filters/audio_clock.h b/media/filters/audio_clock.h index f7711f6..31317c0 100644 --- a/media/filters/audio_clock.h +++ b/media/filters/audio_clock.h @@ -126,7 +126,6 @@ class MEDIA_EXPORT AudioClock { base::TimeDelta ComputeBufferedMediaTime(int64_t frames) const; const base::TimeDelta start_timestamp_; - const int sample_rate_; const double microseconds_per_frame_; std::deque<AudioData> buffered_; |