Make the MJPEG card-to-stream mapping invisible to outside callers.

[nageru] / nageru / mjpeg_encoder.h

diff --git a/nageru/mjpeg_encoder.h b/nageru/mjpeg_encoder.h
index b7b20431825b3fabffcf5da22f97c6ced4b5bb5d..362e93461e2ed92c6a09b73153fe7dfc34b6b307 100644 (file)
--- a/nageru/mjpeg_encoder.h
+++ b/nageru/mjpeg_encoder.h
@@ -20,6 +20,7 @@ extern "C" {
 #include <string>
 #include <thread>
 
+#include <movit/effect.h>
 #include <va/va.h>
 
 class HTTPD;
@@ -38,17 +39,10 @@ public:
        MJPEGEncoder(HTTPD *httpd, const std::string &va_display);
        ~MJPEGEncoder();
        void stop();
-       void upload_frame(int64_t pts, unsigned card_index, RefCountedFrame frame, const bmusb::VideoFormat &video_format, size_t y_offset, size_t cbcr_offset);
-
-       // If the frame was started (data_copy != nullptr) but will not be finished
-       // (MJPEG decoding was turned off in the meantime), you'll need to call finish_frame()
-       // to release any VA-API resources.
-       void finish_frame(RefCountedFrame frame);
-
+       void upload_frame(int64_t pts, unsigned card_index, RefCountedFrame frame, const bmusb::VideoFormat &video_format, size_t y_offset, size_t cbcr_offset, std::vector<int32_t> audio, const movit::RGBTriplet &white_balance);
        bool using_vaapi() const { return va_dpy != nullptr; }
 
-       // Returns -1 for inactive (ie., don't encode frames for this card right now).
-       int get_mjpeg_stream_for_card(unsigned card_index);
+       bool should_encode_mjpeg_for_card(unsigned card_index);
 
 private:
        static constexpr int quality = 90;
@@ -58,6 +52,7 @@ private:
                VASurfaceID surface;
                VAContextID context;
                VABufferID data_buffer;
+               VAImage image;
        };
 
        // RAII wrapper to release VAResources on return (even on error).
@@ -109,6 +104,8 @@ private:
                RefCountedFrame frame;
                bmusb::VideoFormat video_format;
                size_t y_offset, cbcr_offset;
+               std::vector<int32_t> audio;
+               movit::RGBTriplet white_balance;
 
                // Only for frames in the process of being encoded by VA-API.
                VAResources resources;
@@ -120,8 +117,9 @@ private:
        void encode_jpeg_va(QueuedFrame &&qf);
        std::vector<uint8_t> encode_jpeg_libjpeg(const QueuedFrame &qf);
        void write_mjpeg_packet(int64_t pts, unsigned card_index, const uint8_t *jpeg, size_t jpeg_size);
-       void init_jpeg_422(unsigned width, unsigned height, VectorDestinationManager *dest, jpeg_compress_struct *cinfo);
-       std::vector<uint8_t> get_jpeg_header(unsigned width, unsigned height, jpeg_compress_struct *cinfo);
+       void write_audio_packet(int64_t pts, unsigned card_index, const std::vector<int32_t> &audio);
+       void init_jpeg_422(unsigned width, unsigned height, const movit::RGBTriplet &white_balance, VectorDestinationManager *dest, jpeg_compress_struct *cinfo);
+       std::vector<uint8_t> get_jpeg_header(unsigned width, unsigned height, const movit::RGBTriplet &white_balance, jpeg_compress_struct *cinfo);
 
        static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
        int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
@@ -152,7 +150,7 @@ private:
                VAEncSliceParameterBufferJPEG parms;
        };
        std::map<std::pair<unsigned, unsigned>, VAData> va_data_for_resolution;
-       VAData get_va_data_for_resolution(unsigned width, unsigned height);
+       VAData get_va_data_for_resolution(unsigned width, unsigned height, const movit::RGBTriplet &white_balance);
 
        std::list<VAResources> va_resources_freelist;
        std::mutex va_resources_mutex;