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

Side by Side Diff: webrtc/modules/video_coding/generic_decoder.cc

Issue 2975383002: Fix incorrect DCHECK in generic_decoder.cc. (Closed)
Patch Set: Created 3 years, 5 months 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 | « no previous file | 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 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 _codecType(kVideoCodecUnknown), 189 _codecType(kVideoCodecUnknown),
190 _isExternal(isExternal), 190 _isExternal(isExternal),
191 _last_keyframe_content_type(VideoContentType::UNSPECIFIED) { 191 _last_keyframe_content_type(VideoContentType::UNSPECIFIED) {
192 RTC_DCHECK(decoder_); 192 RTC_DCHECK(decoder_);
193 } 193 }
194 194
195 VCMGenericDecoder::~VCMGenericDecoder() { 195 VCMGenericDecoder::~VCMGenericDecoder() {
196 decoder_->Release(); 196 decoder_->Release();
197 if (_isExternal) 197 if (_isExternal)
198 decoder_.release(); 198 decoder_.release();
199 RTC_DCHECK(_isExternal || !decoder_); 199 RTC_DCHECK(_isExternal || decoder_);
200 } 200 }
201 201
202 int32_t VCMGenericDecoder::InitDecode(const VideoCodec* settings, 202 int32_t VCMGenericDecoder::InitDecode(const VideoCodec* settings,
203 int32_t numberOfCores) { 203 int32_t numberOfCores) {
204 TRACE_EVENT0("webrtc", "VCMGenericDecoder::InitDecode"); 204 TRACE_EVENT0("webrtc", "VCMGenericDecoder::InitDecode");
205 _codecType = settings->codecType; 205 _codecType = settings->codecType;
206 206
207 return decoder_->InitDecode(settings, numberOfCores); 207 return decoder_->InitDecode(settings, numberOfCores);
208 } 208 }
209 209
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 VCMDecodedFrameCallback* callback) { 249 VCMDecodedFrameCallback* callback) {
250 _callback = callback; 250 _callback = callback;
251 return decoder_->RegisterDecodeCompleteCallback(callback); 251 return decoder_->RegisterDecodeCompleteCallback(callback);
252 } 252 }
253 253
254 bool VCMGenericDecoder::PrefersLateDecoding() const { 254 bool VCMGenericDecoder::PrefersLateDecoding() const {
255 return decoder_->PrefersLateDecoding(); 255 return decoder_->PrefersLateDecoding();
256 } 256 }
257 257
258 } // namespace webrtc 258 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698