| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 DecodedImageCallback* callback) { | 161 DecodedImageCallback* callback) { |
| 162 LOG(LS_ERROR) | 162 LOG(LS_ERROR) |
| 163 << "Can't register decode complete callback on NullVideoDecoder."; | 163 << "Can't register decode complete callback on NullVideoDecoder."; |
| 164 return WEBRTC_VIDEO_CODEC_OK; | 164 return WEBRTC_VIDEO_CODEC_OK; |
| 165 } | 165 } |
| 166 | 166 |
| 167 int32_t NullVideoDecoder::Release() { | 167 int32_t NullVideoDecoder::Release() { |
| 168 return WEBRTC_VIDEO_CODEC_OK; | 168 return WEBRTC_VIDEO_CODEC_OK; |
| 169 } | 169 } |
| 170 | 170 |
| 171 int32_t NullVideoDecoder::Reset() { | |
| 172 return WEBRTC_VIDEO_CODEC_OK; | |
| 173 } | |
| 174 | |
| 175 const char* NullVideoDecoder::ImplementationName() const { | 171 const char* NullVideoDecoder::ImplementationName() const { |
| 176 return "NullVideoDecoder"; | 172 return "NullVideoDecoder"; |
| 177 } | 173 } |
| 178 | 174 |
| 179 } // namespace webrtc | 175 } // namespace webrtc |
| OLD | NEW |