/*
* am7xxx-play - play stuff on an am7xxx device (e.g. Acer C110, PicoPix 1020)
*
- * Copyright (C) 2012 Antonio Ospite <ospite@studenti.unina.it>
+ * Copyright (C) 2012-2014 Antonio Ospite <ao2@ao2.it>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
goto out;
}
- output_codec_ctx->pix_fmt = PIX_FMT_YUVJ420P;
- output_codec_ctx->codec_id = CODEC_ID_MJPEG;
+ output_codec_ctx->pix_fmt = AV_PIX_FMT_YUVJ420P;
+ output_codec_ctx->codec_id = AV_CODEC_ID_MJPEG;
output_codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
/* Set quality and other VBR settings */
int out_buf_size;
uint8_t *out_buf;
int out_picture_size;
+ uint8_t *out_picture;
struct SwsContext *sw_scale_ctx;
- AVPacket packet;
+ AVPacket in_packet;
+ AVPacket out_packet;
int got_picture;
- int ret = 0;
+ int got_packet;
+ int ret;
ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);
if (ret < 0) {
}
/* allocate an input frame */
- picture_raw = avcodec_alloc_frame();
+ picture_raw = av_frame_alloc();
if (picture_raw == NULL) {
fprintf(stderr, "cannot allocate the raw picture frame!\n");
ret = -ENOMEM;
}
/* allocate output frame */
- picture_scaled = avcodec_alloc_frame();
+ picture_scaled = av_frame_alloc();
if (picture_scaled == NULL) {
fprintf(stderr, "cannot allocate the scaled picture!\n");
ret = -ENOMEM;
while (run) {
/* read packet */
- ret = av_read_frame(input_ctx.format_ctx, &packet);
+ ret = av_read_frame(input_ctx.format_ctx, &in_packet);
if (ret < 0) {
if (ret == (int)AVERROR_EOF || input_ctx.format_ctx->pb->eof_reached)
ret = 0;
goto end_while;
}
- if (packet.stream_index != input_ctx.video_stream_index) {
+ if (in_packet.stream_index != input_ctx.video_stream_index) {
/* that is more or less a "continue", but there is
* still the packet to free */
goto end_while;
/* decode */
got_picture = 0;
- ret = avcodec_decode_video2(input_ctx.codec_ctx, picture_raw, &got_picture, &packet);
+ ret = avcodec_decode_video2(input_ctx.codec_ctx, picture_raw, &got_picture, &in_packet);
if (ret < 0) {
fprintf(stderr, "cannot decode video\n");
run = 0;
picture_scaled->linesize);
if (output_ctx.raw_output) {
+ out_picture = out_buf;
out_picture_size = out_buf_size;
} else {
picture_scaled->quality = (output_ctx.codec_ctx)->global_quality;
- /* TODO: switch to avcodec_encode_video2() eventually */
- out_picture_size = avcodec_encode_video(output_ctx.codec_ctx,
- out_buf,
- out_buf_size,
- picture_scaled);
- if (out_picture_size < 0) {
+ av_init_packet(&out_packet);
+ out_packet.data = NULL;
+ out_packet.size = 0;
+ got_packet = 0;
+ ret = avcodec_encode_video2(output_ctx.codec_ctx,
+ &out_packet,
+ picture_scaled,
+ &got_packet);
+ if (ret < 0 || !got_packet) {
fprintf(stderr, "cannot encode video\n");
- ret = out_picture_size;
run = 0;
goto end_while;
}
+
+ out_picture = out_packet.data;
+ out_picture_size = out_packet.size;
}
#ifdef DEBUG
else
snprintf(filename, NAME_MAX, "out.raw");
file = fopen(filename, "wb");
- fwrite(out_buf, 1, out_picture_size, file);
+ fwrite(out_picture, 1, out_picture_size, file);
fclose(file);
#endif
- ret = am7xxx_send_image(dev,
- image_format,
- (output_ctx.codec_ctx)->width,
- (output_ctx.codec_ctx)->height,
- out_buf,
- out_picture_size);
+ ret = am7xxx_send_image_async(dev,
+ image_format,
+ (output_ctx.codec_ctx)->width,
+ (output_ctx.codec_ctx)->height,
+ out_picture,
+ out_picture_size);
if (ret < 0) {
perror("am7xxx_send_image");
run = 0;
}
}
end_while:
- av_free_packet(&packet);
+ if (!output_ctx.raw_output && got_packet)
+ av_free_packet(&out_packet);
+ av_free_packet(&in_packet);
}
sws_freeContext(sw_scale_ctx);
cleanup_out_buf:
av_free(out_buf);
cleanup_picture_scaled:
- av_free(picture_scaled);
+ av_frame_free(&picture_scaled);
cleanup_picture_raw:
- av_free(picture_raw);
+ av_frame_free(&picture_raw);
cleanup_output:
/* av_free is needed as well,
run = 0;
}
+#ifdef HAVE_SIGACTION
static int set_signal_handler(void (*signal_handler)(int))
{
struct sigaction new_action;
struct sigaction old_action;
- int ret = 0;
+ int ret;
new_action.sa_handler = signal_handler;
sigemptyset(&new_action.sa_mask);
out:
return ret;
}
+#else
+static int set_signal_handler(void (*signal_handler)(int))
+{
+ (void)signal_handler;
+ fprintf(stderr, "set_signal_handler() not implemented, sigaction not available\n");
+ return 0;
+}
+#endif
+
static void usage(char *name)
{
printf("usage: %s [OPTIONS]\n\n", name);
printf("OPTIONS:\n");
+ printf("\t-d <index>\t\tthe device index (default is 0)\n");
printf("\t-f <input format>\tthe input device format\n");
printf("\t-i <input path>\t\tthe input path\n");
printf("\t-o <options>\t\ta comma separated list of input format options\n");
printf("\t\t\t\t\t2 - NV12\n");
printf("\t-q <quality>\t\tquality of jpeg sent to the device, between 1 and 100\n");
printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\n");
- printf("\t-p <power level>\tpower level of device, between %x (off) and %x (maximum)\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
- printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n\t\t\t\t\t the slave connector to be plugged in.\n");
+ printf("\t-p <power mode>\t\tthe power mode of device, between %d (off) and %d (turbo)\n",
+ AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+ printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n");
+ printf("\t\t\t\t the slave connector to be plugged in.\n");
+ printf("\t-z <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (tele)\n",
+ AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);
printf("\t-h \t\t\tthis help message\n");
printf("\n\nEXAMPLES OF USE:\n");
printf("\t%s -f x11grab -i :0.0 -o video_size=800x480\n", name);
unsigned int upscale = 0;
unsigned int quality = 95;
int log_level = AM7XXX_LOG_INFO;
- am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
+ int device_index = 0;
+ int power_mode = AM7XXX_POWER_LOW;
+ int zoom = AM7XXX_ZOOM_ORIGINAL;
int format = AM7XXX_IMAGE_FORMAT_JPEG;
am7xxx_context *ctx;
am7xxx_device *dev;
- while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:p:h")) != -1) {
+ while ((opt = getopt(argc, argv, "d:f:i:o:s:uF:q:l:p:z:h")) != -1) {
switch (opt) {
+ case 'd':
+ device_index = atoi(optarg);
+ if (device_index < 0) {
+ fprintf(stderr, "Unsupported device index\n");
+ ret = -EINVAL;
+ goto out;
+ }
+ break;
case 'f':
input_format_string = strdup(optarg);
break;
input_path = strdup(optarg);
break;
case 'o':
+#ifdef HAVE_STRTOK_R
/*
* parse suboptions, the expected format is something
* like:
* draw_mouse=1,framerate=100,video_size=800x480
*/
subopts = subopts_saved = strdup(optarg);
- while((subopt = strtok_r(subopts, ",", &subopts))) {
+ while ((subopt = strtok_r(subopts, ",", &subopts))) {
char *subopt_name = strtok_r(subopt, "=", &subopt);
char *subopt_value = strtok_r(NULL, "", &subopt);
if (subopt_value == NULL) {
av_dict_set(&options, subopt_name, subopt_value, 0);
}
free(subopts_saved);
+#else
+ fprintf(stderr, "Option '-o' not implemented\n");
+#endif
break;
case 's':
rescale_method = atoi(optarg);
case AM7XXX_POWER_MIDDLE:
case AM7XXX_POWER_HIGH:
case AM7XXX_POWER_TURBO:
- fprintf(stdout, "Power mode: %x\n", power_mode);
+ fprintf(stdout, "Power mode: %d\n", power_mode);
+ break;
+ default:
+ fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
+ AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+ ret = -EINVAL;
+ goto out;
+ }
+ break;
+ case 'z':
+ zoom = atoi(optarg);
+ switch(zoom) {
+ case AM7XXX_ZOOM_ORIGINAL:
+ case AM7XXX_ZOOM_H:
+ case AM7XXX_ZOOM_H_V:
+ case AM7XXX_ZOOM_TEST:
+ case AM7XXX_ZOOM_TELE:
+ fprintf(stdout, "Zoom: %d\n", zoom);
break;
default:
- fprintf(stderr, "Invalid power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+ fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
+ AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);
ret = -EINVAL;
goto out;
}
usage(argv[0]);
ret = 0;
goto out;
- break;
default: /* '?' */
usage(argv[0]);
ret = -EINVAL;
}
if (input_path == NULL) {
- fprintf(stderr, "The -i option must always be passed\n");
+ fprintf(stderr, "The -i option must always be passed\n\n");
+ usage(argv[0]);
ret = -EINVAL;
goto out;
}
am7xxx_set_log_level(ctx, log_level);
- ret = am7xxx_open_device(ctx, &dev, 0);
+ ret = am7xxx_open_device(ctx, &dev, device_index);
if (ret < 0) {
perror("am7xxx_open_device");
goto cleanup;
}
+ ret = am7xxx_set_zoom_mode(dev, zoom);
+ if (ret < 0) {
+ perror("am7xxx_set_zoom_mode");
+ goto cleanup;
+ }
+
ret = am7xxx_set_power_mode(dev, power_mode);
if (ret < 0) {
perror("am7xxx_set_power_mode");
goto cleanup;
}
+ /* When setting AM7XXX_ZOOM_TEST don't display the actual image */
+ if (zoom == AM7XXX_ZOOM_TEST)
+ goto cleanup;
+
ret = am7xxx_play(input_format_string,
&options,
input_path,
projects / libam7xxx.git / blobdiff