Send the video format in directly to the video frame callback, so that we do not...

diff --git a/bmusb.cpp b/bmusb.cpp
index 3132c42f2718ae80d19f4ec175b7ecf2feb48d98..74643bc9b03879194a7663d9489528295e534396 100644 (file)
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -205,7 +205,7 @@ void BMUSBCapture::dequeue_thread_func()
                        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();
@@ -221,9 +221,16 @@ void BMUSBCapture::dequeue_thread_func()
                        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) {
@@ -257,11 +264,9 @@ void BMUSBCapture::start_new_frame(const uint8_t *start)
 
                // 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",
@@ -1128,61 +1133,60 @@ struct VideoFormatEntry {
        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;
        }
 
@@ -1212,22 +1216,22 @@ bool decode_video_format(uint16_t video_format, unsigned *width, unsigned *heigh
        };
        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;
 }

diff --git a/bmusb.h b/bmusb.h
index 6fdddedeb6e1d5781d8a9128cf67b5525fd5ef33..04d867b009e49cabc4fdcd6cf63a3f3b46b88b1e 100644 (file)
--- a/bmusb.h
+++ b/bmusb.h
@@ -57,8 +57,16 @@ class FrameAllocator {
        virtual void release_frame(Frame frame) = 0;
 };
 
+struct VideoFormat {
+       uint16_t id = 0;  // For debugging/logging only.
+       unsigned width = 0, height = 0, second_field_start = 0;
+       unsigned extra_lines_top = 0, extra_lines_bottom = 0;
+       unsigned frame_rate_nom = 0, frame_rate_den = 0;
+       bool interlaced = false;
+};
+
 typedef std::function<void(uint16_t timecode,
-                           FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
+                           FrameAllocator::Frame video_frame, size_t video_offset, VideoFormat video_format,
                            FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format)>
        frame_callback_t;
 
@@ -168,8 +176,6 @@ class BMUSBCapture {
 // "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, 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);
 
 #endif

diff --git a/formats.txt b/formats.txt
index 3b3abd3cc1604334a311eba1ae357ed41ea821e6..4e61285a8cacb4f148e6b3f51298b65b95c0fa47 100644 (file)
--- a/formats.txt
+++ b/formats.txt
@@ -10,7 +10,7 @@
 480p60      - 0xe9f1 (unsure if this is 60 or 59.94)
 NTSC        - 0xe901 (also seen 0xe9c1, 0xe801)
 NTSC 23.98  - 0xe901
-PAL         - 0xe909 (also seen 0xe9c9 and 0xebe9)
+PAL         - 0xe909 (also seen 0xe9c9, 0xebe9, 0xebe1)
 1080p 23.98 - 0xe8ad
 1080p 24    - 0xe88b
 1080p 25    - 0xe86b