uint16_t video_timecode = pending_video_frames.front().timecode;
uint16_t audio_timecode = pending_audio_frames.front().timecode;
+ AudioFormat audio_format;
+ audio_format.bits_per_sample = 24;
+ audio_format.num_channels = 8;
if (uint16_less_than_with_wraparound(video_timecode, audio_timecode)) {
printf("Video block 0x%04x without corresponding audio block, dropping.\n",
video_timecode);
QueuedFrame audio_frame = pending_audio_frames.front();
pending_audio_frames.pop_front();
lock.unlock();
+ audio_format.id = audio_frame.format;
frame_callback(audio_timecode,
FrameAllocator::Frame(), 0, VideoFormat(),
- audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
} else {
QueuedFrame video_frame = pending_video_frames.front();
QueuedFrame audio_frame = pending_audio_frames.front();
#endif
VideoFormat video_format;
+ audio_format.id = audio_frame.format;
if (decode_video_format(video_frame.format, &video_format)) {
frame_callback(video_timecode,
video_frame.frame, HEADER_SIZE, video_format,
- audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
} else {
frame_callback(video_timecode,
FrameAllocator::Frame(), 0, video_format,
- audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ audio_frame.frame, AUDIO_HEADER_SIZE, audio_format);
}
}
}
decoded_video_format->extra_lines_bottom = 0;
decoded_video_format->frame_rate_nom = 3013;
decoded_video_format->frame_rate_den = 100;
+ decoded_video_format->has_signal = false;
return true;
}
if ((video_format & 0xe800) != 0xe800) {
decoded_video_format->extra_lines_bottom = 0;
decoded_video_format->frame_rate_nom = 60;
decoded_video_format->frame_rate_den = 1;
+ decoded_video_format->has_signal = false;
return false;
}
+ decoded_video_format->has_signal = true;
+
// NTSC (480i59.94, I suppose). A special case, see below.
if (video_format == 0xe901 || video_format == 0xe9c1 || video_format == 0xe801) {
decoded_video_format->width = 720;