Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java

Issue 1306073003: Android: Remove VideoRenderer.Callbacks.canApplyRotation() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Restore previous test behaviour + remove some dead code Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java
diff --git a/talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java b/talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java
index e7b24b17ba649c3e3988b997d890c457c76d80bb..5133723ea6ee1a028b450cce09ce8144053fdcc7 100644
--- a/talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java
+++ b/talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java
@@ -134,16 +134,10 @@ public class PeerConnectionTest {
@Override
public synchronized void renderFrame(VideoRenderer.I420Frame frame) {
- setSize(frame.width, frame.height);
+ setSize(frame.rotatedWidth(), frame.rotatedHeight());
--expectedFramesDelivered;
}
- // TODO(guoweis): Remove this once chrome code base is updated.
- @Override
- public boolean canApplyRotation() {
- return false;
- }
-
public synchronized void expectSignalingChange(SignalingState newState) {
expectedSignalingChanges.add(newState);
}
@@ -438,30 +432,6 @@ public class PeerConnectionTest {
static int videoWindowsMapped = -1;
- private static class TestRenderer implements VideoRenderer.Callbacks {
- public int width = -1;
- public int height = -1;
- public int numFramesDelivered = 0;
-
- private void setSize(int width, int height) {
- assertEquals(this.width, -1);
- assertEquals(this.height, -1);
- this.width = width;
- this.height = height;
- }
-
- @Override
- public void renderFrame(VideoRenderer.I420Frame frame) {
- ++numFramesDelivered;
- }
-
- // TODO(guoweis): Remove this once chrome code base is updated.
- @Override
- public boolean canApplyRotation() {
- return false;
- }
- }
-
private static VideoRenderer createVideoRenderer(
VideoRenderer.Callbacks videoCallbacks) {
if (!RENDER_TO_GUI) {

Powered by Google App Engine
This is Rietveld 408576698