Media - add change() prototype to MediaAudioDecoder and MediaVideoDecoder - set all native fields to private

Author: pquiring

native/common/ff_av_decoder.cpp

@@ -226,6 +226,12 @@ JNIEXPORT jint JNICALL Java_javaforce_media_MediaAudioDecoder_ngetSampleRate
   return ctx->audio_codec_ctx->sample_rate;
 }
 
+JNIEXPORT void JNICALL Java_javaforce_media_MediaAudioDecoder_nchange
+  (JNIEnv *e, jobject c, jlong ctxptr, jint chs, jint freq)
+{
+  //TODO
+}
+
 //video decoder codebase
 
 JNIEXPORT jlong JNICALL Java_javaforce_media_MediaVideoDecoder_nstart
@@ -413,3 +419,11 @@ JNIEXPORT jfloat JNICALL Java_javaforce_media_MediaVideoDecoder_ngetFrameRate
   if (ctx->video_codec_ctx->framerate.den == 0) return 0;
   return ctx->video_codec_ctx->framerate.num / ctx->video_codec_ctx->framerate.den;
 }
+
+JNIEXPORT void JNICALL Java_javaforce_media_MediaVideoDecoder_nchange
+  (JNIEnv *e, jobject c, jlong ctxptr, jint width, jint height)
+{
+  //TODO
+}
+
+

native/common/ffmpeg.cpp

