simplified VideoEncoder API

LiangliangNan · Nov 29, 2024 · 6cecfb1 · 6cecfb1
1 parent 8091c6c
commit 6cecfb1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/applications/Mapple/paint_canvas_snapshot.cpp b/applications/Mapple/paint_canvas_snapshot.cpp
@@ -333,14 +333,14 @@ void PaintCanvas::recordAnimation(const QString &file_name, int fps, int bit_rat
         }
         if (image.format() != QImage::Format_RGBA8888)
             image = image.convertToFormat(QImage::Format_RGBA8888);
-        if (!encoder.encode(image.constBits(), image.width(), image.height(), 4, VideoEncoder::PIX_FMT_RGBA_8888)) {
+        if (!encoder.encode(image.constBits(), image.width(), image.height(), VideoEncoder::PIX_FMT_RGBA_8888)) {
             success = false;
             break;
         }
 #else
         std::vector<unsigned char> image;
         fbo->read_color(0, image, GL_RGBA);
-        if (!encoder.encode(image.data(), fw, fh, 4, VideoEncoder::PIX_FMT_RGBA_8888)) {
+        if (!encoder.encode(image.data(), fw, fh, VideoEncoder::PIX_FMT_RGBA_8888)) {
             success = false;
             break;
         }

diff --git a/easy3d/video/video_encoder.cpp b/easy3d/video/video_encoder.cpp
@@ -1092,7 +1092,7 @@ namespace easy3d {
     }
 
 
-    bool VideoEncoder::encode(const unsigned char *image_data, int width, int height, int channels, PixelFormat pixel_format) {
+    bool VideoEncoder::encode(const unsigned char *image_data, int width, int height, PixelFormat pixel_format) {
         if (!is_size_acceptable(width, height)) {
             LOG(ERROR) << "video frame resolution (" << width << ", " << height << ") is not a multiple of 8";
             return false;
@@ -1120,34 +1120,23 @@ namespace easy3d {
             return false;
         }
 
+        int channels = 3;
         AVPixelFormat pix_fmt = AV_PIX_FMT_RGB24;
         switch (pixel_format) {
             case PIX_FMT_RGB_888:
-                if (channels != 3) {
-                    LOG(ERROR) << "pixel format (PIX_FMT_RGB_888) does not match the number of channels (" << channels << ")";
-                    return false;
-                }
+                channels = 3;
                 pix_fmt = AV_PIX_FMT_RGB24;
                 break;
             case PIX_FMT_BGR_888:
-                if (channels != 3) {
-                    LOG(ERROR) << "pixel format (PIX_FMT_BGR_888) does not match the number of channels (" << channels << ")";
-                    return false;
-                }
+                channels = 3;
                 pix_fmt = AV_PIX_FMT_BGR24;
                 break;
             case PIX_FMT_RGBA_8888:
-                if (channels != 4) {
-                    LOG(ERROR) << "pixel format (PIX_FMT_RGBA_8888) does not match the number of channels (" << channels << ")";
-                    return false;
-                }
+                channels = 4;
                 pix_fmt = AV_PIX_FMT_RGBA;
                 break;
             case PIX_FMT_BGRA_8888:
-                if (channels != 4) {
-                    LOG(ERROR) << "pixel format (PIX_FMT_BGRA_8888) does not match the number of channels (" << channels << ")";
-                    return false;
-                }
+                channels = 4;
                 pix_fmt = AV_PIX_FMT_BGRA;
                 break;
         }

diff --git a/easy3d/video/video_encoder.h b/easy3d/video/video_encoder.h
@@ -88,15 +88,14 @@ namespace easy3d {
 		 *		following structures.
          * \param width video width (must be a multiple of 8)
          * \param height video height (must be a multiple of 8)
-         * \param channels the number of channels of the image
          * \param pixel_format pixel format. The correspondences between the image structures and pixel/OpenGL formats are:
 		 *		    RGB 8:8:8, 24bpp     <--->  PIX_FMT_RGB_888    <--->  GL_RGB
          *          BGR 8:8:8, 24bpp     <--->  PIX_FMT_BGR_888    <--->  GL_BGR
          *          RGBA 8:8:8:8, 32bpp  <--->  PIX_FMT_RGBA_8888  <--->  GL_RGBA
          *          BGRA 8:8:8:8, 32bpp  <--->  PIX_FMT_BGRA_8888  <--->  GL_BGRA
 		 * \return true on successful.
 		 **/
-		bool encode(const unsigned char* image_data, int width, int height, int channels, PixelFormat pixel_format);
+		bool encode(const unsigned char* image_data, int width, int height, PixelFormat pixel_format);
 
         /// Returns whether the image size (width, height) is acceptable.
         static bool is_size_acceptable(int width, int height) { return (width % 8) == 0 && (height % 8) == 0; }