Add another non-interleaved data copy (intended for VA-API MJPEG uploads).

[bmusb] / bmusb / bmusb.h

diff --git a/bmusb/bmusb.h b/bmusb/bmusb.h
index 7a31a4d8372fb249b918bd6dde87d49f83cd834c..a484496bd6be5cd0aa83512258c0e87f75a79978 100644 (file)
--- a/bmusb/bmusb.h
+++ b/bmusb/bmusb.h
@@ -31,6 +31,7 @@ class FrameAllocator {
        struct Frame {
                uint8_t *data = nullptr;
                uint8_t *data2 = nullptr;  // Only if interleaved == true.
+               uint8_t *data_copy = nullptr;  // Will get a non-interleaved copy if not nullptr.
                size_t len = 0;  // Number of bytes we actually have.
                size_t size = 0;  // Number of bytes we have room for.
                size_t overflow = 0;
@@ -126,6 +127,7 @@ struct AudioFormat {
        uint16_t id = 0;  // For debugging/logging only.
        unsigned bits_per_sample = 0;
        unsigned num_channels = 0;
+       unsigned sample_rate = 48000;
 };
 
 enum PixelFormat {
@@ -155,7 +157,19 @@ enum PixelFormat {
 
        // 8-bit 4:4:4:4 BGRA (in that order). bmusb itself doesn't
        // produce this, but it is useful to represent e.g. synthetic inputs.
-       PixelFormat_8BitBGRA
+       PixelFormat_8BitBGRA,
+
+       // 8-bit 4:2:0, 4:2:2, 4:4:4 or really anything else, planar
+       // (ie., first all Y', then all Cb, then all Cr). bmusb doesn't
+       // produce this, nor does it specify a mechanism to describe
+       // the precise details of the format.
+       PixelFormat_8BitYCbCrPlanar,
+
+       // These exist only so that the type is guaranteed wide enough
+       // to contain values up to 127. CaptureInterface instances
+       // are free to use them as they see fit for private uses.
+       PixelFormat_Unused100 = 100,
+       PixelFormat_Unused127 = 127
 };
 
 typedef std::function<void(uint16_t timecode,