diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp b/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp index 346c3f6..b995fa7 100644 --- a/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp +++ b/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp @@ -8,7 +8,11 @@ #include "sdk/android/native_api/jni/scoped_java_ref.h" #include "Log.hpp" +#define private public +#define protected public #include "RouterCallback.hpp" +#undef private +#undef protected /** * 视频房间头文件 @@ -175,6 +179,13 @@ namespace acgist { * @param env JNIEnv */ void closeRoom(JNIEnv* env); + /** + * 设置码率 + * + * @param minBitrate 最小码率 + * @param maxBitrate 最大码率 + */ + void setBitrate(int minBitrate, int maxBitrate); }; } \ No newline at end of file diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp index a45c0b5..44fbc08 100644 --- a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp +++ b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp @@ -552,6 +552,22 @@ namespace acgist { this->closeRoomCallback(env); } + void Room::setBitrate(int minBitrate, int maxBitrate) { + if( + this->sendTransport == nullptr || + this->sendTransport->handler == nullptr || + this->sendTransport->handler->pc == nullptr || + this->sendTransport->handler->pc->pc == nullptr + ) { + return; + } + webrtc::BitrateSettings settings; + settings.min_bitrate_bps = minBitrate; + settings.max_bitrate_bps = maxBitrate; + settings.start_bitrate_bps = minBitrate; + this->sendTransport->handler->pc->pc->SetBitrate(settings); + } + extern "C" JNIEXPORT jlong JNICALL Java_com_acgist_taoyao_media_client_Room_nativeNewRoom( JNIEnv* env, jobject me, diff --git a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/DateUtils.java b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/DateUtils.java index c9fdf0f..6aa384a 100644 --- a/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/DateUtils.java +++ b/taoyao-signal-server/taoyao-boot/src/main/java/com/acgist/taoyao/boot/utils/DateUtils.java @@ -207,7 +207,7 @@ public final class DateUtils { * * @return 日期字符串 */ - public static String format(LocalDate localDate, DateStyle format) { + public static final String format(LocalDate localDate, DateStyle format) { return localDate != null && format != null ? format.getDateTimeFormatter().format(localDate) : null; } @@ -219,7 +219,7 @@ public final class DateUtils { * * @return 时间字符串 */ - public static String format(LocalTime localTime, TimeStyle format) { + public static final String format(LocalTime localTime, TimeStyle format) { return localTime != null && format != null ? format.getDateTimeFormatter().format(localTime) : null; } @@ -231,7 +231,7 @@ public final class DateUtils { * * @return 日期时间字符串 */ - public static String format(LocalDateTime localDateTime, DateTimeStyle format) { + public static final String format(LocalDateTime localDateTime, DateTimeStyle format) { return localDateTime != null && format != null ? format.getDateTimeFormatter().format(localDateTime) : null; }