Skip to content

Commit

Permalink
Merge pull request #95 from ksvc/v4.0.4
Browse files Browse the repository at this point in the history
update to v4.0.4
  • Loading branch information
chriszeng87 authored Dec 2, 2016
2 parents 35fcb84 + 6e94c54 commit 32fcd0a
Show file tree
Hide file tree
Showing 35 changed files with 3,501 additions and 129 deletions.
10 changes: 10 additions & 0 deletions demo/src/com/ksyun/media/streamer/demo/CameraActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ protected void onCreate(Bundle savedInstanceState) {
mPrintDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
}
mStreamer.setDisplayPreview(mCameraPreviewView);
//if (mIsLandscape) {
// mStreamer.setOffscreenPreview(1280, 720);
//} else {
// mStreamer.setOffscreenPreview(720, 1280);
//}
mStreamer.setEnableStreamStatModule(true);
mStreamer.enableDebugLog(true);
mStreamer.setFrontCameraMirror(mFrontMirrorCheckBox.isChecked());
Expand All @@ -241,6 +246,11 @@ public void onError(ImgTexFilterBase filter, int errno) {
}
});

// add RGBA buffer filter to ImgTexFilterMgt, this would cause performance drop,
// only valid after Android 4.4
//RGBABufDemoFilter demoFilter = new RGBABufDemoFilter(mStreamer.getGLRender());
//mStreamer.getImgTexFilterMgt().setExtraFilter(demoFilter);

// touch focus and zoom support
CameraTouchHelper cameraTouchHelper = new CameraTouchHelper();
cameraTouchHelper.setCameraCapture(mStreamer.getCameraCapture());
Expand Down
33 changes: 33 additions & 0 deletions demo/src/com/ksyun/media/streamer/demo/RGBABufDemoFilter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.ksyun.media.streamer.demo;

import android.util.Log;

import com.ksyun.media.streamer.filter.imgtex.RGBABufFilter;
import com.ksyun.media.streamer.util.gles.GLRender;

import java.nio.ByteBuffer;

/**
* Demo filter to handle RBGA buffer in gpu pipe.
*/

public class RGBABufDemoFilter extends RGBABufFilter {
private static final String TAG = "RGBABufDemoFilter";

public RGBABufDemoFilter(GLRender glRender) {
super(glRender);
}

@Override
protected void onSizeChanged(int stride, int width, int height) {
Log.d(TAG, "onSizeChanged " + stride + " " + width + "x" + height);
// do nothing.
}

@Override
protected ByteBuffer doFilter(ByteBuffer buffer, int stride, int width, int height) {
Log.d(TAG, "doFilter " + buffer + " " + stride + " " + width + "x" + height);
// handle buffer here
return buffer;
}
}
4 changes: 2 additions & 2 deletions docs/assets/navtree_data.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 38 additions & 26 deletions docs/reference/classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -439,150 +439,156 @@ <h2 id="letter_I">I</h2>


