OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "media/cdm/cdm_helpers.h" | 5 #include "media/cdm/cdm_helpers.h" |
6 | 6 |
7 #if defined(USE_PPAPI_CDM_ADAPTER) | 7 #if defined(USE_PPAPI_CDM_ADAPTER) |
8 // When building the ppapi adapter do not include any non-trivial base/ headers. | 8 // When building the ppapi adapter do not include any non-trivial base/ headers. |
9 #include "ppapi/cpp/logging.h" | 9 #include "ppapi/cpp/logging.h" // nogncheck |
10 #define PLATFORM_DCHECK PP_DCHECK | 10 #define PLATFORM_DCHECK PP_DCHECK |
11 #else | 11 #else |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #define PLATFORM_DCHECK DCHECK | 13 #define PLATFORM_DCHECK DCHECK |
14 #endif | 14 #endif |
15 | 15 |
16 namespace media { | 16 namespace media { |
17 | 17 |
18 DecryptedBlockImpl::DecryptedBlockImpl() : buffer_(nullptr), timestamp_(0) {} | 18 DecryptedBlockImpl::DecryptedBlockImpl() : buffer_(nullptr), timestamp_(0) {} |
19 | 19 |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 return format_; | 128 return format_; |
129 } | 129 } |
130 | 130 |
131 cdm::Buffer* AudioFramesImpl::PassFrameBuffer() { | 131 cdm::Buffer* AudioFramesImpl::PassFrameBuffer() { |
132 cdm::Buffer* temp_buffer = buffer_; | 132 cdm::Buffer* temp_buffer = buffer_; |
133 buffer_ = nullptr; | 133 buffer_ = nullptr; |
134 return temp_buffer; | 134 return temp_buffer; |
135 } | 135 } |
136 | 136 |
137 } // namespace media | 137 } // namespace media |
OLD | NEW |