diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioCodec.java b/server/src/main/java/com/genymobile/scrcpy/AudioCodec.java
new file mode 100644
index 00000000..4d9e3201
--- /dev/null
+++ b/server/src/main/java/com/genymobile/scrcpy/AudioCodec.java
@@ -0,0 +1,46 @@
+package com.genymobile.scrcpy;
+
+import android.media.MediaFormat;
+
+public enum AudioCodec implements Codec {
+    OPUS(0x6f_70_75_73, "opus", MediaFormat.MIMETYPE_AUDIO_OPUS);
+
+    private final int id; // 4-byte ASCII representation of the name
+    private final String name;
+    private final String mimeType;
+
+    AudioCodec(int id, String name, String mimeType) {
+        this.id = id;
+        this.name = name;
+        this.mimeType = mimeType;
+    }
+
+    @Override
+    public Type getType() {
+        return Type.AUDIO;
+    }
+
+    @Override
+    public int getId() {
+        return id;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public static AudioCodec findByName(String name) {
+        for (AudioCodec codec : values()) {
+            if (codec.name.equals(name)) {
+                return codec;
+            }
+        }
+        return null;
+    }
+}
diff --git a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java b/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java
index 48ac8d26..4110b1a1 100644
--- a/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java
@@ -45,6 +45,8 @@ public final class AudioEncoder {
     private static final int BUFFER_MS = 15; // milliseconds
     private static final int BUFFER_SIZE = SAMPLE_RATE * CHANNELS * BUFFER_MS / 1000;
 
+    private final Streamer streamer;
+
     private AudioRecord recorder;
     private MediaCodec mediaCodec;
 
@@ -61,6 +63,10 @@ public final class AudioEncoder {
 
     private boolean ended;
 
+    public AudioEncoder(Streamer streamer) {
+        this.streamer = streamer;
+    }
+
     private static AudioFormat createAudioFormat() {
         AudioFormat.Builder builder = new AudioFormat.Builder();
         builder.setEncoding(AudioFormat.ENCODING_PCM_16BIT);
@@ -138,11 +144,13 @@ public final class AudioEncoder {
     }
 
     private void outputThread() throws IOException, InterruptedException {
+        streamer.writeHeader();
+
         while (!Thread.currentThread().isInterrupted()) {
             OutputTask task = outputTasks.take();
             ByteBuffer buffer = mediaCodec.getOutputBuffer(task.index);
             try {
-                Ln.i("Audio packet [pts=" + task.bufferInfo.presentationTimeUs + "] " + buffer.remaining() + " bytes");
+                streamer.writePacket(buffer, task.bufferInfo);
             } finally {
                 mediaCodec.releaseOutputBuffer(task.index, false);
             }
diff --git a/server/src/main/java/com/genymobile/scrcpy/Codec.java b/server/src/main/java/com/genymobile/scrcpy/Codec.java
index 44f52220..4a177e78 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Codec.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Codec.java
@@ -2,7 +2,7 @@ package com.genymobile.scrcpy;
 
 public interface Codec {
 
-    enum Type {VIDEO}
+    enum Type {VIDEO, AUDIO}
 
     Type getType();
 
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index 9492a264..e0a41d3f 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -111,7 +111,8 @@ public final class Server {
 
             AudioEncoder audioEncoder = null;
             if (audio) {
-                audioEncoder = new AudioEncoder();
+                Streamer audioStreamer = new Streamer(connection.getAudioFd(), AudioCodec.OPUS, options.getSendCodecId(), options.getSendFrameMeta());
+                audioEncoder = new AudioEncoder(audioStreamer);
                 audioEncoder.start();
             }