<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/IImgTexFilter.html">IImgTexFilter</a></td>
<td class="jd-descrcol" width="100%">ImgTexFilter interface.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgBeautyDenoiseFilter.html">ImgBeautyDenoiseFilter</a></td>
<td class="jd-descrcol" width="100%">Beauty Denoise filter.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgBeautyIllusionFilter.html">ImgBeautyIllusionFilter</a></td>
<td class="jd-descrcol" width="100%">Beauty illusion filter.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgBeautySkinWhitenFilter.html">ImgBeautySkinWhitenFilter</a></td>
<td class="jd-descrcol" width="100%">Beauty skin whiten filter.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgBeautySmoothFilter.html">ImgBeautySmoothFilter</a></td>
<td class="jd-descrcol" width="100%">Beauty smooth filter.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgBeautySoftExtFilter.html">ImgBeautySoftExtFilter</a></td>
<td class="jd-descrcol" width="100%">Beauty SoftExt filter.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgBeautySoftFilter.html">ImgBeautySoftFilter</a></td>
<td class="jd-descrcol" width="100%">Beauty Soft filter.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgBeautySoftSharpenFilter.html">ImgBeautySoftSharpenFilter</a></td>
<td class="jd-descrcol" width="100%">Beauty soft sharpen filter
&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgbuf/ImgBufBeautyFilter.html">ImgBufBeautyFilter</a></td>
<td class="jd-descrcol" width="100%">Denoise beauty filter running on cpu.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgbuf/ImgBufFilterBase.html">ImgBufFilterBase</a></td>
<td class="jd-descrcol" width="100%">Base class of video filters running on cpu,
with multi or one input pins and one output pin.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/framework/ImgBufFormat.html">ImgBufFormat</a></td>
<td class="jd-descrcol" width="100%">Image format for ImgBufFrame.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/framework/ImgBufFrame.html">ImgBufFrame</a></td>
<td class="jd-descrcol" width="100%">Image buffer frame definition
&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgbuf/ImgBufMixer.html">ImgBufMixer</a></td>
<td class="jd-descrcol" width="100%">Video frame mixer running on cpu.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgbuf/ImgBufScaleFilter.html">ImgBufScaleFilter</a></td>
<td class="jd-descrcol" width="100%">Cpu filter to crop, rotate, scale and mirror input frame.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/capture/ImgBufSrcPin.html">ImgBufSrcPin</a></td>
<td class="jd-descrcol" width="100%">Convert Bitmap to ImgBufFrame.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgTexFilter.html">ImgTexFilter</a></td>
<td class="jd-descrcol" width="100%">Base class of filters implement by openGLES with default shader.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgTexFilterBase.html">ImgTexFilterBase</a></td>
<td class="jd-descrcol" width="100%">The base class of all gpu filters.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgTexFilterBase.OnErrorListener.html">ImgTexFilterBase.OnErrorListener</a></td>
<td class="jd-descrcol" width="100%">&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgTexFilterMgt.html">ImgTexFilterMgt</a></td>
<td class="jd-descrcol" width="100%">ImgTexFilter manager for convenient use.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/framework/ImgTexFormat.html">ImgTexFormat</a></td>
<td class="jd-descrcol" width="100%">Image texture format definition.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/framework/ImgTexFrame.html">ImgTexFrame</a></td>
<td class="jd-descrcol" width="100%">Image texture frame definition.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgTexMixer.html">ImgTexMixer</a></td>
<td class="jd-descrcol" width="100%">Video frame mixer with openGLES.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/ImgTexScaleFilter.html">ImgTexScaleFilter</a></td>
<td class="jd-descrcol" width="100%">Gpu image filter to rotate/crop/scale video frame,
and covert image format to RGBA if needed.&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/capture/ImgTexSrcPin.html">ImgTexSrcPin</a></td>
<td class="jd-descrcol" width="100%">Convert bitmap image to ImgTexFrame.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/encoder/ImgTexToBuf.html">ImgTexToBuf</a></td>
<td class="jd-descrcol" width="100%">Get I420 buffer from texture.&nbsp;</td>
<td class="jd-descrcol" width="100%">Get I420/RGBA buffer from texture.&nbsp;</td>
</tr>


Expand Down Expand Up @@ -759,19 +765,25 @@ <h2 id="letter_R">R</h2>


<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/filter/imgtex/RGBABufFilter.html">RGBABufFilter</a></td>
<td class="jd-descrcol" width="100%">RGBA buffer filter inserted in gpu pipe.&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/publisher/RtmpPublisher.html">RtmpPublisher</a></td>
<td class="jd-descrcol" width="100%">Rtmp publish module
&nbsp;</td>
</tr>


<tr class="alt-color api apilevel-" >
<tr class=" api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/publisher/RtmpPublisher.BwEstConfig.html">RtmpPublisher.BwEstConfig</a></td>
<td class="jd-descrcol" width="100%">&nbsp;</td>
</tr>


<tr class=" api apilevel-" >
<tr class="alt-color api apilevel-" >
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/publisher/RtmpPublisher.RtmpPubListener.html">RtmpPublisher.RtmpPubListener</a></td>
<td class="jd-descrcol" width="100%">&nbsp;</td>
</tr>
Expand Down
Loading

0 comments on commit 32fcd0a

Please # to comment.