merge: ~mkrufky/tda18271

From: Michael Krufky <mkrufky@kernellabs.com>

Priority: normal

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>

1 files changed, 119 insertions, 0 deletions

diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp
index dec9edd61..b2246c557 100644
--- a/v4l2-apps/util/v4l2-ctl.cpp
+++ b/v4l2-apps/util/v4l2-ctl.cpp
@@ -131,6 +131,8 @@ enum Option {
 	OptOverlay,
 	OptGetJpegComp,
 	OptSetJpegComp,
+	OptGetModulator,
+	OptSetModulator,
 	OptListDevices,
 	OptLast = 256
 };
@@ -145,6 +147,7 @@ static unsigned capabilities;
 typedef std::vector<struct v4l2_ext_control> ctrl_list;
 static ctrl_list user_ctrls;
 static ctrl_list mpeg_ctrls;
+static ctrl_list camera_ctrls;
 
 typedef std::map<std::string, unsigned> ctrl_strmap;
 static ctrl_strmap ctrl_str2id;
@@ -260,6 +263,8 @@ static struct option long_options[] = {
 	{"set-crop-output-overlay", required_argument, 0, OptSetOutputOverlayCrop},
 	{"get-jpeg-comp", no_argument, 0, OptGetJpegComp},
 	{"set-jpeg-comp", required_argument, 0, OptSetJpegComp},
+	{"get-modulator", no_argument, 0, OptGetModulator},
+	{"set-modulator", required_argument, 0, OptSetModulator},
 	{"overlay", required_argument, 0, OptOverlay},
 	{"list-devices", no_argument, 0, OptListDevices},
 	{0, 0, 0, 0}
@@ -404,6 +409,15 @@ static void usage(void)
 	       "                     display audio outputs [VIDIOC_ENUMAUDOUT]\n"
 	       "  --list-audio-inputs\n"
 	       "                     display audio inputs [VIDIOC_ENUMAUDIO]\n"
+	       "  --get-modulator    query the modulator settings [VIDIOC_G_MODULATOR]\n"
+	       "  --set-modulator=<txsubchans>\n"
+	       "                     set the sub-carrier modulation [VIDIOC_S_MODULATOR]\n"
+	       "                     <txsubchans> is one of:\n"
+	       "                     mono:	 Modulate as mono\n"
+	       "                     stereo:	 Modulate as stereo\n"
+	       "                     bilingual:	 Modulate as bilingual\n"
+	       "                     mono-sap:	 Modulate as mono with Second Audio Program\n"
+	       "                     stereo-sap: Modulate as stereo with Second Audio Program\n"
 	       "\n");
 	printf("Expert options:\n"
 	       "  --streamoff        turn the stream off [VIDIOC_STREAMOFF]\n"
@@ -943,6 +957,23 @@ static std::string rxsubchans2s(int rxsubchans)
 		s += "lang1 ";
 	if (rxsubchans & V4L2_TUNER_SUB_LANG2)
 		s += "lang2 ";
+	if (rxsubchans & V4L2_TUNER_SUB_RDS)
+		s += "rds ";
+	return s;
+}
+
+static std::string txsubchans2s(int txsubchans)
+{
+	std::string s;
+
+	if (txsubchans & V4L2_TUNER_SUB_MONO)
+		s += "mono";
+	if (txsubchans & V4L2_TUNER_SUB_STEREO)
+		s += "stereo";
+	if (txsubchans & V4L2_TUNER_SUB_LANG1)
+		s += "bilingual";
+	if (txsubchans & V4L2_TUNER_SUB_SAP)
+		s += "+sap";
 	return s;
 }
 
@@ -962,6 +993,8 @@ static std::string tcap2s(unsigned cap)
 		s += "lang1 ";
 	if (cap & V4L2_TUNER_CAP_LANG2)
 		s += "lang2 ";
+	if (cap & V4L2_TUNER_CAP_RDS)
+		s += "rds ";
 	return s;
 }
 
@@ -987,8 +1020,12 @@ static std::string cap2s(unsigned cap)
 		s += "\t\tSliced VBI Output\n";
 	if (cap & V4L2_CAP_RDS_CAPTURE)
 		s += "\t\tRDS Capture\n";
+	if (cap & V4L2_CAP_RDS_OUTPUT)
+		s += "\t\tRDS Output\n";
 	if (cap & V4L2_CAP_TUNER)
 		s += "\t\tTuner\n";
+	if (cap & V4L2_CAP_MODULATOR)
+		s += "\t\tModulator\n";
 	if (cap & V4L2_CAP_AUDIO)
 		s += "\t\tAudio\n";
 	if (cap & V4L2_CAP_RADIO)
@@ -1384,6 +1421,7 @@ int main(int argc, char **argv)
 	struct v4l2_jpegcompression jpegcomp; /* jpeg compression */
 	int input;			/* set_input/get_input */
 	int output;			/* set_output/get_output */
+	int txsubchans;			/* set_modulator */
 	v4l2_std_id std;		/* get_std/set_std */
 	double freq = 0;		/* get/set frequency */
 	struct v4l2_frequency vf;	/* get_freq/set_freq */
@@ -1695,6 +1733,24 @@ int main(int argc, char **argv)
 				return 1;
 			}
 			break;
+		case OptSetModulator:
+			txsubchans = strtol(optarg, 0L, 0);
+			if (!strcmp(optarg, "stereo"))
+				txsubchans = V4L2_TUNER_SUB_STEREO;
+			else if (!strcmp(optarg, "stereo-sap"))
+				txsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_SAP;
+			else if (!strcmp(optarg, "bilingual"))
+				txsubchans = V4L2_TUNER_SUB_LANG1;
+			else if (!strcmp(optarg, "mono"))
+				txsubchans = V4L2_TUNER_SUB_MONO;
+			else if (!strcmp(optarg, "mono-sap"))
+				txsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_SAP;
+			else {
+				fprintf(stderr, "Unknown txsubchans value\n");
+				usage();
+				return 1;
+			}
+			break;
 		case OptSetSlicedVbiFormat:
 		case OptSetSlicedVbiOutFormat:
 		case OptTrySlicedVbiFormat:
