Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds FFmpegFilterFrame sample for Android #550

Merged
merged 2 commits into from
Nov 7, 2016
Merged

Adds FFmpegFilterFrame sample for Android #550

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af30f31
Adds FFmpegFilterFrame option in Android sample
pachev Nov 3, 2016
5460131
Polishes FFmpegFrameFilter initalizing on Android Sample
pachev Nov 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 46 additions & 13 deletions samples/RecordActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,11 @@
import java.util.Comparator;
import java.util.List;

import org.bytedeco.javacv.Frame;
import org.bytedeco.javacpp.avutil;
import org.bytedeco.javacv.FFmpegFrameFilter;
import org.bytedeco.javacv.FFmpegFrameRecorder;
import org.bytedeco.javacv.Frame;
import org.bytedeco.javacv.FrameFilter;

public class RecordActivity extends Activity implements OnClickListener {

Expand All @@ -107,6 +110,11 @@ public class RecordActivity extends Activity implements OnClickListener {

private boolean isPreviewOn = false;

/*Filter information, change boolean to true if adding a fitler*/
private boolean addFilter = false;
private String filterString = "";
FFmpegFrameFilter filter;

private int sampleAudioRateInHz = 44100;
private int imageWidth = 320;
private int imageHeight = 240;
Expand Down Expand Up @@ -164,9 +172,9 @@ protected void onDestroy() {
}

if(cameraDevice != null) {
cameraDevice.stopPreview();
cameraDevice.release();
cameraDevice = null;
cameraDevice.stopPreview();
cameraDevice.release();
cameraDevice = null;
}
}

Expand All @@ -177,8 +185,8 @@ private void initLayout() {
Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
screenWidth = display.getWidth();
screenHeight = display.getHeight();
RelativeLayout.LayoutParams layoutParam = null;
LayoutInflater myInflate = null;
RelativeLayout.LayoutParams layoutParam = null;
LayoutInflater myInflate = null;
myInflate = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
RelativeLayout topLayout = new RelativeLayout(this);
setContentView(topLayout);
Expand Down Expand Up @@ -240,6 +248,14 @@ private void initRecorder() {
// Set in the surface changed method
recorder.setFrameRate(frameRate);

// The filterString is any ffmpeg filter.
// Here is the link for a list: https://ffmpeg.org/ffmpeg-filters.html
filterString = "transpose=0";
filter = new FFmpegFrameFilter(filterString, imageWidth, imageHeight);

//default format on android
filter.setPixelFormat(avutil.AV_PIX_FMT_NV21);

Log.i(LOG_TAG, "recorder initialize success");

audioRecordRunnable = new AudioRecordRunnable();
Expand All @@ -257,7 +273,11 @@ public void startRecording() {
recording = true;
audioThread.start();

} catch (FFmpegFrameRecorder.Exception e) {
if(addFilter) {
filter.start();
}

} catch (FFmpegFrameRecorder.Exception | FrameFilter.Exception e) {
e.printStackTrace();
}
}
Expand Down Expand Up @@ -324,7 +344,9 @@ public void stopRecording() {
try {
recorder.stop();
recorder.release();
} catch (FFmpegFrameRecorder.Exception e) {
filter.stop();
filter.release();
} catch (FFmpegFrameRecorder.Exception | FrameFilter.Exception e) {
e.printStackTrace();
}
recorder = null;
Expand Down Expand Up @@ -363,9 +385,9 @@ public void run() {
ShortBuffer audioData;
int bufferReadResult;

bufferSize = AudioRecord.getMinBufferSize(sampleAudioRateInHz,
bufferSize = AudioRecord.getMinBufferSize(sampleAudioRateInHz,
AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT);
audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleAudioRateInHz,
audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleAudioRateInHz,
AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, bufferSize);

if (RECORD_LENGTH > 0) {
Expand Down Expand Up @@ -472,7 +494,7 @@ public int compare(final Camera.Size a, final Camera.Size b) {
camParams.setPreviewSize(imageWidth, imageHeight);

Log.v(LOG_TAG,"Setting imageWidth: " + imageWidth + " imageHeight: " + imageHeight + " frameRate: " + frameRate);

camParams.setPreviewFrameRate(frameRate);
Log.v(LOG_TAG,"Preview Framerate: " + camParams.getPreviewFrameRate());

Expand Down Expand Up @@ -523,6 +545,8 @@ public void onPreviewFrame(byte[] data, Camera camera) {
yuvImage = images[i];
timestamps[i] = 1000 * (System.currentTimeMillis() - startTime);
}


/* get video data */
if (yuvImage != null && recording) {
((ByteBuffer)yuvImage.image[0].position(0)).put(data);
Expand All @@ -533,8 +557,17 @@ public void onPreviewFrame(byte[] data, Camera camera) {
if (t > recorder.getTimestamp()) {
recorder.setTimestamp(t);
}
recorder.record(yuvImage);
} catch (FFmpegFrameRecorder.Exception e) {

if(addFilter) {
filter.push(yuvImage);
Frame frame2;
while ((frame2 = filter.pull()) != null) {
recorder.record(frame2);
}
} else {
recorder.record(yuvImage);
}
} catch (FFmpegFrameRecorder.Exception | FrameFilter.Exception e) {
Log.v(LOG_TAG,e.getMessage());
e.printStackTrace();
}
Expand Down