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.
  */
 
@@ skipping 12 matching lines @@
 
 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 {
+    enum Error {
+      OK,
+
+      // Failed to send the packet.
+      ERROR_SEND_FAILED,
+    };
+
+    Result(Error error) : error(error) {}
+    Result(Error error, uint32_t frame_id) : error(error), frame_id(frame_id) {}
+
+    Error error;
+
+    // Frame ID assigned to the frame. The frame ID should be the same as the ID
+    // seen by the receiver for this frame. RTP timestamp of the frame is used
+    // as frame ID when RTP is used to send video.
+    uint32_t frame_id = 0;

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

Default value should probably be -1, or if you prefer to make this an Optional,
since it's not required to pass an ID. Or should the user assume that it's not
set if error != OK? Add that to the comment in that case.

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

it cannot be -1 because it's unsigned, and timestamp in RTP may be any 32-bit
value, so we cannot reserve a special value for null ID. The idea here is that
it's aloways initialized as long as error = OK.

[stefan-webrtc, 2016/07/25 15:17:09]

You could still use an Optional<uint32_t> or an int64_t with -1 representing
uninitialized. But I think the current choice probably is good enough.

+
+    // Tells the encoder that the next frame is going to be dropped.

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

Maybe "should be dropped" instead?

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

Done.

+    bool drop_next_frame = false;
+  };
+
   // 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.error != Result::OK) ? -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_