Unify VA-API initialization.

[nageru] / nageru / mjpeg_encoder.h

diff --git a/nageru/mjpeg_encoder.h b/nageru/mjpeg_encoder.h
index 6ba7f0381bad3a1f3f1ec879e07cf44dcaf7260b..330784bd94a30121cf30f9b3c7a5bfb1d48d2883 100644 (file)
--- a/nageru/mjpeg_encoder.h
+++ b/nageru/mjpeg_encoder.h
@@ -31,7 +31,7 @@ struct VectorDestinationManager;
 
 #define CHECK_VASTATUS(va_status, func)                                 \
     if (va_status != VA_STATUS_SUCCESS) {                               \
-        fprintf(stderr, "%s:%d (%s) failed with %d\n", __func__, __LINE__, func, va_status); \
+        fprintf(stderr, "%s:%d (%s) failed: %s\n", __func__, __LINE__, func, vaErrorStr(va_status)); \
         exit(1);                                                        \
     }
 
@@ -50,6 +50,7 @@ private:
 
        struct VAResources {
                unsigned width, height;
+               uint32_t fourcc;
                VASurfaceID surface;
                VAContextID context;
                VABufferID data_buffer;
@@ -119,8 +120,8 @@ private:
        std::vector<uint8_t> encode_jpeg_libjpeg(const QueuedFrame &qf);
        void write_mjpeg_packet(AVFormatContext *avctx, int64_t pts, unsigned stream_index, const uint8_t *jpeg, size_t jpeg_size);
        void write_audio_packet(AVFormatContext *avctx, int64_t pts, unsigned stream_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);
+       void init_jpeg(unsigned width, unsigned height, const movit::RGBTriplet &white_balance, VectorDestinationManager *dest, jpeg_compress_struct *cinfo, int y_h_samp_factor, int y_v_samp_factor);
+       std::vector<uint8_t> get_jpeg_header(unsigned width, unsigned height, const movit::RGBTriplet &white_balance, int y_h_samp_factor, int y_v_samp_factor, jpeg_compress_struct *cinfo);
        void add_stream(HTTPD::StreamID stream_id);  // Can only be called from the constructor, or the thread owning <streams>.
        void update_siphon_streams();  // Same.
        void create_ffmpeg_context(HTTPD::StreamID stream_id);
@@ -152,8 +153,28 @@ private:
        bool running = false;
 
        std::unique_ptr<VADisplayWithCleanup> va_dpy;
-       VAConfigID config_id;
+       VAConfigID config_id_422, config_id_420;
 
+       struct VAKey {
+               unsigned width, height, y_h_samp_factor, y_v_samp_factor;
+               movit::RGBTriplet white_balance;
+
+               bool operator< (const VAKey &other) const {
+                       if (width != other.width)
+                               return width < other.width;
+                       if (height != other.height)
+                               return height < other.height;
+                       if (y_h_samp_factor != other.y_h_samp_factor)
+                               return y_h_samp_factor < other.y_h_samp_factor;
+                       if (y_v_samp_factor != other.y_v_samp_factor)
+                               return y_v_samp_factor < other.y_v_samp_factor;
+                       if (white_balance.r != other.white_balance.r)
+                               return white_balance.r < other.white_balance.r;
+                       if (white_balance.g != other.white_balance.g)
+                               return white_balance.g < other.white_balance.g;
+                       return white_balance.b < other.white_balance.b;
+               }
+       };
        struct VAData {
                std::vector<uint8_t> jpeg_header;
                VAEncPictureParameterBufferJPEG pic_param;
@@ -161,16 +182,14 @@ private:
                VAHuffmanTableBufferJPEGBaseline huff;
                VAEncSliceParameterBufferJPEG parms;
        };
-       std::map<std::pair<unsigned, unsigned>, VAData> va_data_for_resolution;
-       VAData get_va_data_for_resolution(unsigned width, unsigned height, const movit::RGBTriplet &white_balance);
+       std::map<VAKey, VAData> va_data_for_parameters;
+       VAData get_va_data_for_parameters(unsigned width, unsigned height, unsigned y_h_samp_factor, unsigned y_v_samp_factor, const movit::RGBTriplet &white_balance);
 
        std::list<VAResources> va_resources_freelist;
        std::mutex va_resources_mutex;
-       VAResources get_va_resources(unsigned width, unsigned height);
+       VAResources get_va_resources(unsigned width, unsigned height, uint32_t fourcc);
        void release_va_resources(VAResources resources);
 
-       static std::unique_ptr<VADisplayWithCleanup> try_open_va(const std::string &va_display, std::string *error, VAConfigID *config_id);
-
        uint8_t *tmp_y, *tmp_cbcr, *tmp_cb, *tmp_cr;  // Private to the encoder thread. Used by the libjpeg backend only.
 
        std::atomic<int64_t> metric_mjpeg_frames_zero_size_dropped{0};