adapt screen share resolution to different device screen ratio

Xia Ning · Xia Ning · commit fd8edd5191b8 · 2021-03-28T14:23:39.000+08:00
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MultiProcess.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MultiProcess.java
@@ -3,11 +3,13 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -202,7 +204,7 @@ else if (v.getId() == R.id.screenShare){
             if (!isSharing) {
                 mSSClient.start(getContext(), getResources().getString(R.string.agora_app_id), null,
                         channelId, SCREEN_SHARE_UID, new VideoEncoderConfiguration(
-                                VD_640x360,
+                                getScreenDimensions(),
                                 FRAME_RATE_FPS_15,
                                 STANDARD_BITRATE,
                                 ORIENTATION_MODE_ADAPTIVE
@@ -217,6 +219,13 @@ channelId, SCREEN_SHARE_UID, new VideoEncoderConfiguration(
         }
     }
 
+    private VideoEncoderConfiguration.VideoDimensions getScreenDimensions(){
+        WindowManager manager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+        DisplayMetrics outMetrics = new DisplayMetrics();
+        manager.getDefaultDisplay().getMetrics(outMetrics);
+        return new VideoEncoderConfiguration.VideoDimensions(outMetrics.widthPixels / 2, outMetrics.heightPixels / 2);
+    }
+
     private void joinChannel(String channelId)
     {
         // Check if the context is valid
diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SwitchCameraScreenShare.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SwitchCameraScreenShare.java
@@ -280,7 +280,6 @@ private void setVideoConfig(int sourceType, int width, int height) {
                 VideoEncoderConfiguration.STANDARD_BITRATE, curMirrorMode
         ));
 
-//        ENGINE.setParameters("{\"rtc.log_filter\": 65535}");
     }
 
     private void addLocalPreview() {
diff --git a/Android/APIExample/lib-screensharing/src/main/java/io/agora/rtc/ss/impl/ScreenSharingService.java b/Android/APIExample/lib-screensharing/src/main/java/io/agora/rtc/ss/impl/ScreenSharingService.java
@@ -94,6 +94,7 @@ public void onFrameAvailable(ImgTexFrame frame) {
 
                 mSCS.getConsumer().consumeTextureFrame(frame.mTextureId, AgoraVideoFrame.FORMAT_TEXTURE_OES, frame.mFormat.mWidth,
                         frame.mFormat.mHeight, 0, frame.pts, frame.mTexMatrix);
+                //Log.i(LOG_TAG, String.format("On consumeTextureFrame, width: %d, height: %d", frame.mFormat.mWidth, frame.mFormat.mHeight));
             }
         });
 

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,6 @@ private void setVideoConfig(int sourceType, int width, int height) {`
`280`	`280`	`VideoEncoderConfiguration.STANDARD_BITRATE, curMirrorMode`
`281`	`281`	`));`
`282`	`282`
`283`		`-// ENGINE.setParameters("{\"rtc.log_filter\": 65535}");`
`284`	`283`	`}`
`285`	`284`
`286`	`285`	`private void addLocalPreview() {`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ public void onFrameAvailable(ImgTexFrame frame) {`
`94`	`94`
`95`	`95`	`mSCS.getConsumer().consumeTextureFrame(frame.mTextureId, AgoraVideoFrame.FORMAT_TEXTURE_OES, frame.mFormat.mWidth,`
`96`	`96`	`frame.mFormat.mHeight, 0, frame.pts, frame.mTexMatrix);`
	`97`	`+ //Log.i(LOG_TAG, String.format("On consumeTextureFrame, width: %d, height: %d", frame.mFormat.mWidth, frame.mFormat.mHeight));`
`97`	`98`	`}`
`98`	`99`	`});`
`99`	`100`