From: Steinar H. Gunderson Date: Mon, 25 Jul 2016 11:40:36 +0000 (+0200) Subject: Unbreak the test program. X-Git-Tag: 0.4~6 X-Git-Url: https://git.sesse.net/?p=bmusb;a=commitdiff_plain;h=da44ab7391f4cdedaebf872c227b2fd3ecf37eb5 Unbreak the test program. --- diff --git a/main.cpp b/main.cpp index 7506962..a7f63a1 100644 --- a/main.cpp +++ b/main.cpp @@ -7,11 +7,11 @@ using namespace std; BMUSBCapture *usb; void check_frame_stability(uint16_t timecode, - FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format, - FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format) + FrameAllocator::Frame video_frame, size_t video_offset, VideoFormat video_format, + FrameAllocator::Frame audio_frame, size_t audio_offset, AudioFormat audio_format) { //printf("0x%04x: %d video bytes (format 0x%04x), %d audio bytes (format 0x%04x)\n", - // timecode, video_end - video_start, video_format, audio_end - audio_start, audio_format); + // timecode, video_end - video_start, video_format.id, audio_end - audio_start, audio_format.id); static uint16_t last_timecode = 0; static size_t last_video_bytes = 0; @@ -21,10 +21,10 @@ void check_frame_stability(uint16_t timecode, if (timecode != (uint16_t)(last_timecode + 1)) { printf("0x%04x: Dropped %d frames\n", timecode, timecode - last_timecode - 1); } else if (last_video_bytes != video_frame.len - video_offset) { - printf("0x%04x: Video frame size changed (old=%d, cur=%d)\n", timecode, + printf("0x%04x: Video frame size changed (old=%ld, cur=%ld)\n", timecode, last_video_bytes, video_frame.len - video_offset); } else if (last_audio_bytes != audio_frame.len - audio_offset) { - printf("0x%04x: Audio block size changed (old=%d, cur=%d)\n", timecode, + printf("0x%04x: Audio block size changed (old=%ld, cur=%ld)\n", timecode, last_audio_bytes, audio_frame.len - audio_offset); } } @@ -38,7 +38,7 @@ void check_frame_stability(uint16_t timecode, int main(int argc, char **argv) { - usb = new BMUSBCapture; + usb = new BMUSBCapture(0); // First card. usb->set_frame_callback(check_frame_stability); usb->configure_card(); BMUSBCapture::start_bm_thread();