Expose codec implementation names in stats.

webrtc/modules/video_coding/main/source/generic_encoder.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 137 matching lines @@
 
   if (vcm_encoded_frame_callback_) {
     // Keep track of the current frame rotation and apply to the output of the
     // encoder. There might not be exact as the encoder could have one frame
     // delay but it should be close enough.
     vcm_encoded_frame_callback_->SetRotation(rotation_);
   }
 
   int32_t result =
       encoder_->Encode(inputFrame, codecSpecificInfo, &video_frame_types);
+
+  if (vcm_encoded_frame_callback_) {
+    vcm_encoded_frame_callback_->LastEncoderImplementationUsed(
+        encoder_->ImplementationName());
+  }
+
   if (is_screenshare_ &&
       result == WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT) {
     // Target bitrate exceeded, encoder state has been reset - try again.
     return encoder_->Encode(inputFrame, codecSpecificInfo, &video_frame_types);
   }
 
   return result;
 }
 
 int32_t
@@ skipping 116 matching lines @@
 }
 
 int32_t
 VCMEncodedFrameCallback::SetTransportCallback(VCMPacketizationCallback* transport)
 {
     _sendCallback = transport;
     return VCM_OK;
 }
 
 int32_t VCMEncodedFrameCallback::Encoded(
-    const EncodedImage& encodedImage,
+    const EncodedImage& encoded_image,
     const CodecSpecificInfo* codecSpecificInfo,
     const RTPFragmentationHeader* fragmentationHeader) {
-  post_encode_callback_->Encoded(encodedImage, NULL, NULL);
+  // TODO(pbos): Investigate thread safety, this Encoded callback doesn't have
+  // to be on the same thread as ::Encode or SetTransportCallback. This is
+  // especially the case on hardware encoders.
+  post_encode_callback_->Encoded(encoded_image, NULL, NULL);
 
   if (_sendCallback == NULL) {
     return VCM_UNINITIALIZED;
   }
 
 #ifdef DEBUG_ENCODER_BIT_STREAM
   if (_bitStreamAfterEncoder != NULL) {
-    fwrite(encodedImage._buffer, 1, encodedImage._length,
+    fwrite(encoded_image._buffer, 1, encoded_image._length,
            _bitStreamAfterEncoder);
   }
 #endif
 
   RTPVideoHeader rtpVideoHeader;
   memset(&rtpVideoHeader, 0, sizeof(RTPVideoHeader));
   RTPVideoHeader* rtpVideoHeaderPtr = &rtpVideoHeader;
   if (codecSpecificInfo) {
     CopyCodecSpecific(codecSpecificInfo, rtpVideoHeaderPtr);
   }
   rtpVideoHeader.rotation = _rotation;
 
   int32_t callbackReturn = _sendCallback->SendData(
-      _payloadType, encodedImage, *fragmentationHeader, rtpVideoHeaderPtr);
+      _payloadType, encoded_image, *fragmentationHeader, rtpVideoHeaderPtr);
   if (callbackReturn < 0) {
     return callbackReturn;
   }
 
   if (_mediaOpt != NULL) {
-    _mediaOpt->UpdateWithEncodedData(encodedImage);
+    _mediaOpt->UpdateWithEncodedData(encoded_image);
     if (_internalSource)
       return _mediaOpt->DropFrame();  // Signal to encoder to drop next frame.
   }
   return VCM_OK;
 }
 
-void
-VCMEncodedFrameCallback::SetMediaOpt(
-    media_optimization::MediaOptimization *mediaOpt)
-{
-    _mediaOpt = mediaOpt;
+void VCMEncodedFrameCallback::SetMediaOpt(
+    media_optimization::MediaOptimization* mediaOpt) {
+  _mediaOpt = mediaOpt;
+}
+
+void VCMEncodedFrameCallback::LastEncoderImplementationUsed(
+    const char* implementation_name) {
+  if (_sendCallback)
+    _sendCallback->OnEncoderImplementationName(implementation_name);

[stefan-webrtc, 2015/10/16 07:47:03]

feel free to fix _sendCallback -> send_callback_

[pbos-webrtc, 2015/10/16 13:12:05]

Done.

 }
 
 }  // namespace webrtc