on media format events

Author: serezhka

.github/workflows/build.yaml

@@ -0,0 +1,20 @@
+name: build
+
+on: [push]
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: adopt
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.4.2
+          arguments: build

.gitignore

@@ -1,8 +1,7 @@
 .gradle
 gradlew
 gradlew.bat
-gradle/wrapper/*
-!gradle/wrapper/gradle-wrapper.properties
+gradle
 .idea
 out
 build

.travis.yml

@@ -1,49 +1,48 @@
 plugins {
-    id 'maven'
     id 'java-library'
 }
 
 group 'com.github.serezhka'
-version '1.0.4'
+version '1.0.5'
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
-    jcenter()
     mavenCentral()
     maven {
         url "https://jitpack.io"
     }
 }
 
 dependencies {
-    implementation "io.netty:netty-all:4.1.52.Final"
-    implementation "org.slf4j:slf4j-api:1.7.30"
-    implementation "com.github.serezhka:java-airplay-lib:1.0.4"
-    // implementation files('C:\\projects\\java-airplay-lib\\build\\libs\\java-airplay-lib-1.0.4-all.jar')
+    implementation 'io.netty:netty-all:4.1.77.Final'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'com.github.serezhka:java-airplay-lib:1.0.5'
+    // implementation files("$project.rootDir\\..\\java-airplay-lib\\build\\libs\\java-airplay-lib-1.0.5-all.jar")
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.2"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.2"
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
 test {
     useJUnitPlatform()
 }
 
 wrapper {
-    gradleVersion = '6.1.1'
+    gradleVersion = '7.4.2'
     distributionType = Wrapper.DistributionType.ALL
 }
 
 task fatJar(type: Jar) {
-    classifier = 'all'
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    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
 }
 

build.gradle

@@ -1,8 +1,15 @@
 package com.github.serezhka.jap2server;
 
+import com.github.serezhka.jap2lib.rtsp.AudioStreamInfo;
+import com.github.serezhka.jap2lib.rtsp.VideoStreamInfo;
+
 public interface AirplayDataConsumer {
 
     void onVideo(byte[] video);
 
+    void onVideoFormat(VideoStreamInfo videoStreamInfo);
+
     void onAudio(byte[] audio);
+
+    void onAudioFormat(AudioStreamInfo audioInfo);
 }

gradle/wrapper/gradle-wrapper.properties

@@ -54,8 +54,8 @@ protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throw
             return;
         }
 
-        log.debug("Got audio packet. flag: {}, type: {}, prevSeqNum: {}, curSecNum: {}, audio packets in buffer: {}",
-                flag, type, prevSeqNum, curSeqNo, packetsInBuffer);
+        /*log.debug("Got audio packet. flag: {}, type: {}, prevSeqNum: {}, curSecNum: {}, audio packets in buffer: {}",
+                flag, type, prevSeqNum, curSeqNo, packetsInBuffer);*/
 
         AudioPacket audioPacket = buffer[curSeqNo % buffer.length];
         audioPacket

src/main/java/com/github/serezhka/jap2server/AirplayDataConsumer.java

@@ -2,6 +2,7 @@
 
 import com.github.serezhka.jap2lib.rtsp.AudioStreamInfo;
 import com.github.serezhka.jap2lib.rtsp.MediaStreamInfo;
+import com.github.serezhka.jap2lib.rtsp.VideoStreamInfo;
 import com.github.serezhka.jap2server.AirplayDataConsumer;
 import com.github.serezhka.jap2server.internal.AudioControlServer;
 import com.github.serezhka.jap2server.internal.AudioReceiver;
@@ -52,9 +53,11 @@ protected boolean handleRequest(ChannelHandlerContext ctx, Session session, Full
                     case AUDIO:
                         AudioStreamInfo audioStreamInfo = (AudioStreamInfo) mediaStreamInfo;
 
-                        if (!audioStreamInfo.getAudioFormat().equals(AudioStreamInfo.AudioFormat.AAC_ELD_44100_2)) {
-                            log.error("Audio format {} is not supported yet!", audioStreamInfo.getAudioFormat());
-                        }
+                        log.info("Audio format is: {}", audioStreamInfo.getAudioFormat());
+                        log.info("Audio compression type is: {}", audioStreamInfo.getCompressionType());
+                        log.info("Audio samples per frame is: {}", audioStreamInfo.getSamplesPerFrame());
+
+                        airplayDataConsumer.onAudioFormat(audioStreamInfo);
 
                         var audioHandler = new AudioHandler(session.getAirPlay(), airplayDataConsumer);
                         var audioReceiver = new AudioReceiver(audioHandler, this);
@@ -75,9 +78,14 @@ protected boolean handleRequest(ChannelHandlerContext ctx, Session session, Full
 
                         session.getAirPlay().rtspSetupAudio(new ByteBufOutputStream(response.content()),
                                 audioReceiver.getPort(), audioControlServer.getPort());
+
                         break;
 
                     case VIDEO:
+                        VideoStreamInfo videoStreamInfo = (VideoStreamInfo) mediaStreamInfo;
+
+                        airplayDataConsumer.onVideoFormat(videoStreamInfo);
+
                         var mirroringHandler = new MirroringHandler(session.getAirPlay(), airplayDataConsumer);
                         var airPlayReceiver = new MirroringReceiver(airPlayPort, mirroringHandler);
                         var airPlayReceiverThread = new Thread(airPlayReceiver);