[yavta PATCH 0/2] Data prefix writing fixes

[yavta PATCH 0/2] Data prefix writing fixes

[Sakari Ailus]

Hi Laurent,

Just a small fix (and a better name) for the --buffer-prefix option
implementation. The original patch didn't quite work as intended.

-- 
Kind regards,
Sakari

[yavta PATCH 1/2] Rename buffer prefix as data prefix

[Sakari Ailus]

Data prefix is a much better name for this (think of data_offset, for
instance).

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 yavta.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yavta.c b/yavta.c
index 0055c7d..3bec0be 100644
--- a/yavta.c
+++ b/yavta.c
@@ -81,7 +81,7 @@ struct device
 	void *pattern[VIDEO_MAX_PLANES];
 	unsigned int patternsize[VIDEO_MAX_PLANES];
 
-	bool write_buffer_prefix;
+	bool write_data_prefix;
 };
 
 static bool video_is_mplane(struct device *dev)
@@ -1556,7 +1556,7 @@ static void video_save_image(struct device *dev, struct v4l2_buffer *buf,
 		if (video_is_mplane(dev)) {
 			length = buf->m.planes[i].bytesused;
 
-			if (!dev->write_buffer_prefix) {
+			if (!dev->write_data_prefix) {
 				data += buf->m.planes[i].data_offset;
 				length -= buf->m.planes[i].data_offset;
 			}
@@ -1763,14 +1763,14 @@ static void usage(const char *argv0)
 #define OPT_BUFFER_SIZE		268
 #define OPT_PREMULTIPLIED	269
 #define OPT_QUEUE_LATE		270
-#define OPT_BUFFER_PREFIX	271
+#define OPT_DATA_PREFIX		271
 
 static struct option opts[] = {
 	{"buffer-size", 1, 0, OPT_BUFFER_SIZE},
 	{"buffer-type", 1, 0, 'B'},
-	{"buffer-prefix", 1, 0, OPT_BUFFER_PREFIX},
 	{"capture", 2, 0, 'c'},
 	{"check-overrun", 0, 0, 'C'},
+	{"data-prefix", 1, 0, OPT_DATA_PREFIX},
 	{"delay", 1, 0, 'd'},
 	{"enum-formats", 0, 0, OPT_ENUM_FORMATS},
 	{"enum-inputs", 0, 0, OPT_ENUM_INPUTS},
@@ -2032,8 +2032,8 @@ int main(int argc, char *argv[])
 		case OPT_USERPTR_OFFSET:
 			userptr_offset = atoi(optarg);
 			break;
-		case OPT_BUFFER_PREFIX:
-			dev.write_buffer_prefix = true;
+		case OPT_DATA_PREFIX:
+			dev.write_data_prefix = true;
 		default:
 			printf("Invalid option -%c\n", c);
 			printf("Run %s -h for help.\n", argv[0]);
-- 
2.1.0.231.g7484e3b

[yavta PATCH 2/2] Fix data offset config option parsing

[Sakari Ailus]

The option itself was considered correctly, but a small but crucial break
statement was missing. --data-offset option does not take an argument
either.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 yavta.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yavta.c b/yavta.c
index 3bec0be..7c21db2 100644
--- a/yavta.c
+++ b/yavta.c
@@ -1770,7 +1770,7 @@ static struct option opts[] = {
 	{"buffer-type", 1, 0, 'B'},
 	{"capture", 2, 0, 'c'},
 	{"check-overrun", 0, 0, 'C'},
-	{"data-prefix", 1, 0, OPT_DATA_PREFIX},
+	{"data-prefix", 0, 0, OPT_DATA_PREFIX},
 	{"delay", 1, 0, 'd'},
 	{"enum-formats", 0, 0, OPT_ENUM_FORMATS},
 	{"enum-inputs", 0, 0, OPT_ENUM_INPUTS},
@@ -2034,6 +2034,7 @@ int main(int argc, char *argv[])
 			break;
 		case OPT_DATA_PREFIX:
 			dev.write_data_prefix = true;
+			break;
 		default:
 			printf("Invalid option -%c\n", c);
 			printf("Run %s -h for help.\n", argv[0]);
-- 
2.1.0.231.g7484e3b

Re: [yavta PATCH 0/2] Data prefix writing fixes

[Laurent Pinchart]

Hi Sakari,

On Tuesday 06 January 2015 01:50:13 Sakari Ailus wrote:
> Hi Laurent,
> 
> Just a small fix (and a better name) for the --buffer-prefix option
> implementation. The original patch didn't quite work as intended.

Thank you for the patches. I've applied them.

-- 
Regards,

Laurent Pinchart