Add EncodedImageCallback::OnEncodedImage().

webrtc/video_encoder.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef WEBRTC_VIDEO_ENCODER_H_
 #define WEBRTC_VIDEO_ENCODER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "webrtc/base/timedelta.h"

[sprang_webrtc, 2016/06/28 13:54:18]

Is this import used?

[Sergey Ulanov, 2016/06/29 22:18:52]

Done.

 #include "webrtc/common_types.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_frame.h"
 
 namespace webrtc {
 
 class RTPFragmentationHeader;
 // TODO(pbos): Expose these through a public (root) header or change these APIs.
 struct CodecSpecificInfo;
 struct VideoCodec;
 
 class EncodedImageCallback {
  public:
   virtual ~EncodedImageCallback() {}
 
+  struct Result {
+    static Result FrameDropped() {
+      Result result;
+      result.dropped = true;
+      return result;
+    }
+
+    bool dropped = false;

[sprang_webrtc, 2016/06/28 13:54:18]

I "dropped" the right name for this? From what I can see this is more of an
error state than simply a silent frame drop. Maybe even have an enum for
potential outcomes here?

[Sergey Ulanov, 2016/06/29 22:18:53]

Yes, good point. Done. For now I just added two possible result codes: OK, and
ERROR_SEND_FAILED.

+    uint32_t frame_id = 0;
+    bool drop_next_frame = false;
+  };

[sprang_webrtc, 2016/06/28 13:54:18]

Please comment how frame_id and drop_next_frame should be interpreted.

Is frame_id always the timestamp or is the assumption just that it is an
arbitrary unique id for that frame?

Never been a fan of reporting output from the frame dropper this way, but I
think we'll have to live with it for a little while more. I'm planning to add
new ways of signaling overuse to the capturing pipeline though, just FYI.

[Sergey Ulanov, 2016/06/29 22:18:53]

Done.
It depends on the underlying protocol used to send video, doesn't have to be a
timestamp. The only thing that matters is that both With RTP we can use frame
timestamp as frame_id (mentioned it in the comment now).
ok. please keep me up to date, maybe cc on the relevant CLs.

+
   // Callback function which is called when an image has been encoded.
-  // TODO(perkj): Change this to return void.
+  virtual Result OnEncodedImage(
+      const EncodedImage& encoded_image,
+      const CodecSpecificInfo* codec_specific_info,
+      const RTPFragmentationHeader* fragmentation) = 0;
+
+  // DEPRECATED.
+  // TODO(sergeyu): Remove this method.
   virtual int32_t Encoded(const EncodedImage& encoded_image,
                           const CodecSpecificInfo* codec_specific_info,
-                          const RTPFragmentationHeader* fragmentation) = 0;
+                          const RTPFragmentationHeader* fragmentation) {
+    Result result =
+        OnEncodedImage(encoded_image, codec_specific_info, fragmentation);
+    return result.dropped ? -1 : (result.drop_next_frame ? 1 : 0);
+  }
 };
 
 class VideoEncoder {
  public:
   enum EncoderType {
     kH264,
     kVp8,
     kVp9,
     kUnsupportedCodec,
   };
@@ skipping 128 matching lines @@
 
   const EncoderType encoder_type_;
   webrtc::VideoEncoder* const encoder_;
 
   std::unique_ptr<webrtc::VideoEncoder> fallback_encoder_;
   std::string fallback_implementation_name_;
   EncodedImageCallback* callback_;
 };
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_ENCODER_H_