Skip to content

Commit 5164010

Browse files
committed
update ffmpeg av JNI and libs
1 parent dcc7da2 commit 5164010

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

resources/common/ffmpeg_av_jni.dll

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

resources/common/libffmpeg_av_jni.so

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

src/main/java/com/zoffcc/applications/ffmpegav/AVActivity.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
public class AVActivity {
88

99
private static final String TAG = "ffmpegav.AVActivity";
10-
static final String Version = "0.99.26";
10+
static final String Version = "0.99.28";
1111
public static final String JAVA_AUDIO_IN_DEVICE_NAME = "Java Audio in (-fallback-)";
1212

1313
private static boolean java_audio_in_device_used = false;
@@ -278,7 +278,7 @@ private static void ffmpegav_start_java_audio_in_capture()
278278
try {
279279
if (t_audio_rec != null)
280280
{
281-
t_audio_rec.join(1000);
281+
t_audio_rec.join(1000);
282282
}
283283
} catch (Exception ignored) {
284284
} finally {
@@ -765,16 +765,16 @@ public static void main(String[] args) {
765765
@Override
766766
public void onSuccess(long width, long height, long source_width, long source_height, long pts, int fps, int source_format) {
767767
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));
770770
}
771771
@Override
772772
public void onError() {
773773
}
774774
@Override
775775
public void onBufferTooSmall(int y_buffer_size, int u_buffer_size, int v_buffer_size) {
776776
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);
778778
ffmpegav_video_buffer_2_y = java.nio.ByteBuffer.allocateDirect(y_buffer_size);
779779
ffmpegav_video_buffer_2_u = java.nio.ByteBuffer.allocateDirect(u_buffer_size);
780780
ffmpegav_video_buffer_2_v = java.nio.ByteBuffer.allocateDirect(v_buffer_size);
@@ -854,11 +854,11 @@ public void onBufferTooSmall(int audio_buffer_size) {
854854
// -----------------------
855855
// -----------------------
856856
final int res_vd2 = ffmpegav_open_video_in_device(vdevice,
857-
vsource, 640, 480, 15, 0);
857+
vsource, 640, 480, 15, 0);
858858
Log.i(TAG, "ffmpeg open video capture device: " + res_vd2);
859859

860860
final int res_ad2 = ffmpegav_open_audio_in_device_wrapper(adevice,
861-
asource);
861+
asource);
862862
Log.i(TAG, "ffmpeg open audio capture device: " + res_ad2);
863863
ffmpegav_start_video_in_capture();
864864
ffmpegav_start_audio_in_capture_wrapper();
@@ -925,7 +925,7 @@ public void run() {
925925
{
926926
Log.i(TAG, "T1: ffmpeg open video capture device:start");
927927
final int res_vd2 = ffmpegav_open_video_in_device(vdevice_,
928-
vsource_, 640, 480, 15, 0);
928+
vsource_, 640, 480, 15, 0);
929929
Log.i(TAG, "T1: ffmpeg open video capture device:done");
930930
int low = 10;
931931
int high = 80;
@@ -970,7 +970,7 @@ public void run() {
970970
{
971971
Log.i(TAG, "T3: ffmpeg open video capture device:start");
972972
final int res_vd2 = ffmpegav_open_video_in_device(vdevice_,
973-
vsource_, 640, 480, 15, 0);
973+
vsource_, 640, 480, 15, 0);
974974
Log.i(TAG, "T3: ffmpeg open video capture device:done");
975975
int low = 10;
976976
int high = 80;

0 commit comments

Comments
 (0)