Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Side by Side Diff: media/cdm/ppapi/cdm_helpers.h

Issue 696453002: Roll DEPS to get latest cdm.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CDM_PPAPI_CDM_HELPERS_H_ 5 #ifndef MEDIA_CDM_PPAPI_CDM_HELPERS_H_
6 #define MEDIA_CDM_PPAPI_CDM_HELPERS_H_ 6 #define MEDIA_CDM_PPAPI_CDM_HELPERS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // of the surface divided by the horizontal sampling period. Note that 173 // of the surface divided by the horizontal sampling period. Note that
174 // strides can be negative. 174 // strides can be negative.
175 uint32_t strides_[kMaxPlanes]; 175 uint32_t strides_[kMaxPlanes];
176 176
177 // Presentation timestamp in microseconds. 177 // Presentation timestamp in microseconds.
178 int64_t timestamp_; 178 int64_t timestamp_;
179 179
180 DISALLOW_COPY_AND_ASSIGN(VideoFrameImpl); 180 DISALLOW_COPY_AND_ASSIGN(VideoFrameImpl);
181 }; 181 };
182 182
183 class AudioFramesImpl : public cdm::AudioFrames_2 { 183 class AudioFramesImpl : public cdm::AudioFrames {
184 public: 184 public:
185 AudioFramesImpl() : buffer_(NULL), format_(cdm::kUnknownAudioFormat) {} 185 AudioFramesImpl() : buffer_(NULL), format_(cdm::kUnknownAudioFormat) {}
186 virtual ~AudioFramesImpl() { 186 virtual ~AudioFramesImpl() {
187 if (buffer_) 187 if (buffer_)
188 buffer_->Destroy(); 188 buffer_->Destroy();
189 } 189 }
190 190
191 // AudioFrames implementation. 191 // AudioFrames implementation.
192 virtual void SetFrameBuffer(cdm::Buffer* buffer) override { 192 virtual void SetFrameBuffer(cdm::Buffer* buffer) override {
193 buffer_ = static_cast<PpbBuffer*>(buffer); 193 buffer_ = static_cast<PpbBuffer*>(buffer);
(...skipping 17 matching lines...) Expand all
211 private: 211 private:
212 PpbBuffer* buffer_; 212 PpbBuffer* buffer_;
213 cdm::AudioFormat format_; 213 cdm::AudioFormat format_;
214 214
215 DISALLOW_COPY_AND_ASSIGN(AudioFramesImpl); 215 DISALLOW_COPY_AND_ASSIGN(AudioFramesImpl);
216 }; 216 };
217 217
218 } // namespace media 218 } // namespace media
219 219
220 #endif // MEDIA_CDM_PPAPI_CDM_HELPERS_H_ 220 #endif // MEDIA_CDM_PPAPI_CDM_HELPERS_H_
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698