@@ -526,7 +526,7 @@ int _main(int argc, char* argv[])
526
526
}
527
527
528
528
log::info (" Ready to record %ld ms, and save to %s\r\n " , record_ms, path.c_str ());
529
- audio::Recorder r = audio::Recorder (path, sample_rate, format, channel, true );
529
+ audio::Recorder r = audio::Recorder (path, sample_rate, format, channel, block );
530
530
r.reset ();
531
531
err::check_bool_raise (r.sample_rate () == sample_rate);
532
532
err::check_bool_raise (r.format () == format);
@@ -540,33 +540,24 @@ int _main(int argc, char* argv[])
540
540
if (block) {
541
541
if (record_ms < 0 ) {
542
542
record_bytes = record_ms;
543
- auto data = r.record_bytes (record_bytes );
543
+ auto data = r.record (record_ms );
544
544
log::info (" Record %ld ms, bytes:%d, used %lld ms" , record_ms, data->size (), time::ticks_ms () - t);
545
545
time::sleep_ms (100 );
546
546
} else {
547
- auto data = r.record_bytes (record_bytes );
547
+ auto data = r.record (record_ms );
548
548
err::check_bool_raise (data->data_len == (size_t )record_bytes, " Record bytes error" );
549
549
log::info (" Record %ld ms, bytes:%d, used %lld ms" , record_ms, data->size (), time::ticks_ms () - t);
550
550
}
551
551
} else {
552
552
if (record_ms < 0 ) {
553
553
record_bytes = record_ms;
554
- auto data = r.record_bytes (record_bytes );
554
+ auto data = r.record (record_ms );
555
555
log::info (" Record %ld ms, bytes:%d, used %lld ms" , record_ms, data->size (), time::ticks_ms () - t);
556
- time::sleep_ms (100 );
556
+ time::sleep_ms (record_ms );
557
557
} else {
558
- auto remain_bytes = r.get_remaining_frames () * bytes_per_frame;
559
- record_bytes = (record_bytes + 1023 ) & ~1023 ;
560
- if (record_bytes > remain_bytes) {
561
- record_bytes = remain_bytes;
562
- }
563
-
564
- if (record_bytes != 0 ) {
565
- log::info (" remain bytes: %d, record bytes: %d" , remain_bytes, record_bytes);
566
- auto data = r.record_bytes (record_bytes);
567
- err::check_bool_raise (data->data_len == (size_t )record_bytes, " Record bytes error" );
568
- log::info (" Record %ld ms, bytes:%d, used %lld ms" , record_ms, data->size (), time::ticks_ms () - t);
569
- }
558
+ auto data = r.record (record_ms);
559
+ log::info (" Record %ld ms, bytes:%d, used %lld ms" , record_ms, data->size (), time::ticks_ms () - t);
560
+ time::sleep_ms (record_ms);
570
561
}
571
562
}
572
563
}
@@ -674,7 +665,7 @@ int _main(int argc, char* argv[])
674
665
log::info (" Play bytes:%d, used %lld ms" , data.size (), time::ticks_ms () - t);
675
666
} else {
676
667
auto bytes_per_frames = p.frame_size ();
677
- while (p.get_remaining_frames () * bytes_per_frames < data.size () && !app::need_exit ()) {
668
+ while (( size_t )( p.get_remaining_frames () * bytes_per_frames) < data.size () && !app::need_exit ()) {
678
669
time::sleep_ms (1 );
679
670
}
680
671
0 commit comments