pending_audio_frames.pop_front();
lock.unlock();
frame_callback(audio_timecode,
- FrameAllocator::Frame(), 0, 0x0000,
+ FrameAllocator::Frame(), 0, VideoFormat(),
audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
} else {
QueuedFrame video_frame = pending_video_frames.front();
dump_audio_block(audio_frame.frame.data, audio_frame.data_len);
#endif
- frame_callback(video_timecode,
- video_frame.frame, HEADER_SIZE, video_frame.format,
- audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ VideoFormat video_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);
+ } else {
+ frame_callback(video_timecode,
+ FrameAllocator::Frame(), 0, video_format,
+ audio_frame.frame, AUDIO_HEADER_SIZE, audio_frame.format);
+ }
}
}
if (has_dequeue_callbacks) {
// Update the assumed frame width. We might be one frame too late on format changes,
// but it's much better than asking the user to choose manually.
- unsigned width, height, second_field_start, extra_lines_top, extra_lines_bottom, frame_rate_nom, frame_rate_den;
- bool interlaced;
- if (decode_video_format(format, &width, &height, &second_field_start, &extra_lines_top, &extra_lines_bottom,
- &frame_rate_nom, &frame_rate_den, &interlaced)) {
- assumed_frame_width = width;
+ VideoFormat video_format;
+ if (decode_video_format(format, &video_format)) {
+ assumed_frame_width = video_format.width;
}
}
//printf("Found frame start, format 0x%04x timecode 0x%04x, previous frame length was %d/%d\n",
bool interlaced;
};
-bool decode_video_format(uint16_t video_format, unsigned *width, unsigned *height, unsigned *second_field_start,
- unsigned *extra_lines_top, unsigned *extra_lines_bottom,
- unsigned *frame_rate_nom, unsigned *frame_rate_den, bool *interlaced)
+bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_format)
{
- *interlaced = false;
+ decoded_video_format->id = video_format;
+ decoded_video_format->interlaced = false;
// TODO: Add these for all formats as we find them.
- *extra_lines_top = *extra_lines_bottom = *second_field_start = 0;
+ decoded_video_format->extra_lines_top = decoded_video_format->extra_lines_bottom = decoded_video_format->second_field_start = 0;
if (video_format == 0x0800) {
// No video signal. These green pseudo-frames seem to come at about 30.13 Hz.
// It's a strange thing, but what can you do.
- *width = 720;
- *height = 525;
- *extra_lines_top = 0;
- *extra_lines_bottom = 0;
- *frame_rate_nom = 3013;
- *frame_rate_den = 100;
+ decoded_video_format->width = 720;
+ decoded_video_format->height = 525;
+ decoded_video_format->extra_lines_top = 0;
+ decoded_video_format->extra_lines_bottom = 0;
+ decoded_video_format->frame_rate_nom = 3013;
+ decoded_video_format->frame_rate_den = 100;
return true;
}
if ((video_format & 0xe800) != 0xe800) {
printf("Video format 0x%04x does not appear to be a video format. Assuming 60 Hz.\n",
video_format);
- *width = 0;
- *height = 0;
- *extra_lines_top = 0;
- *extra_lines_bottom = 0;
- *frame_rate_nom = 60;
- *frame_rate_den = 1;
+ decoded_video_format->width = 0;
+ decoded_video_format->height = 0;
+ decoded_video_format->extra_lines_top = 0;
+ decoded_video_format->extra_lines_bottom = 0;
+ decoded_video_format->frame_rate_nom = 60;
+ decoded_video_format->frame_rate_den = 1;
return false;
}
// NTSC (480i59.94, I suppose). A special case, see below.
if (video_format == 0xe901 || video_format == 0xe9c1 || video_format == 0xe801) {
- *width = 720;
- *height = 480;
- *extra_lines_top = 17;
- *extra_lines_bottom = 28;
- *frame_rate_nom = 30000;
- *frame_rate_den = 1001;
- *second_field_start = 280;
- *interlaced = true;
+ decoded_video_format->width = 720;
+ decoded_video_format->height = 480;
+ decoded_video_format->extra_lines_top = 17;
+ decoded_video_format->extra_lines_bottom = 28;
+ decoded_video_format->frame_rate_nom = 30000;
+ decoded_video_format->frame_rate_den = 1001;
+ decoded_video_format->second_field_start = 280;
+ decoded_video_format->interlaced = true;
return true;
}
// PAL (576i50, I suppose). A special case, see below.
- if (video_format == 0xe909 || video_format == 0xe9c9 || video_format == 0xe809 || video_format == 0xebe9) {
- *width = 720;
- *height = 576;
- *extra_lines_top = 22;
- *extra_lines_bottom = 27;
- *frame_rate_nom = 25;
- *frame_rate_den = 1;
- *second_field_start = 335;
- *interlaced = true;
+ if (video_format == 0xe909 || video_format == 0xe9c9 || video_format == 0xe809 || video_format == 0xebe9 || video_format == 0xebe1) {
+ decoded_video_format->width = 720;
+ decoded_video_format->height = 576;
+ decoded_video_format->extra_lines_top = 22;
+ decoded_video_format->extra_lines_bottom = 27;
+ decoded_video_format->frame_rate_nom = 25;
+ decoded_video_format->frame_rate_den = 1;
+ decoded_video_format->second_field_start = 335;
+ decoded_video_format->interlaced = true;
return true;
}
};
for (const VideoFormatEntry &entry : entries) {
if (normalized_video_format == entry.normalized_video_format) {
- *width = entry.width;
- *height = entry.height;
- *second_field_start = entry.second_field_start;
- *extra_lines_top = entry.extra_lines_top;
- *extra_lines_bottom = entry.extra_lines_bottom;
- *frame_rate_nom = entry.frame_rate_nom;
- *frame_rate_den = entry.frame_rate_den;
- *interlaced = entry.interlaced;
+ decoded_video_format->width = entry.width;
+ decoded_video_format->height = entry.height;
+ decoded_video_format->second_field_start = entry.second_field_start;
+ decoded_video_format->extra_lines_top = entry.extra_lines_top;
+ decoded_video_format->extra_lines_bottom = entry.extra_lines_bottom;
+ decoded_video_format->frame_rate_nom = entry.frame_rate_nom;
+ decoded_video_format->frame_rate_den = entry.frame_rate_den;
+ decoded_video_format->interlaced = entry.interlaced;
return true;
}
}
printf("Unknown video format 0x%04x (normalized 0x%04x). Assuming 720p60.\n", video_format, normalized_video_format);
- *width = 1280;
- *height = 720;
- *frame_rate_nom = 60;
- *frame_rate_den = 1;
+ decoded_video_format->width = 1280;
+ decoded_video_format->height = 720;
+ decoded_video_format->frame_rate_nom = 60;
+ decoded_video_format->frame_rate_den = 1;
return false;
}
projects / bmusb / blobdiff