jfProjector : convert Media*Coder -> MediaInput/Output

Author: pquiring

projects/jfprojector/src/client/MainPanel.java

@@ -16,6 +16,7 @@
 import javaforce.*;
 import javaforce.awt.*;
 import javaforce.media.*;
+import javaforce.voip.*;
 
 import common.Config;
 
@@ -348,21 +349,31 @@ public void run() {
 
       JFImage img = JFImage.createScreenCapture();
 
-      MediaEncoder encoder = new MediaEncoder();
-      encoder.setAudioBitRate(getAudioBitRate());
-      encoder.setVideoBitRate(getVideoBitRate());
+      CodecInfo info = new CodecInfo();
+      info.video_bit_rate = getVideoBitRate();
       int width = img.getWidth();
       int height = img.getHeight();
+      info.width = width;
+      info.height = height;
+      info.fps = frameRate;
+
+      info.audio_bit_rate = getAudioBitRate();
+      info.chs = chs;
+      info.freq = audioRate;
+      info.bits = 16;
+
+      Packet packet;
+      MediaOutput encoder = new MediaOutput();
+      encoder.create(MainPanel.this, "mpg");
+      MediaAudioEncoder audio = null;
+      MediaVideoEncoder video = encoder.createVideoEncoder(info);
+
       JFLog.log("size=" + width + "," + height);
       JFLog.log("frameRate=" + frameRate);
       JFLog.log("audioRate=" + audioRate + ",chs=" + chs);
-      if (!encoder.start(MainPanel.this, width, height, frameRate, chs
-        , audioRate, "h264", true, doAudio))
-      {
-        failed("Unable to create output file");
-        return;
-      }
+
       if (doAudio) {
+        audio = encoder.createAudioEncoder(info);
         mic = new AudioInput();
         if (!mic.start(chs, audioRate, 16, samples * 2, (String)audioDevices.getSelectedItem())) {
           failed("Unable to start recording audio");
@@ -402,11 +413,13 @@ public void run() {
           skip_frame = false;
         }
         int px[] = img.getPixels();
-        encoder.addVideo(px);
+        packet = video.encode(px, 0, px.length);
+        encoder.writePacket(packet);
         if (doAudio) {
           while (mic.read(sams8)) {
             swapEndian(sams8, sams16);
-            encoder.addAudio(sams16);
+            packet = audio.encode(sams16, 0, sams16.length);
+            encoder.writePacket(packet);
           }
         }
         double now = System.currentTimeMillis();
@@ -420,7 +433,7 @@ public void run() {
       }
       delTray();
       if (frame != null) frame.setVisible(true);
-      encoder.stop();
+      encoder.close();
       if (doAudio) mic.stop();
       try {
         socket.close();

projects/jfprojector/src/server/Session.java

@@ -12,6 +12,7 @@
 import javaforce.*;
 import javaforce.awt.*;
 import javaforce.media.*;
+import javaforce.voip.*;
 
 public class Session {
 
@@ -27,7 +28,9 @@ public void run() {
   }
 
   private Socket socket;
-  private MediaDecoder decoder;  //ffmpeg decoder
+  private MediaInput decoder;
+  private MediaAudioDecoder audio;
+  private MediaVideoDecoder video;
   private long frameCount;
   private long audioCount;
   private final Object countLock = new Object();
@@ -79,20 +82,23 @@ public void run() {
       resizeVideo = false;
       eof = false;
 
+      width = window.getWidth();
+      height = window.getHeight();
+
       try {
         is = socket.getInputStream();
-        decoder = new MediaDecoder();
+        decoder = new MediaInput();
         if (decoder == null) throw new Exception("Unable to allocate decoder");
-        if (!decoder.start(this, -1, -1, chs, 44100, false)) throw new Exception("Unable to start decoder");
+        if (!decoder.open(this)) throw new Exception("Unable to start decoder");
+        audio = decoder.createAudioDecoder();
+        video = decoder.createVideoDecoder(width, height);
+        CodecInfo info = decoder.getCodecInfo();
 
-        long mediaLength = decoder.getDuration();
+        long mediaLength = info.duration;
         JFLog.log("Duration=" + mediaLength);
-        fps = decoder.getFrameRate();
+        fps = info.fps;
         JFLog.log("FPS=" + fps);
-        width = window.getWidth();
-        height = window.getHeight();
         JFLog.log("size=" + width + "x" + height);
-        decoder.resize(width, height);
         video_buffer = new VideoBuffer(width, height, buffer_seconds * (int)fps);
         playThread = new PlayAudioVideoThread();
         playThread.start();
@@ -106,38 +112,38 @@ public void run() {
             synchronized(sizeLock) {
               width = new_width;
               height = new_height;
-              decoder.resize(width, height);
+              video = decoder.createVideoDecoder(width, height);
               resizeVideo = false;
             }
           }
-          switch (decoder.read()) {
-            case MediaCoder.AUDIO_FRAME:  //audio packet read
-              short audio[] = decoder.getAudio();
-              audio_buffer.add(audio, 0, audio.length);
-              synchronized(lock) {
-                lock.notify();
-              }
-              break;
-            case MediaCoder.VIDEO_FRAME:  //video packet read
-              int video[] = decoder.getVideo();
-              JFImage img = video_buffer.getNewFrame();
-              if (img != null) {
-                if ((img.getWidth() != width) || (img.getHeight() != height)) {
-                  img.setSize(width, height);
-                }
-                img.putPixels(video, 0, 0, width, height, 0);
-                video_buffer.freeNewFrame();
-              } else {
-                JFLog.log("Warning : VideoBuffer overflow");
-              }
-              synchronized(lock) {
-                lock.notify();
+          Packet packet = decoder.readPacket();
+          if (packet == null) {
+            eof = true;
+            playing = false;
+            break;
+          }
+          if (packet.stream == info.audio_stream) {
+            short sams[] = audio.decode(packet);
+            audio_buffer.add(sams, 0, sams.length);
+            synchronized(lock) {
+              lock.notify();
+            }
+          }
+          else if (packet.stream == info.video_stream) {
+            int px[] = video.decode(packet);
+            JFImage img = video_buffer.getNewFrame();
+            if (img != null) {
+              if ((img.getWidth() != width) || (img.getHeight() != height)) {
+                img.setSize(width, height);
               }
-              break;
-            case MediaCoder.END_FRAME:
-              eof = true;
-              playing = false;
-              break;
+              img.putPixels(px, 0, 0, width, height, 0);
+              video_buffer.freeNewFrame();
+            } else {
+              JFLog.log("Warning : VideoBuffer overflow");
+            }
+            synchronized(lock) {
+              lock.notify();
+            }
           }
         }
       } catch (Exception e) {