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

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

Issue 2986893002: Piggybacking simulcast id and ALR experiment id into video content type extension. (Closed)
Patch Set: Remove static initialization from VideoContentType and remove memoization in AlrDetector Created 3 years, 3 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
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 return VCM_OK; 182 return VCM_OK;
183 } 183 }
184 184
185 VCMGenericDecoder::VCMGenericDecoder(VideoDecoder* decoder, bool isExternal) 185 VCMGenericDecoder::VCMGenericDecoder(VideoDecoder* decoder, bool isExternal)
186 : _callback(NULL), 186 : _callback(NULL),
187 _frameInfos(), 187 _frameInfos(),
188 _nextFrameInfoIdx(0), 188 _nextFrameInfoIdx(0),
189 decoder_(decoder), 189 decoder_(decoder),
190 _codecType(kVideoCodecUnknown), 190 _codecType(kVideoCodecUnknown),
191 _isExternal(isExternal), 191 _isExternal(isExternal),
192 _last_keyframe_content_type(VideoContentType::UNSPECIFIED) { 192 _last_keyframe_content_type(VideoContentType::Unspecified()) {
193 RTC_DCHECK(decoder_); 193 RTC_DCHECK(decoder_);
194 } 194 }
195 195
196 VCMGenericDecoder::~VCMGenericDecoder() { 196 VCMGenericDecoder::~VCMGenericDecoder() {
197 decoder_->Release(); 197 decoder_->Release();
198 if (_isExternal) 198 if (_isExternal)
199 decoder_.release(); 199 decoder_.release();
200 RTC_DCHECK(_isExternal || decoder_); 200 RTC_DCHECK(_isExternal || decoder_);
201 } 201 }
202 202
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 VCMDecodedFrameCallback* callback) { 250 VCMDecodedFrameCallback* callback) {
251 _callback = callback; 251 _callback = callback;
252 return decoder_->RegisterDecodeCompleteCallback(callback); 252 return decoder_->RegisterDecodeCompleteCallback(callback);
253 } 253 }
254 254
255 bool VCMGenericDecoder::PrefersLateDecoding() const { 255 bool VCMGenericDecoder::PrefersLateDecoding() const {
256 return decoder_->PrefersLateDecoding(); 256 return decoder_->PrefersLateDecoding();
257 } 257 }
258 258
259 } // namespace webrtc 259 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698