@@ -643,6 +643,7 @@ static JNINativeMethod javaforce_media_MediaAudioDecoder[] = {
   {"ndecode", "(J[BII)[S", (void *)&Java_javaforce_media_MediaAudioDecoder_ndecode},
   {"ngetChannels", "(J)I", (void *)&Java_javaforce_media_MediaAudioDecoder_ngetChannels},
   {"ngetSampleRate", "(J)I", (void *)&Java_javaforce_media_MediaAudioDecoder_ngetSampleRate},
+  {"nchange", "(JII)V", (void *)&Java_javaforce_media_MediaAudioDecoder_nchange},
 };
 
 static JNINativeMethod javaforce_media_MediaVideoDecoder[] = {
@@ -652,6 +653,7 @@ static JNINativeMethod javaforce_media_MediaVideoDecoder[] = {
   {"ngetWidth", "(J)I", (void *)&Java_javaforce_media_MediaVideoDecoder_ngetWidth},
   {"ngetHeight", "(J)I", (void *)&Java_javaforce_media_MediaVideoDecoder_ngetHeight},
   {"ngetFrameRate", "(J)F", (void *)&Java_javaforce_media_MediaVideoDecoder_ngetFrameRate},
+  {"nchange", "(JII)V", (void *)&Java_javaforce_media_MediaVideoDecoder_nchange},
 };
 
 static JNINativeMethod javaforce_media_MediaAudioEncoder[] = {

src/javaforce/media/MediaAudioDecoder.java

@@ -15,34 +15,39 @@ public MediaAudioDecoder(MediaInput input) {
     this.ctx = input.ctx;
     shared = true;
   }
-  public native long nstart(int codec_id, int new_chs, int new_freq);
+  private native long nstart(int codec_id, int new_chs, int new_freq);
   public boolean start(int codec_id, int new_chs, int new_freq) {
     if (ctx != 0 || shared) return false;
     ctx = nstart(codec_id, new_chs, new_freq);
     return ctx != 0;
   }
-  public native void nstop(long ctx);
+  private native void nstop(long ctx);
   public void stop() {
     if (ctx == 0 || shared) return;
     nstop(ctx);
     ctx = 0;
   }
-  public native short[] ndecode(long ctx, byte[] data, int offset, int length);
+  private native short[] ndecode(long ctx, byte[] data, int offset, int length);
   public short[] decode(byte[] data, int offset, int length) {
     if (ctx == 0) return null;
     return ndecode(ctx, data, offset, length);
   }
   public short[] decode(Packet packet) {
     return decode(packet.data, packet.offset, packet.length);
   }
-  public native int ngetChannels(long ctx);
+  private native int ngetChannels(long ctx);
   public int getChannels() {
     if (ctx == 0) return -1;
     return ngetChannels(ctx);
   }
-  public native int ngetSampleRate(long ctx);
+  private native int ngetSampleRate(long ctx);
   public int getSampleRate() {
     if (ctx == 0) return -1;
     return ngetSampleRate(ctx);
   }
+  private native void nchange(long ctx, int chs, int freq);
+  /** Changes output chs/freq only.  All other fields ignored. */
+  public void change(CodecInfo info) {
+    nchange(ctx, info.chs, info.freq);
+  }
 }

src/javaforce/media/MediaAudioEncoder.java

@@ -16,20 +16,20 @@ public MediaAudioEncoder(MediaOutput output) {
     this.ctx = output.ctx;
     shared = true;
   }
-  public native long nstart(int codec_id, int bit_rate, int chs, int freq);
+  private native long nstart(int codec_id, int bit_rate, int chs, int freq);
   public boolean start(CodecInfo info) {
     if (ctx != 0 || shared) return false;
     ctx = nstart(info.audio_codec, info.audio_bit_rate, info.chs, info.freq);
     return ctx != 0;
   }
-  public native void nstop(long ctx);
+  private native void nstop(long ctx);
   public void stop() {
     if (ctx == 0 || shared) return;
     nstop(ctx);
     ctx = 0;
   }
   private Packet packet;
-  public native byte[] nencode(long ctx, short[] samples, int offset, int length);
+  private native byte[] nencode(long ctx, short[] samples, int offset, int length);
   public Packet encode(short[] samples, int offset, int length) {
     if (ctx == 0) {
       JFLog.log("MediaAudioEncoder no ctx");
@@ -47,7 +47,7 @@ public Packet encode(short[] samples, int offset, int length) {
     packet.length = packet.data.length;
     return packet;
   }
-  public native int ngetAudioFramesize(long ctx);
+  private native int ngetAudioFramesize(long ctx);
   public int getAudioFramesize() {
     return ngetAudioFramesize(ctx);
   }

src/javaforce/media/MediaVideoDecoder.java

@@ -15,39 +15,44 @@ public MediaVideoDecoder(MediaInput input) {
     this.ctx = input.ctx;
     shared = true;
   }
-  public native long nstart(int codec_id, int new_width, int new_height);
+  private native long nstart(int codec_id, int new_width, int new_height);
   public boolean start(int codec_id, int new_width, int new_height) {
     if (ctx != 0 || shared) return false;
     ctx = nstart(codec_id, new_width, new_height);
     return ctx != 0;
   }
-  public native void nstop(long ctx);
+  private native void nstop(long ctx);
   public void stop() {
     if (ctx == 0 || shared) return;
     nstop(ctx);
     ctx = 0;
   }
-  public native int[] ndecode(long ctx, byte[] data, int offset, int length);
+  private native int[] ndecode(long ctx, byte[] data, int offset, int length);
   public int[] decode(byte[] data, int offset, int length) {
     if (ctx == 0) return null;
     return ndecode(ctx, data, offset, length);
   }
   public int[] decode(Packet packet) {
     return decode(packet.data, packet.offset, packet.length);
   }
-  public native int ngetWidth(long ctx);
+  private native int ngetWidth(long ctx);
   public int getWidth() {
     if (ctx == 0) return -1;
     return ngetWidth(ctx);
   }
-  public native int ngetHeight(long ctx);
+  private native int ngetHeight(long ctx);
   public int getHeight() {
     if (ctx == 0) return -1;
     return ngetHeight(ctx);
   }
-  public native float ngetFrameRate(long ctx);
+  private native float ngetFrameRate(long ctx);
   public float getFrameRate() {
     if (ctx == 0) return -1;
     return ngetFrameRate(ctx);
   }
+  private native void nchange(long ctx, int width, int height);
+  /** Changes output width/height only.  All other fields ignored. */
+  public void change(CodecInfo info) {
+    nchange(ctx, info.width, info.height);
+  }
 }

src/javaforce/media/MediaVideoEncoder.java

@@ -15,20 +15,20 @@ public MediaVideoEncoder(MediaOutput output) {
     this.ctx = output.ctx;
     shared = true;
   }
-  public native long nstart(int codec_id, int bit_rate, int width, int height, float fps, int keyFrameInterval);
+  private native long nstart(int codec_id, int bit_rate, int width, int height, float fps, int keyFrameInterval);
   public boolean start(CodecInfo info) {
     if (ctx != 0 || shared) return false;
     ctx = nstart(info.video_codec, info.video_bit_rate, info.width, info.height, info.fps, info.keyFrameInterval);
     return ctx != 0;
   }
-  public native void nstop(long ctx);
+  private native void nstop(long ctx);
   public void stop() {
     if (ctx == 0 || shared) return;
     nstop(ctx);
     ctx = 0;
   }
   private Packet packet;
-  public native byte[] nencode(long ctx, int[] px, int offset, int length);
+  private native byte[] nencode(long ctx, int[] px, int offset, int length);
   public Packet encode(int[] px, int offset, int length) {
     if (ctx == 0) return null;
     if (packet == null) {