Merge pull request #77 from shiguredo/feature/h265

H.265 対応
shiguredo · Nov 17, 2023 · 62f1455 · 62f1455
2 parents 691ba52 + f80decc
commit 62f1455
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,12 @@
 
 ## develop
 
+- [UPDATE] ビデオチャット、サイマルキャスト、スポットライトのサンプルを H.265 に対応する
+    - @enm10k
+- [UPDATE] 解像度に qHD (960x540, 540x960) を追加する
+    - @enm10k
+- [FIX] SoraFrameSize.portrait のキーで幅と高さが逆になっているものがあったので修正
+    - @enm10k
 - [FIX] マルチウィンドウモード時に画面を回転すると Activity が再作成されるのを防ぐ設定を入れる
     - @miosakuma
 

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: "com.github.ben-manes.versions"
 
 buildscript {
     ext.kotlin_version = '1.8.10'
-    ext.sora_android_sdk_version = '2023.2.0'
+    ext.sora_android_sdk_version = 'develop-SNAPSHOT'
 
     repositories {
         google()

diff --git a/samples/src/main/kotlin/jp/shiguredo/sora/sample/option/SoraFrameSize.kt b/samples/src/main/kotlin/jp/shiguredo/sora/sample/option/SoraFrameSize.kt
@@ -15,6 +15,7 @@ class SoraFrameSize {
             "HQVGA: 240x160" to SoraVideoOption.FrameSize.Landscape.HQVGA,
             "QVGA: 320x240" to SoraVideoOption.FrameSize.Landscape.QVGA,
             "VGA: 640x480" to SoraVideoOption.FrameSize.Landscape.VGA,
+            "qHD: 960x540" to SoraVideoOption.FrameSize.Landscape.qHD,
             "HD: 1280x720" to SoraVideoOption.FrameSize.Landscape.HD,
             "FHD: 1920x1080" to SoraVideoOption.FrameSize.Landscape.FHD,
             "3840x1920" to SoraVideoOption.FrameSize.Landscape.Res3840x1920,
@@ -26,11 +27,12 @@ class SoraFrameSize {
             "HQVGA: 160x240" to SoraVideoOption.FrameSize.Portrait.HQVGA,
             "QVGA: 240x320" to SoraVideoOption.FrameSize.Portrait.QVGA,
             "VGA: 480x640" to SoraVideoOption.FrameSize.Portrait.VGA,
+            "qHD: 540x960" to SoraVideoOption.FrameSize.Portrait.qHD,
             "HD: 720x1280" to SoraVideoOption.FrameSize.Portrait.HD,
             "FHD: 1080x1920" to SoraVideoOption.FrameSize.Portrait.FHD,
-            "3840x1920" to SoraVideoOption.FrameSize.Portrait.Res1920x3840,
-            "UHD: 3840x2160" to SoraVideoOption.FrameSize.Portrait.UHD2160x3840,
-            "4096x2160" to SoraVideoOption.FrameSize.Portrait.UHD2160x4096,
+            "1920x3840" to SoraVideoOption.FrameSize.Portrait.Res1920x3840,
+            "UHD: 2160x3840" to SoraVideoOption.FrameSize.Portrait.UHD2160x3840,
+            "2160x4096" to SoraVideoOption.FrameSize.Portrait.UHD2160x4096,
         )
 
         val all = landscape + portrait

diff --git a/samples/src/main/kotlin/jp/shiguredo/sora/sample/ui/SimulcastSetupActivity.kt b/samples/src/main/kotlin/jp/shiguredo/sora/sample/ui/SimulcastSetupActivity.kt
@@ -15,7 +15,7 @@ class SimulcastSetupActivity : AppCompatActivity() {
         val TAG = SimulcastSetupActivity::class.simpleName
     }
 
-    private val videoCodecOptions = listOf("VP8", "VP9", "H264", "AV1")
+    private val videoCodecOptions = listOf("VP8", "VP9", "H264", "H265", "AV1")
     private val videoEnabledOptions = listOf("有効", "無効")
     private val audioCodecOptions = listOf("OPUS")
     private val audioEnabledOptions = listOf("有効", "無効")

diff --git a/samples/src/main/kotlin/jp/shiguredo/sora/sample/ui/SpotlightRoomSetupActivity.kt b/samples/src/main/kotlin/jp/shiguredo/sora/sample/ui/SpotlightRoomSetupActivity.kt
@@ -16,7 +16,7 @@ class SpotlightRoomSetupActivity : AppCompatActivity() {
     }
 
     private val spotlightNumberOptions = listOf("未指定", "1", "2", "3", "4", "5", "6", "7", "8")
-    private val videoCodecOptions = listOf("VP8", "VP9", "H264", "AV1")
+    private val videoCodecOptions = listOf("VP8", "VP9", "H264", "H265", "AV1")
     private val audioCodecOptions = listOf("OPUS")
     private val audioBitRateOptions = listOf(
         "未指定", "8", "16", "24", "32",

diff --git a/samples/src/main/kotlin/jp/shiguredo/sora/sample/ui/VideoChatRoomSetupActivity.kt b/samples/src/main/kotlin/jp/shiguredo/sora/sample/ui/VideoChatRoomSetupActivity.kt
@@ -15,7 +15,7 @@ class VideoChatRoomSetupActivity : AppCompatActivity() {
         val TAG = VideoChatRoomSetupActivity::class.simpleName
     }
 
-    private val videoCodecOptions = listOf("VP9", "VP8", "H264", "AV1")
+    private val videoCodecOptions = listOf("VP9", "VP8", "H264", "H265", "AV1")
     private val videoEnabledOptions = listOf("有効", "無効")
     private val audioCodecOptions = listOf("OPUS")
     private val audioEnabledOptions = listOf("有効", "無効")