On errors, abort() instead of exit(1); exit() in a multithreaded program just gives...

[nageru] / nageru / mjpeg_encoder.h

diff --git a/nageru/mjpeg_encoder.h b/nageru/mjpeg_encoder.h
index b7b20431825b3fabffcf5da22f97c6ced4b5bb5d..6e0357f0c0f32bd4a862ece103bb74d3bb7b50e5 100644 (file)
--- a/nageru/mjpeg_encoder.h
+++ b/nageru/mjpeg_encoder.h
@@ -39,12 +39,6 @@ public:
        ~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);
-
        bool using_vaapi() const { return va_dpy != nullptr; }
 
        // Returns -1 for inactive (ie., don't encode frames for this card right now).
@@ -58,6 +52,7 @@ private:
                VASurfaceID surface;
                VAContextID context;
                VABufferID data_buffer;
+               VAImage image;
        };
 
        // RAII wrapper to release VAResources on return (even on error).