buncha updates

Author: kevmo314

app/build.gradle.kts

@@ -102,12 +102,12 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
     implementation("androidx.activity:activity-compose:1.8.2")
 
-    implementation("androidx.camera:camera-core:1.3.3")
-    implementation("androidx.camera:camera-camera2:1.3.3")
-    implementation("androidx.camera:camera-lifecycle:1.3.3")
-    implementation("androidx.camera:camera-video:1.3.3")
-    implementation("androidx.camera:camera-view:1.3.3")
-    implementation("androidx.camera:camera-extensions:1.3.3")
+    implementation("androidx.camera:camera-core:1.4.1")
+    implementation("androidx.camera:camera-camera2:1.4.1")
+    implementation("androidx.camera:camera-lifecycle:1.4.1")
+    implementation("androidx.camera:camera-video:1.4.1")
+    implementation("androidx.camera:camera-view:1.4.1")
+    implementation("androidx.camera:camera-extensions:1.4.1")
 
     implementation("androidx.concurrent:concurrent-futures:1.1.0")
 

app/src/main/go/build_native.sh

@@ -85,7 +85,7 @@ build_arch() {
     # -checklinkname=0 is needed for Go 1.24+ compatibility with anet package
     cd cmd/jni
     go build -buildmode=c-shared \
-        -ldflags="-s -w -checklinkname=0 -extldflags '-Wl,-soname,libkinetic.so'" \
+        -ldflags="-s -w -checklinkname=0 -extldflags '-Wl,-soname,libkinetic.so -Wl,-z,max-page-size=16384'" \
         -o "$OUTPUT_DIR/$ARCH/libkinetic.so" \
         .
     cd ../..

app/src/main/go/build_third_party.sh

@@ -14,6 +14,7 @@ ANDROID_NDK=/home/kevin/android-ndk-r26d
 ANDROID_API=24
 ANDROID_PLATFORM=android-$ANDROID_API
 CMAKE_C_FLAGS="-fPIC"
+CMAKE_SHARED_LINKER_FLAGS="-Wl,-z,max-page-size=16384"
 CMAKE_MAKE_PROGRAM=ninja
 GOMOBILE_COMMAND=gomobile
 CMAKE_COMMAND=cmake
@@ -54,6 +55,7 @@ build_arch() {
               -DANDROID_NDK=$ANDROID_NDK \
               -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS" \
               -DCMAKE_CXX_FLAGS="$CMAKE_C_FLAGS" \
+              -DCMAKE_SHARED_LINKER_FLAGS="$CMAKE_SHARED_LINKER_FLAGS" \
               -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \
               -DCMAKE_MAKE_PROGRAM=$CMAKE_MAKE_PROGRAM \
               -GNinja \
@@ -71,7 +73,7 @@ build_arch() {
 
 # Export variables and function for parallel execution
 export -f build_arch
-export ANDROID_NDK ANDROID_API ANDROID_PLATFORM CMAKE_C_FLAGS CMAKE_MAKE_PROGRAM CMAKE_COMMAND
+export ANDROID_NDK ANDROID_API ANDROID_PLATFORM CMAKE_C_FLAGS CMAKE_SHARED_LINKER_FLAGS CMAKE_MAKE_PROGRAM CMAKE_COMMAND
 export CC CXX CCACHE_DIR CCACHE_MAXSIZE
 
 # Build all architectures in parallel
@@ -112,10 +114,12 @@ fi
 echo "Cleaning up build directories..."
 rm -rf third_party/build
 
-# Copy libraries to jniLibs
+# Copy libraries to jniLibs (only the main shared libraries, not engine modules)
 echo "Copying libraries to jniLibs..."
 for abi in arm64-v8a armeabi-v7a x86 x86_64; do
-    cp -r third_party/output/$abi/lib ../jniLibs/$abi
+    mkdir -p ../jniLibs/$abi
+    # Only copy the main .so files, skip subdirectories like engines-3 and ossl-modules
+    cp third_party/output/$abi/lib/*.so ../jniLibs/$abi/ 2>/dev/null || true
 done
 
 echo "Build completed successfully!"

app/src/main/go/whip.go

@@ -15,6 +15,7 @@ import (
 	"github.com/pion/interceptor"
 	"github.com/pion/interceptor/pkg/cc"
 	"github.com/pion/interceptor/pkg/gcc"
+	"github.com/pion/interceptor/pkg/nack"
 	"github.com/pion/rtcp"
 	"github.com/pion/rtp"
 	"github.com/pion/rtp/codecs"
@@ -48,6 +49,31 @@ type whipTrack struct {
 	payloadType     uint8
 }
 
+const (
+	// Playout delay RTP header extension URI
+	playoutDelayExtensionURI = "http://www.webrtc.org/experiments/rtp-hdrext/playout-delay"
+	// Extension ID to use (must match what's negotiated in SDP)
+	playoutDelayExtensionID = 6
+	// Playout delay values in 10ms units (100 = 1000ms = 1s)
+	minPlayoutDelay = 100 // 1 second
+	maxPlayoutDelay = 100 // 1 second
+)
+
+// addPlayoutDelayExtension adds the playout delay header extension to an RTP packet
+func addPlayoutDelayExtension(pkt *rtp.Packet) {
+	ext := rtp.PlayoutDelayExtension{
+		MinDelay: minPlayoutDelay,
+		MaxDelay: maxPlayoutDelay,
+	}
+	payload, err := ext.Marshal()
+	if err != nil {
+		return
+	}
+	pkt.Header.Extension = true
+	pkt.Header.ExtensionProfile = 0xBEDE // One-byte header extension
+	pkt.Header.SetExtension(playoutDelayExtensionID, payload)
+}
+
 func NewWHIPSink(url, bearerToken, encodedMediaFormatMimeTypes string) (*WHIPSink, error) {
 	s := &WHIPSink{
 		url:         url,
@@ -90,8 +116,31 @@ func (s *WHIPSink) connect() error {
 		return err
 	}
 
+	// Register playout delay header extension for video
+	if err := m.RegisterHeaderExtension(
+		webrtc.RTPHeaderExtensionCapability{URI: playoutDelayExtensionURI},
+		webrtc.RTPCodecTypeVideo,
+		webrtc.RTPTransceiverDirectionSendonly,
+	); err != nil {
+		log.Printf("Warning: failed to register playout delay extension: %v", err)
+	}
+
 	i := &interceptor.Registry{}
 
+	// Add NACK generator for packet retransmission (part of FEC strategy)
+	generatorFactory, err := nack.NewGeneratorInterceptor()
+	if err != nil {
+		return err
+	}
+	i.Add(generatorFactory)
+
+	// Add NACK responder to handle retransmission requests
+	responderFactory, err := nack.NewResponderInterceptor()
+	if err != nil {
+		return err
+	}
+	i.Add(responderFactory)
+
 	// Create congestion controller with Google Congestion Control
 	// Initial bitrate: 1 Mbps
 	congestionController, err := cc.NewInterceptor(func() (cc.BandwidthEstimator, error) {
@@ -402,6 +451,7 @@ func (s *WHIPSink) WriteH264(buf []byte, ptsMicroseconds int64) (int, error) {
 				packets := videoTrack.packetizer.(rtp.Packetizer).Packetize(videoTrack.sps, 0)
 				for _, pkt := range packets {
 					pkt.Header.Timestamp = rtpTimestamp
+					addPlayoutDelayExtension(pkt)
 					if err := videoTrack.track.WriteRTP(pkt); err != nil {
 						return 0, fmt.Errorf("error writing SPS RTP: %v", err)
 					}
@@ -413,6 +463,7 @@ func (s *WHIPSink) WriteH264(buf []byte, ptsMicroseconds int64) (int, error) {
 				packets := videoTrack.packetizer.(rtp.Packetizer).Packetize(videoTrack.pps, 0)
 				for _, pkt := range packets {
 					pkt.Header.Timestamp = rtpTimestamp
+					addPlayoutDelayExtension(pkt)
 					if err := videoTrack.track.WriteRTP(pkt); err != nil {
 						return 0, fmt.Errorf("error writing PPS RTP: %v", err)
 					}
@@ -428,6 +479,7 @@ func (s *WHIPSink) WriteH264(buf []byte, ptsMicroseconds int64) (int, error) {
 		// Override timestamp to use our absolute timestamp
 		for _, pkt := range packets {
 			pkt.Header.Timestamp = rtpTimestamp
+			addPlayoutDelayExtension(pkt)
 			if err := videoTrack.track.WriteRTP(pkt); err != nil {
 				return 0, fmt.Errorf("error writing RTP packet: %v", err)
 			}

app/src/main/java/com/kevmo314/kineticstreamer/AudioVisualizerView.kt

@@ -1,19 +1,14 @@
 package com.kevmo314.kineticstreamer
 
 import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
@@ -26,8 +21,7 @@ fun AudioVisualizerView(
     audioLevels: List<Float> = emptyList(),
     modifier: Modifier = Modifier,
     barCount: Int = 12,
-    barColor: Color = Color.White,
-    backgroundColor: Color = Color.Black.copy(alpha = 0.6f)
+    barColor: Color = Color.White
 ) {
     var displayLevels by remember { mutableStateOf(List(barCount) { 0f }) }
 
@@ -62,17 +56,10 @@ fun AudioVisualizerView(
         }
     }
 
-    Box(
-        modifier = modifier
-            .size(150.dp, 40.dp)
-            .clip(RoundedCornerShape(8.dp))
-            .background(backgroundColor)
+    Canvas(
+        modifier = modifier.size(150.dp, 40.dp)
     ) {
-        Canvas(
-            modifier = Modifier.size(150.dp, 40.dp)
-        ) {
-            drawAudioBars(displayLevels, barColor)
-        }
+        drawAudioBars(displayLevels, barColor)
     }
 }
 

app/src/main/java/com/kevmo314/kineticstreamer/MainActivity.kt

@@ -82,7 +82,7 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         enableEdgeToEdge()
-        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
 
         super.onCreate(savedInstanceState)