~lzh/A133.git

summary
reflog
commits
tree
docs
forks
compare

blame | history | patch | commit | commitdiff

liyujie

2025-08-28 d9927380ed7c8366f762049be9f3fee225860833

 android/hardware/aw/camera/3_4/v4l2_camera_hal.h
.. .. @@ -72,7 +72,7 @@
72 72    // Callback handle.
73 73    const camera_module_callbacks_t* mCallbacks;
74 74    std::vector<std::shared_ptr<CCameraConfig>> mCameraConfig;
75 -
75 +  bool hal_merge_stream_flag;
76 76    DISALLOW_COPY_AND_ASSIGN(V4L2CameraHAL);
77 77  };
78 78

..	..	@@ -72,7 +72,7 @@
72	72	// Callback handle.
73	73	const camera_module_callbacks_t* mCallbacks;
74	74	std::vector<std::shared_ptr<CCameraConfig>> mCameraConfig;
75		-
	75	+ bool hal_merge_stream_flag;
76	76	DISALLOW_COPY_AND_ASSIGN(V4L2CameraHAL);
77	77	};
78	78