Add EncodedImageCallback::OnEncodedImage().

webrtc/modules/video_coding/video_coding_impl.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 27 matching lines @@
   _latestMs = _clock->TimeInMilliseconds();
 }
 }  // namespace vcm
 
 namespace {
 // This wrapper provides a way to modify the callback without the need to expose
 // a register method all the way down to the function calling it.
 class EncodedImageCallbackWrapper : public EncodedImageCallback {
  public:
   EncodedImageCallbackWrapper()
-      : cs_(CriticalSectionWrapper::CreateCriticalSection()), callback_(NULL) {}
+      : cs_(CriticalSectionWrapper::CreateCriticalSection()) {}
 
   virtual ~EncodedImageCallbackWrapper() {}
 
   void Register(EncodedImageCallback* callback) {
     CriticalSectionScoped cs(cs_.get());
     callback_ = callback;
   }
 
-  virtual int32_t Encoded(const EncodedImage& encoded_image,
-                          const CodecSpecificInfo* codec_specific_info,
-                          const RTPFragmentationHeader* fragmentation) {
+  virtual Result OnEncodedImage(const EncodedImage& encoded_image,
+                                const CodecSpecificInfo* codec_specific_info,
+                                const RTPFragmentationHeader* fragmentation) {
     CriticalSectionScoped cs(cs_.get());
-    if (callback_)
-      return callback_->Encoded(encoded_image, codec_specific_info,
-                                fragmentation);
-    return 0;
+    if (callback_) {
+      return callback_->OnEncodedImage(encoded_image, codec_specific_info,
+                                       fragmentation);
+    }
+    return Result(Result::ERROR_SEND_FAILED);
   }
 
  private:
   std::unique_ptr<CriticalSectionWrapper> cs_;
-  EncodedImageCallback* callback_ GUARDED_BY(cs_);
+  EncodedImageCallback* callback_ GUARDED_BY(cs_) = nullptr;

[stefan-webrtc, 2016/07/18 16:51:27]

Prefer if you set this in the constructor initializer list.

[Sergey Ulanov, 2016/07/21 00:09:39]

Done.

 };
 
 class VideoCodingModuleImpl : public VideoCodingModule {
  public:
   VideoCodingModuleImpl(Clock* clock,
                         EventFactory* event_factory,
                         VideoEncoderRateObserver* encoder_rate_observer,
                         NackSender* nack_sender,
                         KeyFrameRequestSender* keyframe_request_sender,
                         EncodedImageCallback* pre_decode_image_callback)
@@ skipping 230 matching lines @@
     EventFactory* event_factory,
     NackSender* nack_sender,
     KeyFrameRequestSender* keyframe_request_sender) {
   assert(clock);
   assert(event_factory);
   return new VideoCodingModuleImpl(clock, event_factory, nullptr, nack_sender,
                                    keyframe_request_sender, nullptr);
 }
 
 }  // namespace webrtc