There are too many configuration files in the v4l2 demo, which cannot…

… be managed uniformly (#86) * Fix the problem that the dual screen is dark and bright * Fix the problem that the dual screen is dark and brigh * there are too many configuration files in the v4l2 demo, which cannot be managed uniformly Co-authored-by: zzxcanaan <[email protected]>
kendryte · May 30, 2022 · d19add8 · d19add8
1 parent 3f0e04e
commit d19add8
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 1,387 deletions.
diff --git a/package/mediactl_lib/mediactl_lib.mk b/package/mediactl_lib/mediactl_lib.mk
@@ -27,13 +27,14 @@ define MEDIACTL_LIB_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/libmediactl.so $(TARGET_DIR)/lib64/lp64d/libmediactl.so
 	mkdir $(TARGET_DIR)/app/mediactl_lib/ -p
 	$(INSTALL) -D -m 0755 $(@D)/v4l2_demo/v4l2-demo $(TARGET_DIR)/app/mediactl_lib/
-	$(INSTALL) -D -m 0755 $(@D)/v4l2_demo/*.conf $(TARGET_DIR)/app/mediactl_lib/
+	#$(INSTALL) -D -m 0755 $(@D)/v4l2_demo/*.conf $(TARGET_DIR)/app/mediactl_lib/
 	$(INSTALL) -D -m 0755 $(@D)/v4l2_drm/v4l2_drm.out $(TARGET_DIR)/app/mediactl_lib/
-	$(INSTALL) -D -m 0755 $(@D)/v4l2_drm/video_drm*.conf $(TARGET_DIR)/app/mediactl_lib/
-	$(INSTALL) -D -m 0755 $(@D)/v4l2_drm/imx219_1080x1920_0.conf $(TARGET_DIR)/app/mediactl_lib/
-	$(INSTALL) -D -m 0755 $(@D)/v4l2_test/v4l2_test.out $(TARGET_DIR)/app/mediactl_lib/
-	$(INSTALL) -D -m 0755 $(@D)/v4l2_test/video_test.conf $(TARGET_DIR)/app/mediactl_lib/
+	#$(INSTALL) -D -m 0755 $(@D)/v4l2_drm/video_drm*.conf $(TARGET_DIR)/app/mediactl_lib/
+	#$(INSTALL) -D -m 0755 $(@D)/v4l2_drm/imx219_1080x1920_0.conf $(TARGET_DIR)/app/mediactl_lib/
+	#$(INSTALL) -D -m 0755 $(@D)/v4l2_test/v4l2_test.out $(TARGET_DIR)/app/mediactl_lib/
+	#$(INSTALL) -D -m 0755 $(@D)/v4l2_test/video_test.conf $(TARGET_DIR)/app/mediactl_lib/
 	$(INSTALL) -D -m 0755 $(@D)/v4l2_drm_isptool/v4l2_drm_isptool.out $(TARGET_DIR)/app/mediactl_lib/
+	$(INSTALL) -D -m 0755 $(@D)/config/*.conf $(TARGET_DIR)/app/mediactl_lib/
 endef
 
 $(eval $(generic-package))
diff --git a/.../mediactl_lib/src/v4l2_demo/imx219_0.conf → ...age/mediactl_lib/src/config/imx219_0.conf b/.../mediactl_lib/src/v4l2_demo/imx219_0.conf → ...age/mediactl_lib/src/config/imx219_0.conf
diff --git a/.../mediactl_lib/src/v4l2_demo/imx219_1.conf → ...age/mediactl_lib/src/config/imx219_1.conf b/.../mediactl_lib/src/v4l2_demo/imx219_1.conf → ...age/mediactl_lib/src/config/imx219_1.conf
diff --git a/..._lib/src/v4l2_drm/imx219_1080x1920_0.conf → ...tl_lib/src/config/imx219_1080x1920_0.conf b/..._lib/src/v4l2_drm/imx219_1080x1920_0.conf → ...tl_lib/src/config/imx219_1080x1920_0.conf
diff --git a/...lib/src/v4l2_drm/video_drm_1080x1920.conf → ...l_lib/src/config/video_drm_1080x1920.conf b/...lib/src/v4l2_drm/video_drm_1080x1920.conf → ...l_lib/src/config/video_drm_1080x1920.conf
diff --git a/...src/v4l2_drm/video_drm_1080x1920_r2k.conf → ...b/src/config/video_drm_1080x1920_r2k.conf b/...src/v4l2_drm/video_drm_1080x1920_r2k.conf → ...b/src/config/video_drm_1080x1920_r2k.conf
diff --git a/...lib/src/v4l2_drm/video_drm_1920x1080.conf → ...l_lib/src/config/video_drm_1920x1080.conf b/...lib/src/v4l2_drm/video_drm_1920x1080.conf → ...l_lib/src/config/video_drm_1920x1080.conf
diff --git a/package/mediactl_lib/src/v4l2_demo/video.conf b/package/mediactl_lib/src/v4l2_demo/video.conf