|
7 | 7 | public class AVActivity {
|
8 | 8 |
|
9 | 9 | private static final String TAG = "ffmpegav.AVActivity";
|
10 |
| - static final String Version = "0.99.26"; |
| 10 | + static final String Version = "0.99.28"; |
11 | 11 | public static final String JAVA_AUDIO_IN_DEVICE_NAME = "Java Audio in (-fallback-)";
|
12 | 12 |
|
13 | 13 | private static boolean java_audio_in_device_used = false;
|
@@ -278,7 +278,7 @@ private static void ffmpegav_start_java_audio_in_capture()
|
278 | 278 | try {
|
279 | 279 | if (t_audio_rec != null)
|
280 | 280 | {
|
281 |
| - t_audio_rec.join(1000); |
| 281 | + t_audio_rec.join(1000); |
282 | 282 | }
|
283 | 283 | } catch (Exception ignored) {
|
284 | 284 | } finally {
|
@@ -765,16 +765,16 @@ public static void main(String[] args) {
|
765 | 765 | @Override
|
766 | 766 | public void onSuccess(long width, long height, long source_width, long source_height, long pts, int fps, int source_format) {
|
767 | 767 | Log.i(TAG, "ffmpeg open video capture onSuccess:" + width + " " + height + " " +
|
768 |
| - source_width + " " + source_height + " " + pts + " fps: " + fps + |
769 |
| - " source_format: " + ffmpegav_video_source_format_name.value_str(source_format)); |
| 768 | + source_width + " " + source_height + " " + pts + " fps: " + fps + |
| 769 | + " source_format: " + ffmpegav_video_source_format_name.value_str(source_format)); |
770 | 770 | }
|
771 | 771 | @Override
|
772 | 772 | public void onError() {
|
773 | 773 | }
|
774 | 774 | @Override
|
775 | 775 | public void onBufferTooSmall(int y_buffer_size, int u_buffer_size, int v_buffer_size) {
|
776 | 776 | Log.i(TAG, "Video buffer too small, needed sizes: " + y_buffer_size
|
777 |
| - + " " + u_buffer_size + " "+ v_buffer_size); |
| 777 | + + " " + u_buffer_size + " "+ v_buffer_size); |
778 | 778 | ffmpegav_video_buffer_2_y = java.nio.ByteBuffer.allocateDirect(y_buffer_size);
|
779 | 779 | ffmpegav_video_buffer_2_u = java.nio.ByteBuffer.allocateDirect(u_buffer_size);
|
780 | 780 | ffmpegav_video_buffer_2_v = java.nio.ByteBuffer.allocateDirect(v_buffer_size);
|
@@ -854,11 +854,11 @@ public void onBufferTooSmall(int audio_buffer_size) {
|
854 | 854 | // -----------------------
|
855 | 855 | // -----------------------
|
856 | 856 | final int res_vd2 = ffmpegav_open_video_in_device(vdevice,
|
857 |
| - vsource, 640, 480, 15, 0); |
| 857 | + vsource, 640, 480, 15, 0); |
858 | 858 | Log.i(TAG, "ffmpeg open video capture device: " + res_vd2);
|
859 | 859 |
|
860 | 860 | final int res_ad2 = ffmpegav_open_audio_in_device_wrapper(adevice,
|
861 |
| - asource); |
| 861 | + asource); |
862 | 862 | Log.i(TAG, "ffmpeg open audio capture device: " + res_ad2);
|
863 | 863 | ffmpegav_start_video_in_capture();
|
864 | 864 | ffmpegav_start_audio_in_capture_wrapper();
|
@@ -925,7 +925,7 @@ public void run() {
|
925 | 925 | {
|
926 | 926 | Log.i(TAG, "T1: ffmpeg open video capture device:start");
|
927 | 927 | final int res_vd2 = ffmpegav_open_video_in_device(vdevice_,
|
928 |
| - vsource_, 640, 480, 15, 0); |
| 928 | + vsource_, 640, 480, 15, 0); |
929 | 929 | Log.i(TAG, "T1: ffmpeg open video capture device:done");
|
930 | 930 | int low = 10;
|
931 | 931 | int high = 80;
|
@@ -970,7 +970,7 @@ public void run() {
|
970 | 970 | {
|
971 | 971 | Log.i(TAG, "T3: ffmpeg open video capture device:start");
|
972 | 972 | final int res_vd2 = ffmpegav_open_video_in_device(vdevice_,
|
973 |
| - vsource_, 640, 480, 15, 0); |
| 973 | + vsource_, 640, 480, 15, 0); |
974 | 974 | Log.i(TAG, "T3: ffmpeg open video capture device:done");
|
975 | 975 | int low = 10;
|
976 | 976 | int high = 80;
|
|
0 commit comments