Revert of Remove deprected functions from EncodedImageCallback and RtpRtcp

webrtc/api/android/jni/androidmediaencoder_jni.cc

Index: webrtc/api/android/jni/androidmediaencoder_jni.cc
diff --git a/webrtc/api/android/jni/androidmediaencoder_jni.cc b/webrtc/api/android/jni/androidmediaencoder_jni.cc
index 3b753246eecc3b0e5af841df5cc49f139097b96e..c5c84549d6c717293542dec6edb4b83d9e509dc6 100644
--- a/webrtc/api/android/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/android/jni/androidmediaencoder_jni.cc
@@ -266,8 +266,8 @@
                                            // |input_frame_infos_|.
   // Frame size in bytes fed to MediaCodec.
   int yuv_size_;
-  // True only when between a callback_->OnEncodedImage() call return a positive
-  // value and the next Encode() call being ignored.
+  // True only when between a callback_->Encoded() call return a positive value
+  // and the next Encode() call being ignored.
   bool drop_next_input_frame_;
   // Global references; must be deleted in Release().
   std::vector<jobject> input_buffers_;
@@ -1066,8 +1066,7 @@
     }
 
     // Callback - return encoded frame.
-    webrtc::EncodedImageCallback::Result callback_result(
-        webrtc::EncodedImageCallback::Result::OK);
+    int32_t callback_status = 0;
     if (callback_) {
       std::unique_ptr<webrtc::EncodedImage> image(
           new webrtc::EncodedImage(payload, payload_size, payload_size));
@@ -1178,7 +1177,7 @@
         }
       }
 
-      callback_result = callback_->OnEncodedImage(*image, &info, &header);
+      callback_status = callback_->Encoded(*image, &info, &header);
     }
 
     // Return output buffer back to the encoder.
@@ -1212,9 +1211,11 @@
     current_encoding_time_ms_ += frame_encoding_time_ms;
     LogStatistics(false);
 
-    // Errors in callback_result are currently ignored.
-    if (callback_result.drop_next_frame)
+    if (callback_status > 0) {
       drop_next_input_frame_ = true;
+      // Theoretically could handle callback_status<0 here, but unclear what
+      // that would mean for us.
+    }
   }
   return true;
 }