Simplify VCMTimestampMap.

webrtc/modules/video_coding/main/source/generic_decoder.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 35 matching lines @@
     return _receiveCallback;
 }
 
 int32_t VCMDecodedFrameCallback::Decoded(VideoFrame& decodedImage) {
     // TODO(holmer): We should improve this so that we can handle multiple
     // callbacks from one call to Decode().
     VCMFrameInformation* frameInfo;
     VCMReceiveCallback* callback;
     {
         CriticalSectionScoped cs(_critSect);
-        frameInfo = static_cast<VCMFrameInformation*>(
-            _timestampMap.Pop(decodedImage.timestamp()));
+        frameInfo = _timestampMap.Pop(decodedImage.timestamp());
         callback = _receiveCallback;
     }
 
     if (frameInfo == NULL) {
       LOG(LS_WARNING) << "Too many frames backed up in the decoder, dropping "
                          "this one.";
       return WEBRTC_VIDEO_CODEC_OK;
     }
 
     _timing.StopDecodeTimer(
@@ skipping 28 matching lines @@
 {
     _lastReceivedPictureID = pictureId;
     return 0;
 }
 
 uint64_t VCMDecodedFrameCallback::LastReceivedPictureID() const
 {
     return _lastReceivedPictureID;
 }
 
-int32_t VCMDecodedFrameCallback::Map(uint32_t timestamp, VCMFrameInformation* frameInfo)
-{
-    CriticalSectionScoped cs(_critSect);
-    return _timestampMap.Add(timestamp, frameInfo);
+void VCMDecodedFrameCallback::Map(uint32_t timestamp,
+                                  VCMFrameInformation* frameInfo) {
+  CriticalSectionScoped cs(_critSect);
+  _timestampMap.Add(timestamp, frameInfo);
 }
 
 int32_t VCMDecodedFrameCallback::Pop(uint32_t timestamp)
 {
     CriticalSectionScoped cs(_critSect);
     if (_timestampMap.Pop(timestamp) == NULL)
     {
         return VCM_GENERAL_ERROR;
     }
     return VCM_OK;
@@ skipping 70 matching lines @@
     _callback = callback;
     return _decoder.RegisterDecodeCompleteCallback(callback);
 }
 
 bool VCMGenericDecoder::External() const
 {
     return _isExternal;
 }
 
 }  // namespace