rtsp audio stream info

Author: serezhka

.gitignore

@@ -2,7 +2,6 @@
 .gradle
 gradlew
 gradlew.bat
-gradle/wrapper/*
-!gradle/wrapper/gradle-wrapper.properties
+gradle
 build
 out

.travis.yml

@@ -1,8 +1,8 @@
 language: java
 
 before_install:
-  - wget https://services.gradle.org/distributions/gradle-6.1-bin.zip
-  - unzip -qq gradle-6.1-bin.zip
-  - export GRADLE_HOME=$PWD/gradle-6.1
+  - wget https://services.gradle.org/distributions/gradle-7.4-bin.zip
+  - unzip -qq gradle-7.4-bin.zip
+  - export GRADLE_HOME=$PWD/gradle-7.4
   - export PATH=$GRADLE_HOME/bin:$PATH
   - gradle -v

README.md

@@ -1,6 +1,7 @@
 # java-airplay-lib
 
-[![Build Status](https://travis-ci.com/serezhka/java-airplay-lib.svg?branch=master)](https://travis-ci.com/serezhka/java-airplay-lib) [![Release](https://jitpack.io/v/serezhka/java-airplay-lib.svg)](https://jitpack.io/#serezhka/java-airplay-lib) [![HitCount](http://hits.dwyl.io/serezhka/java-airplay-lib.svg)](http://hits.dwyl.io/serezhka/java-airplay-lib)
+[![Build Status](https://travis-ci.com/serezhka/java-airplay-lib.svg?branch=master)](https://travis-ci.com/serezhka/java-airplay-lib)
+[![Release](https://jitpack.io/v/serezhka/java-airplay-lib.svg)](https://jitpack.io/#serezhka/java-airplay-lib)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT)
 
 This library is intended to easily create AirPlay2 servers acting like Apple TV. Tested with iPhone X (iOS 14.0.1)

build.gradle

@@ -1,46 +1,47 @@
 plugins {
-    id 'maven'
     id 'java-library'
 }
 
 group 'com.github.serezhka'
-version '1.0.4'
-
-sourceCompatibility = JavaVersion.VERSION_1_9
+version '1.0.5'
 
 repositories {
     mavenCentral()
 }
 
-dependencies {
-    implementation "org.jmdns:jmdns:3.5.5"
-    implementation "net.i2p.crypto:eddsa:0.3.0"
-    implementation "org.whispersystems:curve25519-java:0.5.0"
-    implementation "com.googlecode.plist:dd-plist:1.22"
-    implementation "org.slf4j:slf4j-api:1.7.30"
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_9
+}
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
-    testRuntimeOnly "org.slf4j:slf4j-simple:1.7.30"
+dependencies {
+    implementation 'org.jmdns:jmdns:3.5.7'
+    implementation 'net.i2p.crypto:eddsa:0.3.0'
+    implementation 'org.whispersystems:curve25519-java:0.5.0'
+    implementation 'com.googlecode.plist:dd-plist:1.23'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.36'
 }
 
 test {
     useJUnitPlatform()
 }
 
 wrapper {
-    gradleVersion = '6.1.1'
+    gradleVersion = '7.4'
     distributionType = Wrapper.DistributionType.ALL
 }
 
 task fatJar(type: Jar) {
-    classifier = 'all'
+    archiveClassifier.set('all')
     from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
 
 task jarSources(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -44,14 +44,23 @@ MediaStreamInfo getMediaStreamInfo(InputStream rtspSetupPayload) throws Exceptio
 
                 // audio
                 case 96:
+                    AudioStreamInfo.AudioStreamInfoBuilder builder = new AudioStreamInfo.AudioStreamInfoBuilder();
+                    if (stream.containsKey("ct")) {
+                        int compressionType = (int) stream.get("ct");
+                        builder.compressionType(AudioStreamInfo.CompressionType.fromCode(compressionType));
+                    }
                     if (stream.containsKey("audioFormat")) {
                         long audioFormatCode = (int) stream.get("audioFormat"); // FIXME int or long ?!
-                        return new AudioStreamInfo(audioFormatCode);
+                        builder.audioFormat(AudioStreamInfo.AudioFormat.fromCode(audioFormatCode));
+                    }
+                    if (stream.containsKey("spf")) {
+                        int samplesPerFrame = (int) stream.get("spf");
+                        builder.samplesPerFrame(samplesPerFrame);
                     }
-                    return new AudioStreamInfo();
+                    return builder.build();
 
                 default:
-                    log.warn("Unknown stream type: {}", type);
+                    log.error("Unknown stream type: {}", type);
             }
         }
         return null;

src/main/java/com/github/serezhka/jap2lib/RTSP.java

@@ -2,25 +2,56 @@
 
 public class AudioStreamInfo implements MediaStreamInfo {
 
+    private final CompressionType compressionType;
     private final AudioFormat audioFormat;
+    private final int samplesPerFrame;
 
-    public AudioStreamInfo() {
-        audioFormat = null;
-    }
-
-    public AudioStreamInfo(long audioFormatCode) {
-        this.audioFormat = AudioFormat.fromCode(audioFormatCode);
+    private AudioStreamInfo(CompressionType compressionType, AudioFormat audioFormat, int samplesPerFrame) {
+        this.compressionType = compressionType;
+        this.audioFormat = audioFormat;
+        this.samplesPerFrame = samplesPerFrame;
     }
 
     @Override
     public StreamType getStreamType() {
         return StreamType.AUDIO;
     }
 
+    public CompressionType getCompressionType() {
+        return compressionType;
+    }
+
     public AudioFormat getAudioFormat() {
         return audioFormat;
     }
 
+    public int getSamplesPerFrame() {
+        return samplesPerFrame;
+    }
+
+    public enum CompressionType {
+        LPCM(1),
+        ALAC(2),
+        AAC(4),
+        AAC_ELD(8),
+        OPUS(32);
+
+        private final int code;
+
+        CompressionType(int code) {
+            this.code = code;
+        }
+
+        public static CompressionType fromCode(long code) {
+            for (CompressionType type : CompressionType.values()) {
+                if (type.code == code) {
+                    return type;
+                }
+            }
+            throw new IllegalArgumentException("Unknown compression type with code: " + code);
+        }
+    }
+
     public enum AudioFormat {
         PCM_8000_16_1(0x4),
         PCM_8000_16_2(0x8),
@@ -69,4 +100,29 @@ public static AudioFormat fromCode(long code) {
             throw new IllegalArgumentException("Unknown audio format with code: " + code);
         }
     }
+
+    public static final class AudioStreamInfoBuilder {
+        private AudioFormat audioFormat;
+        private CompressionType compressionType;
+        private int samplesPerFrame;
+
+        public AudioStreamInfoBuilder audioFormat(AudioFormat audioFormat) {
+            this.audioFormat = audioFormat;
+            return this;
+        }
+
+        public AudioStreamInfoBuilder compressionType(CompressionType compressionType) {
+            this.compressionType = compressionType;
+            return this;
+        }
+
+        public AudioStreamInfoBuilder samplesPerFrame(int samplesPerFrame) {
+            this.samplesPerFrame = samplesPerFrame;
+            return this;
+        }
+
+        public AudioStreamInfo build() {
+            return new AudioStreamInfo(compressionType, audioFormat, samplesPerFrame);
+        }
+    }
 }