From: Steinar H. Gunderson Date: Mon, 25 Jul 2016 11:44:20 +0000 (+0200) Subject: Make decode_video_format() private. X-Git-Tag: 0.4~5 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=20a789f2e76ca239e3bfeb165d6ddefd9c2022f2;p=bmusb Make decode_video_format() private. --- diff --git a/bmusb.cpp b/bmusb.cpp index f8ab2e6..d62cef9 100644 --- a/bmusb.cpp +++ b/bmusb.cpp @@ -84,6 +84,122 @@ void change_xfer_size_for_width(int width, libusb_transfer *xfr) } } +struct VideoFormatEntry { + uint16_t normalized_video_format; + unsigned width, height, second_field_start; + unsigned extra_lines_top, extra_lines_bottom; + unsigned frame_rate_nom, frame_rate_den; + bool interlaced; +}; + +// Get details for the given video format; returns false if detection was incomplete. +bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_format) +{ + decoded_video_format->id = video_format; + decoded_video_format->interlaced = false; + + // TODO: Add these for all formats as we find them. + 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. + 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; + decoded_video_format->has_signal = false; + 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); + 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; + 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; + 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 || 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; + } + + // 0x8 seems to be a flag about availability of deep color on the input, + // except when it's not (e.g. it's the only difference between NTSC + // and PAL). Rather confusing. But we clear it here nevertheless, because + // usually it doesn't mean anything. + // + // 0x4 is a flag I've only seen from the D4. I don't know what it is. + uint16_t normalized_video_format = video_format & ~0xe80c; + constexpr VideoFormatEntry entries[] = { + { 0x01f1, 720, 480, 0, 40, 5, 60000, 1001, false }, // 480p59.94 (believed). + { 0x0131, 720, 576, 0, 44, 5, 50, 1, false }, // 576p50. + { 0x0011, 720, 576, 0, 44, 5, 50, 1, false }, // 576p50 (5:4). + { 0x0143, 1280, 720, 0, 25, 5, 50, 1, false }, // 720p50. + { 0x0103, 1280, 720, 0, 25, 5, 60, 1, false }, // 720p60. + { 0x0125, 1280, 720, 0, 25, 5, 60, 1, false }, // 720p60. + { 0x0121, 1280, 720, 0, 25, 5, 60000, 1001, false }, // 720p59.94. + { 0x01c3, 1920, 1080, 0, 0, 0, 30, 1, false }, // 1080p30. + { 0x0003, 1920, 1080, 583, 20, 25, 30, 1, true }, // 1080i60. + { 0x01e1, 1920, 1080, 0, 0, 0, 30000, 1001, false }, // 1080p29.97. + { 0x0021, 1920, 1080, 583, 20, 25, 30000, 1001, true }, // 1080i59.94. + { 0x0063, 1920, 1080, 0, 0, 0, 25, 1, false }, // 1080p25. + { 0x0043, 1920, 1080, 0, 0, 0, 25, 1, true }, // 1080p50. + { 0x008e, 1920, 1080, 0, 0, 0, 24, 1, false }, // 1080p24. + { 0x00a1, 1920, 1080, 0, 0, 0, 24000, 1001, false }, // 1080p23.98. + }; + for (const VideoFormatEntry &entry : entries) { + if (normalized_video_format == entry.normalized_video_format) { + 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); + 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; +} + } // namespace FrameAllocator::~FrameAllocator() {} @@ -1246,121 +1362,6 @@ void BMUSBCapture::stop_bm_thread() usb_thread.join(); } -struct VideoFormatEntry { - uint16_t normalized_video_format; - unsigned width, height, second_field_start; - unsigned extra_lines_top, extra_lines_bottom; - unsigned frame_rate_nom, frame_rate_den; - bool interlaced; -}; - -bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_format) -{ - decoded_video_format->id = video_format; - decoded_video_format->interlaced = false; - - // TODO: Add these for all formats as we find them. - 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. - 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; - decoded_video_format->has_signal = false; - 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); - 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; - 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; - 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 || 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; - } - - // 0x8 seems to be a flag about availability of deep color on the input, - // except when it's not (e.g. it's the only difference between NTSC - // and PAL). Rather confusing. But we clear it here nevertheless, because - // usually it doesn't mean anything. - // - // 0x4 is a flag I've only seen from the D4. I don't know what it is. - uint16_t normalized_video_format = video_format & ~0xe80c; - constexpr VideoFormatEntry entries[] = { - { 0x01f1, 720, 480, 0, 40, 5, 60000, 1001, false }, // 480p59.94 (believed). - { 0x0131, 720, 576, 0, 44, 5, 50, 1, false }, // 576p50. - { 0x0011, 720, 576, 0, 44, 5, 50, 1, false }, // 576p50 (5:4). - { 0x0143, 1280, 720, 0, 25, 5, 50, 1, false }, // 720p50. - { 0x0103, 1280, 720, 0, 25, 5, 60, 1, false }, // 720p60. - { 0x0125, 1280, 720, 0, 25, 5, 60, 1, false }, // 720p60. - { 0x0121, 1280, 720, 0, 25, 5, 60000, 1001, false }, // 720p59.94. - { 0x01c3, 1920, 1080, 0, 0, 0, 30, 1, false }, // 1080p30. - { 0x0003, 1920, 1080, 583, 20, 25, 30, 1, true }, // 1080i60. - { 0x01e1, 1920, 1080, 0, 0, 0, 30000, 1001, false }, // 1080p29.97. - { 0x0021, 1920, 1080, 583, 20, 25, 30000, 1001, true }, // 1080i59.94. - { 0x0063, 1920, 1080, 0, 0, 0, 25, 1, false }, // 1080p25. - { 0x0043, 1920, 1080, 0, 0, 0, 25, 1, true }, // 1080p50. - { 0x008e, 1920, 1080, 0, 0, 0, 24, 1, false }, // 1080p24. - { 0x00a1, 1920, 1080, 0, 0, 0, 24000, 1001, false }, // 1080p23.98. - }; - for (const VideoFormatEntry &entry : entries) { - if (normalized_video_format == entry.normalized_video_format) { - 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); - 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; -} - map BMUSBCapture::get_available_video_modes() const { // The USB3 cards autodetect, and seem to have no provision for forcing modes. diff --git a/bmusb.h b/bmusb.h index 941c57c..38a7bfc 100644 --- a/bmusb.h +++ b/bmusb.h @@ -90,6 +90,10 @@ struct VideoMode { }; // Represents the format of an actual frame coming in. +// Note: Frame rate is _frame_ rate, not field rate. So 1080i60 gets 30/1, _not_ 60/1. +// "second_field_start" is only valid for interlaced modes; it signifies +// how many lines from the very top of the frame there are before the second field +// starts (so it will always be >= height/2 + extra_lines_top). struct VideoFormat { uint16_t id = 0; // For debugging/logging only. unsigned width = 0, height = 0, second_field_start = 0; @@ -322,11 +326,4 @@ class BMUSBCapture : public CaptureInterface { bool disconnected = false; }; -// Get details for the given video format; returns false if detection was incomplete. -// Note: Frame rate is _frame_ rate, not field rate. So 1080i60 gets 30/1, _not_ 60/1. -// "second_field_start" is only valid for interlaced modes; it signifies -// how many lines from the very top of the frame there are before the second field -// starts (so it will always be >= height/2 + extra_lines_top). -bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_format); - #endif