diff --git a/SD_ROOT/wz_mini/bin/busybox b/SD_ROOT/wz_mini/bin/busybox index e55b3a6..aed35bd 100755 Binary files a/SD_ROOT/wz_mini/bin/busybox and b/SD_ROOT/wz_mini/bin/busybox differ diff --git a/SD_ROOT/wz_mini/bin/v4l2rtspserver b/SD_ROOT/wz_mini/bin/v4l2rtspserver index 481b22c..4f34a54 100755 Binary files a/SD_ROOT/wz_mini/bin/v4l2rtspserver and b/SD_ROOT/wz_mini/bin/v4l2rtspserver differ diff --git a/SD_ROOT/wz_mini/etc/alsa.conf b/SD_ROOT/wz_mini/etc/alsa/alsa.conf similarity index 100% rename from SD_ROOT/wz_mini/etc/alsa.conf rename to SD_ROOT/wz_mini/etc/alsa/alsa.conf diff --git a/SD_ROOT/wz_mini/etc/init.d/v3_init.sh b/SD_ROOT/wz_mini/etc/init.d/v3_init.sh index d77e985..0b5301a 100755 --- a/SD_ROOT/wz_mini/etc/init.d/v3_init.sh +++ b/SD_ROOT/wz_mini/etc/init.d/v3_init.sh @@ -23,6 +23,9 @@ sleep 2 set -x +#lets test this out and see how it goes, patched udhcpc for iCamera +mount --bind /opt/wz_mini/bin/busybox /bin/busybox + #WCV3 GPIO GPIO=63 diff --git a/SD_ROOT/wz_mini/lib/libasound.so.2 b/SD_ROOT/wz_mini/lib/libasound.so.2 index a70201c..f7e934a 100755 Binary files a/SD_ROOT/wz_mini/lib/libasound.so.2 and b/SD_ROOT/wz_mini/lib/libasound.so.2 differ diff --git a/SD_ROOT/wz_mini/lib/libtinyalsa.so.2 b/SD_ROOT/wz_mini/lib/libtinyalsa.so.2 index 00ed1d4..4dbb1c8 100644 Binary files a/SD_ROOT/wz_mini/lib/libtinyalsa.so.2 and b/SD_ROOT/wz_mini/lib/libtinyalsa.so.2 differ diff --git a/SD_ROOT/wz_mini/lib/libtinyalsa.so.2.0.0 b/SD_ROOT/wz_mini/lib/libtinyalsa.so.2.0.0 index 00ed1d4..4dbb1c8 100644 Binary files a/SD_ROOT/wz_mini/lib/libtinyalsa.so.2.0.0 and b/SD_ROOT/wz_mini/lib/libtinyalsa.so.2.0.0 differ diff --git a/SD_ROOT/wz_mini/run_mmc.sh b/SD_ROOT/wz_mini/run_mmc.sh index 3702a05..7f212cd 100755 --- a/SD_ROOT/wz_mini/run_mmc.sh +++ b/SD_ROOT/wz_mini/run_mmc.sh @@ -51,8 +51,6 @@ DEBUG_ENABLED="false" ##########CONFIG END################# ##################################### -echo "run_mmc.sh start" > /dev/kmsg - hostname_set() { echo "set hostname" hostname $HOSTNAME @@ -352,8 +350,6 @@ if [[ "$RTSP_ENABLED" == "true" ]]; then swap_enable fi - mkdir /tmp/alsa - cp /media/mmc/wz_mini/etc/alsa.conf /tmp/alsa /opt/wz_mini/bin/cmd video on /opt/wz_mini/bin/cmd audio on diff --git a/libcallback_wz_mod/audio_callback.c b/libcallback_wz_mod/audio_callback.c index 3f63725..dbe3c9e 100644 --- a/libcallback_wz_mod/audio_callback.c +++ b/libcallback_wz_mod/audio_callback.c @@ -51,8 +51,8 @@ static uint32_t audio_pcm_capture(struct frames_st *frames) { .channels = 1, .rate = 16000, .format = PCM_FORMAT_S16_LE, - .period_size = 1024, - .period_count = 4, + .period_size = 128, + .period_count = 8, .start_threshold = 320, .silence_threshold = 0, .silence_size = 0, @@ -80,11 +80,13 @@ static uint32_t audio_pcm_capture(struct frames_st *frames) { uint32_t local_sdk_audio_set_pcm_frame_callback(int ch, void *callback) { fprintf(stderr, "local_sdk_audio_set_pcm_frame_callback streamChId=%d, callback=0x%x\n", ch, callback); - if(ch == 0) { + static int ch_count = 0; + if( (ch == 0) && ch_count == 0) { audio_pcm_cb = callback; fprintf(stderr,"enc func injection save audio_pcm_cb=0x%x\n", audio_pcm_cb); callback = audio_pcm_capture; } + ch_count=ch_count+1 return real_local_sdk_audio_set_pcm_frame_callback(ch, callback); } diff --git a/libcallback_wz_mod/libcallback.so b/libcallback_wz_mod/libcallback.so index 1e1c3ae..5075b1e 100755 Binary files a/libcallback_wz_mod/libcallback.so and b/libcallback_wz_mod/libcallback.so differ