Skip to content

Update ScreenSharingService.java #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yoreland merged 1 commit into from
Dec 21, 2021
Merged

Update ScreenSharingService.java #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions ...APIExample/lib-screensharing/src/main/java/io/agora/rtc/ss/impl/ScreenSharingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,9 @@ public void onConnectionStateChanged(int state, int reason) {
}

private void setUpVideoConfig(Intent intent) {
int width = intent.getIntExtra(Constant.WIDTH, 0);
int height = intent.getIntExtra(Constant.HEIGHT, 0);
// 预置 1280*720 宽高
float boundingSizewidth = 720;
float boundingSizeheight = 1280;
int frameRate = intent.getIntExtra(Constant.FRAME_RATE, 15);
int bitRate = intent.getIntExtra(Constant.BITRATE, 0);
int orientationMode = intent.getIntExtra(Constant.ORIENTATION_MODE, 0);
Expand Down Expand Up @@ -378,8 +379,26 @@ private void setUpVideoConfig(Intent intent) {
om = VideoEncoderConfiguration.ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
break;
}

// 计算实际宽高
WindowManager wm = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics outMetrics = new DisplayMetrics();
wm.getDefaultDisplay().getMetrics(outMetrics);
float screenWidth = outMetrics.widthPixels;
float screenHeight = outMetrics.heightPixels;
Log.i(LOG_TAG, "setUpVideoConfig: " + screenWidth + "---" + screenHeight);
float mW = boundingSizewidth / screenWidth;
float mH = boundingSizeheight / screenHeight;
Log.i(LOG_TAG, "setUpVideoConfig: " + mW + "---" + mH);
if( mH < mW ) {
boundingSizewidth = boundingSizeheight / screenHeight * screenWidth;
Log.i(LOG_TAG, "boundingSizewidth: " + boundingSizewidth );
}
else if( mW < mH ) {
boundingSizeheight = boundingSizewidth / screenWidth * screenHeight;
Log.i(LOG_TAG, "boundingSizeheight:" + boundingSizeheight);
}
Log.i(LOG_TAG, "setUpVideoConfig: " + boundingSizewidth + "---" + boundingSizeheight);
mRtcEngine.setVideoEncoderConfiguration(new VideoEncoderConfiguration(
new VideoEncoderConfiguration.VideoDimensions(width, height), fr, bitRate, om));
new VideoEncoderConfiguration.VideoDimensions((int) boundingSizewidth, (int) boundingSizeheight), fr, bitRate, om));
}
}