jfVideo : convert Media*Coder -> MediaInput/Output

Author: pquiring

projects/jfvideo/src/Element.java

@@ -11,6 +11,7 @@
 
 import javaforce.*;
 import javaforce.awt.*;
+import javaforce.voip.*;
 import javaforce.media.*;
 
 import com.jhlabs.image.*;
@@ -93,7 +94,10 @@ public long seek(MediaCoder coder, long pos, int how) {
   private boolean ready;
   private JFImage srcImage;
   private int width, height;
-  private MediaDecoder ff;
+  private MediaInput decoder;
+  private MediaAudioDecoder audio_decoder;
+  private MediaVideoDecoder video_decoder;
+  private CodecInfo info;
   private short audio[];
   private int audioPos, audioSize;
   private ArrayList<int[]> frames = new ArrayList<int[]>();
@@ -156,20 +160,24 @@ public boolean start(Config config) {
           JFLog.log(e);
           return false;
         }
-        ff = new MediaDecoder();
-        if (!ff.start(this, config.width, config.height, config.audioChannels, config.audioRate, true)) {
+        decoder = new MediaInput();
+        if (!decoder.open(this)) {
           JFAWT.showError("Error", "Failed to decode file:" + path[0]);
           return false;
         }
+        info = decoder.getCodecInfo();
+        audio_decoder = decoder.createAudioDecoder();
+        video_decoder = decoder.createVideoDecoder();
+
         if (type == TYPE_VIDEO) {
           //calc frameRate
-          JFLog.log("input frameRate=" + ff.getFrameRate());
+          JFLog.log("input frameRate=" + info.fps);
           JFLog.log("output frameRate=" + videoRate);
-          frameRateRatio = ff.getFrameRate() / videoRate;
+          frameRateRatio = info.fps / videoRate;
           JFLog.log("frameRateRatio=" + frameRateRatio);
           currentFrame = 0.0;
         }
-        JFLog.log("audioRate=" + ff.getAudioBitRate());
+        JFLog.log("audioRate=" + decoder.getAudioBitRate());
         audio = null;
         audioSize = 0;
         audioPos = 0;
@@ -220,44 +228,38 @@ public void stop() {
     audioSize = 0;
     audioPos = 0;
     frames.clear();
-    if (ff != null) {
-      ff.stop();
-      ff = null;
+    if (decoder != null) {
+      decoder.close();
+      decoder = null;
     }
     ready = false;
   }
   private void readMore() {
     if (eof) return;
-    switch (ff.read()) {
-      case MediaCoder.AUDIO_FRAME:
-//JFLog.log("AUDIO_FRAME");
-        short buf[] = ff.getAudio();
-        if (audioSize == 0) {
-          audio = buf;
-          audioSize = buf.length;
-          audioPos = 0;
-        } else {
-          //add to audio
-          short newAudio[] = new short[audioSize + buf.length];
-          System.arraycopy(audio, audioPos, newAudio, 0, audioSize);
-          System.arraycopy(buf, 0, newAudio, audioSize, buf.length);
-          audio = newAudio;
-          audioPos = 0;
-          audioSize += buf.length;
-        }
-        break;
-      case MediaCoder.VIDEO_FRAME:
-//JFLog.log("VIDEO_FRAME");
-        int px[] = ff.getVideo();
-        frames.add(px);
-        break;
-      case MediaCoder.NULL_FRAME:
-//JFLog.log("NULL_FRAME");
-        break;
-      case MediaCoder.END_FRAME:
-//JFLog.log("END_FRAME");
-        eof = true;
-        break;
+    Packet packet = decoder.readPacket();
+    if (packet == null) {
+      eof = true;
+      return;
+    }
+    if (packet.stream == info.audio_stream) {
+      short buf[] = audio_decoder.decode(packet);
+      if (audioSize == 0) {
+        audio = buf;
+        audioSize = buf.length;
+        audioPos = 0;
+      } else {
+        //add to audio
+        short newAudio[] = new short[audioSize + buf.length];
+        System.arraycopy(audio, audioPos, newAudio, 0, audioSize);
+        System.arraycopy(buf, 0, newAudio, audioSize, buf.length);
+        audio = newAudio;
+        audioPos = 0;
+        audioSize += buf.length;
+      }
+    }
+    if (packet.stream == info.video_stream) {
+      int px[] = video_decoder.decode(packet);
+      frames.add(px);
     }
   }
 
@@ -404,7 +406,7 @@ public void renderAudio(short render[]) {
     if (type == TYPE_SPECIAL_TEXT) return;
     int renderSize = render.length;
     int renderPos = 0;
-    if (ff.getAudioBitRate() == 0) return;
+    if (decoder.getAudioBitRate() == 0) return;
     while (renderSize > 0) {
       while (!eof && audioSize < renderSize) readMore();
       int toCopy = renderSize;
@@ -442,12 +444,12 @@ public void audioCopyAttn(short in[], int inpos, short out[], int outpos, int le
     }
   }
   public long getDuration() {
-    if (ff == null) return 0;
-    return ff.getDuration();
+    if (decoder == null) return 0;
+    return info.duration;
   }
   public void seek(int pos) {
-    if (ff == null) return;
-    ff.seek(pos);
+    if (decoder == null) return;
+    decoder.seek(pos);
   }
   public void createPreview(JFTask task) {
     if (!start(previewConfig)) return;
@@ -481,7 +483,7 @@ public void createPreview(JFTask task) {
           audio = null;
           audioSize = 0;
           previewImage = new JFImage(64, 60);
-          ff.seek(frame);
+          decoder.seek(frame);
           preRenderVideo();
           renderVideo(previewImage, 0, 0);
           if (audioSize > 0) {

projects/jfvideo/src/ProjectPanel.java

@@ -14,6 +14,7 @@
 
 import javaforce.*;
 import javaforce.awt.*;
+import javaforce.voip.*;
 import javaforce.media.*;
 import javaforce.gl.*;
 
@@ -1107,17 +1108,30 @@ public boolean work() {
         this.setProgress(0);
         int audioLengthPerFrame = config.audioRate / config.videoRate;
         int audioFraction = config.audioRate % config.videoRate;
-        MediaEncoder ff = new MediaEncoder();
-        ff.set1000over1001(config.v1001);
+        MediaOutput encoder = new MediaOutput();
+
+        CodecInfo info = new CodecInfo();
+        Packet packet;
+
+        info.audio_bit_rate = config.audioBitRate;
+        info.freq = config.audioRate;
+        info.chs = config.audioChannels;
+        info.bits = 16;
+
+        info.video_bit_rate = config.videoBitRate;
+        info.fps = config.videoRate;
+        info.width = config.width;
+        info.height = config.height;
+
         System.out.println("bitRates:" + config.videoBitRate + "," + config.audioBitRate);
-        ff.setVideoBitRate(config.videoBitRate);
-        ff.setAudioBitRate(config.audioBitRate);
-        if (!ff.start(ProjectPanel.this, config.width, config.height, config.videoRate, config.audioChannels
-          , config.audioRate, "avi", true, true))
+        if (!encoder.create(ProjectPanel.this, "avi"))
         {
           this.setLabel("Error:Encoder failed");
           return false;
         }
+        MediaAudioEncoder audio_encoder = encoder.createAudioEncoder(info);
+        MediaVideoEncoder video_encoder = encoder.createVideoEncoder(info);
+
         int audioFractionCounter = 0;
         short audio0[] = new short[audioLengthPerFrame * config.audioChannels];
         short audio1[] = new short[(audioLengthPerFrame+1) * config.audioChannels];
@@ -1196,12 +1210,15 @@ public boolean work() {
               if (track.isCut()) cut = true;
             }  //track
             if (cut) continue;
-            ff.addVideo(image.getBuffer());
-            ff.addAudio(audio);
+            packet = audio_encoder.encode(audio, 0, audio.length);
+            encoder.writePacket(packet);
+            int[] px = image.getBuffer();
+            packet = video_encoder.encode(px, 0, px.length);
+            encoder.writePacket(packet);
           }  //frame
         }  //second
         uninit3d();
-        ff.stop();
+        encoder.close();
         for(int trackNo=1;trackNo<tracks.getComponentCount();trackNo++) {
           TrackPanel track = (TrackPanel)tracks.getComponent(trackNo);
           track.stop();