Revert of Remove deprected functions from EncodedImageCallback and RtpRtcp (patchset #4 id:100001 of https://codereview.webrtc.org/2405173006/ )
Reason for revert:
Still breaks internal downstream project.
Sergey: Please update internal project before relanding this.
Original issue's description:
> Remove deprected functions from EncodedImageCallback and RtpRtcp
>
> Removed EncodedImageCallback::Encoded() and RtpRtcp::SendOutgoingData().
> These methods should no longer be used anywhere and it's safe to remove
> them.
>
> BUG=chromium:621691
>
> Committed: https://crrev.com/c681250aaa2025836db7669694e323898e5c2ca7
> Cr-Commit-Position: refs/heads/master@{#14923}
TBR=mflodman@webrtc.org,stefan@webrtc.org,sergeyu@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:621691
Review-Url: https://codereview.webrtc.org/2479643002
Cr-Commit-Position: refs/heads/master@{#14925}
diff --git a/webrtc/api/android/jni/androidmediaencoder_jni.cc b/webrtc/api/android/jni/androidmediaencoder_jni.cc
index 92b5aae..0e6e96a 100644
--- a/webrtc/api/android/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/android/jni/androidmediaencoder_jni.cc
@@ -263,8 +263,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_;
@@ -1063,8 +1063,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));
@@ -1175,7 +1174,7 @@
}
}
- callback_result = callback_->OnEncodedImage(*image, &info, &header);
+ callback_status = callback_->Encoded(*image, &info, &header);
}
// Return output buffer back to the encoder.
@@ -1209,9 +1208,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;
}