Add EncodedImageCallback::OnEncodedImage().

webrtc/modules/video_coding/video_coding_impl.cc

Index: webrtc/modules/video_coding/video_coding_impl.cc
diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc
index bb81ba9f9efe3c976bf2c9d79901077ced39d506..021037989c410247836926c7f348572881cbb72d 100644
--- a/webrtc/modules/video_coding/video_coding_impl.cc
+++ b/webrtc/modules/video_coding/video_coding_impl.cc
@@ -45,7 +45,7 @@ namespace {
 class EncodedImageCallbackWrapper : public EncodedImageCallback {
  public:
   EncodedImageCallbackWrapper()
-      : cs_(CriticalSectionWrapper::CreateCriticalSection()), callback_(NULL) {}
+      : cs_(CriticalSectionWrapper::CreateCriticalSection()) {}
 
   virtual ~EncodedImageCallbackWrapper() {}
 
@@ -54,19 +54,20 @@ class EncodedImageCallbackWrapper : public EncodedImageCallback {
     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 {