@@ -1861,6 +1917,7 @@ int main(int argc, char **argv)
 		options[OptGetStandard] = 1;
 		options[OptGetFreq] = 1;
 		options[OptGetTuner] = 1;
+		options[OptGetModulator] = 1;
 		options[OptGetOverlayFormat] = 1;
 		options[OptGetOutputOverlayFormat] = 1;
 		options[OptGetVbiFormat] = 1;
@@ -1954,6 +2011,16 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (options[OptSetModulator]) {
+		struct v4l2_modulator mt;
+
+		memset(&mt, 0, sizeof(struct v4l2_modulator));
+		if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) {
+			mt.txsubchans = txsubchans;
+			doioctl(fd, VIDIOC_S_MODULATOR, &mt, "VIDIOC_S_MODULATOR");
+		}
+	}
+
 	if (options[OptSetVideoFormat] || options[OptTryVideoFormat]) {
 		struct v4l2_format in_vfmt;
 
@@ -2125,6 +2192,8 @@ set_vid_fmt_error:
 			ctrl.value = strtol(iter->second.c_str(), NULL, 0);
 			if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_MPEG)
 				mpeg_ctrls.push_back(ctrl);
+			else if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_CAMERA)
+				camera_ctrls.push_back(ctrl);
 			else
 				user_ctrls.push_back(ctrl);
 		}
@@ -2155,6 +2224,22 @@ set_vid_fmt_error:
 				}
 			}
 		}
+		if (camera_ctrls.size()) {
+			ctrls.ctrl_class = V4L2_CTRL_CLASS_CAMERA;
+			ctrls.count = camera_ctrls.size();
+			ctrls.controls = &camera_ctrls[0];
+			if (doioctl(fd, VIDIOC_S_EXT_CTRLS, &ctrls, "VIDIOC_S_EXT_CTRLS")) {
+				if (ctrls.error_idx >= ctrls.count) {
+					fprintf(stderr, "Error setting CAMERA controls: %s\n",
+						strerror(errno));
+				}
+				else {
+					fprintf(stderr, "%s: %s\n",
+						ctrl_id2str[camera_ctrls[ctrls.error_idx].id].c_str(),
+						strerror(errno));
+				}
+			}
+		}
 	}
 
 	/* Get options */
@@ -2370,6 +2455,7 @@ set_vid_fmt_error:
 		struct v4l2_ext_controls ctrls = { 0 };
 
 		mpeg_ctrls.clear();
+		camera_ctrls.clear();
 		user_ctrls.clear();
 		for (ctrl_get_list::iterator iter = get_ctrls.begin();
 				iter != get_ctrls.end(); ++iter) {
@@ -2378,6 +2464,8 @@ set_vid_fmt_error:
 			ctrl.id = ctrl_str2id[*iter];
 			if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_MPEG)
 				mpeg_ctrls.push_back(ctrl);
+			else if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_CAMERA)
+				camera_ctrls.push_back(ctrl);
 			else
 				user_ctrls.push_back(ctrl);
 		}
@@ -2399,10 +2487,22 @@ set_vid_fmt_error:
 				printf("%s: %d\n", ctrl_id2str[ctrl.id].c_str(), ctrl.value);
 			}
 		}
+		if (camera_ctrls.size()) {
+			ctrls.ctrl_class = V4L2_CTRL_CLASS_CAMERA;
+			ctrls.count = camera_ctrls.size();
+			ctrls.controls = &camera_ctrls[0];
+			doioctl(fd, VIDIOC_G_EXT_CTRLS, &ctrls, "VIDIOC_G_EXT_CTRLS");
+			for (unsigned i = 0; i < camera_ctrls.size(); i++) {
+				struct v4l2_ext_control ctrl = camera_ctrls[i];
+
+				printf("%s: %d\n", ctrl_id2str[ctrl.id].c_str(), ctrl.value);
+			}
+		}
 	}
 
 	if (options[OptGetTuner]) {
 		struct v4l2_tuner vt;
+
 		memset(&vt, 0, sizeof(struct v4l2_tuner));
 		if (doioctl(fd, VIDIOC_G_TUNER, &vt, "VIDIOC_G_TUNER") == 0) {
 			printf("Tuner:\n");
@@ -2421,6 +2521,25 @@ set_vid_fmt_error:
 		}
 	}
 
+	if (options[OptGetModulator]) {
+		struct v4l2_modulator mt;
+
+		memset(&mt, 0, sizeof(struct v4l2_modulator));
+		if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) {
+			printf("Modulator:\n");
+			printf("\tName                 : %s\n", mt.name);
+			printf("\tCapabilities         : %s\n", tcap2s(mt.capability).c_str());
+			if (mt.capability & V4L2_TUNER_CAP_LOW)
+				printf("\tFrequency range      : %.1f MHz - %.1f MHz\n",
+				     mt.rangelow / 16000.0, mt.rangehigh / 16000.0);
+			else
+				printf("\tFrequency range      : %.1f MHz - %.1f MHz\n",
+				     mt.rangelow / 16.0, mt.rangehigh / 16.0);
+			printf("\tSubchannel modulation: %s\n",
+					txsubchans2s(mt.txsubchans).c_str());
+		}
+	}
+
 	if (options[OptLogStatus]) {
 		static char buf[40960];
 		int len;