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

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

Issue 1358863002: Simplify VCMTimestampMap. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 { 96 {
97 _lastReceivedPictureID = pictureId; 97 _lastReceivedPictureID = pictureId;
98 return 0; 98 return 0;
99 } 99 }
100 100
101 uint64_t VCMDecodedFrameCallback::LastReceivedPictureID() const 101 uint64_t VCMDecodedFrameCallback::LastReceivedPictureID() const
102 { 102 {
103 return _lastReceivedPictureID; 103 return _lastReceivedPictureID;
104 } 104 }
105 105
106 int32_t VCMDecodedFrameCallback::Map(uint32_t timestamp, VCMFrameInformation* fr ameInfo) 106 void VCMDecodedFrameCallback::Map(uint32_t timestamp,
107 { 107 VCMFrameInformation* frameInfo) {
108 CriticalSectionScoped cs(_critSect); 108 CriticalSectionScoped cs(_critSect);
109 return _timestampMap.Add(timestamp, frameInfo); 109 _timestampMap.Add(timestamp, frameInfo);
110 } 110 }
111 111
112 int32_t VCMDecodedFrameCallback::Pop(uint32_t timestamp) 112 int32_t VCMDecodedFrameCallback::Pop(uint32_t timestamp)
113 { 113 {
114 CriticalSectionScoped cs(_critSect); 114 CriticalSectionScoped cs(_critSect);
115 if (_timestampMap.Pop(timestamp) == NULL) 115 if (_timestampMap.Pop(timestamp) == NULL)
116 { 116 {
117 return VCM_GENERAL_ERROR; 117 return VCM_GENERAL_ERROR;
118 } 118 }
119 return VCM_OK; 119 return VCM_OK;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 _callback = callback; 190 _callback = callback;
191 return _decoder.RegisterDecodeCompleteCallback(callback); 191 return _decoder.RegisterDecodeCompleteCallback(callback);
192 } 192 }
193 193
194 bool VCMGenericDecoder::External() const 194 bool VCMGenericDecoder::External() const
195 { 195 {
196 return _isExternal; 196 return _isExternal;
197 } 197 }
198 198
199 } // namespace 199 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698