/*
* 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
#include <libavdevice/avdevice.h>
#include <libavformat/avformat.h>
+#include <libavutil/imgutils.h>
#include <libswscale/swscale.h>
#include <am7xxx.h>
*/
if (image_format == AM7XXX_IMAGE_FORMAT_NV12) {
fprintf(stdout, "using raw output format\n");
- output_codec_ctx->pix_fmt = PIX_FMT_NV12;
+ output_codec_ctx->pix_fmt = AV_PIX_FMT_NV12;
output_ctx->codec_ctx = output_codec_ctx;
output_ctx->raw_output = 1;
ret = 0;
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 */
* in particular they won't be 0, this is needed because they are used
* as divisor somewhere in the encoding process */
output_codec_ctx->qmin = output_codec_ctx->qmax = ((100 - (quality - 1)) * FF_QUALITY_SCALE) / 100;
- output_codec_ctx->mb_lmin = output_codec_ctx->lmin = output_codec_ctx->qmin * FF_QP2LAMBDA;
- output_codec_ctx->mb_lmax = output_codec_ctx->lmax = output_codec_ctx->qmax * FF_QP2LAMBDA;
- output_codec_ctx->flags |= CODEC_FLAG_QSCALE;
+ output_codec_ctx->mb_lmin = output_codec_ctx->qmin * FF_QP2LAMBDA;
+ output_codec_ctx->mb_lmax = output_codec_ctx->qmax * FF_QP2LAMBDA;
+ output_codec_ctx->flags |= AV_CODEC_FLAG_QSCALE;
output_codec_ctx->global_quality = output_codec_ctx->qmin * FF_QP2LAMBDA;
/* find the encoder */
unsigned int upscale,
unsigned int quality,
am7xxx_image_format image_format,
- am7xxx_device *dev)
+ am7xxx_device *dev,
+ int dump_frame)
{
struct video_input_ctx input_ctx;
struct video_output_ctx output_ctx;
int out_buf_size;
uint8_t *out_buf;
int out_picture_size;
+ uint8_t *out_picture;
struct SwsContext *sw_scale_ctx;
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;
goto cleanup_picture_raw;
}
+ picture_scaled->format = (output_ctx.codec_ctx)->pix_fmt;
+ picture_scaled->width = (output_ctx.codec_ctx)->width;
+ picture_scaled->height = (output_ctx.codec_ctx)->height;
/* calculate the bytes needed for the output image and create buffer for the output image */
- out_buf_size = avpicture_get_size((output_ctx.codec_ctx)->pix_fmt,
- (output_ctx.codec_ctx)->width,
- (output_ctx.codec_ctx)->height);
+ out_buf_size = av_image_get_buffer_size((output_ctx.codec_ctx)->pix_fmt,
+ (output_ctx.codec_ctx)->width,
+ (output_ctx.codec_ctx)->height,
+ 1);
out_buf = av_malloc(out_buf_size * sizeof(uint8_t));
if (out_buf == NULL) {
fprintf(stderr, "cannot allocate output data buffer!\n");
}
/* assign appropriate parts of buffer to image planes in picture_scaled */
- avpicture_fill((AVPicture *)picture_scaled,
- out_buf,
- (output_ctx.codec_ctx)->pix_fmt,
- (output_ctx.codec_ctx)->width,
- (output_ctx.codec_ctx)->height);
+ av_image_fill_arrays(picture_scaled->data,
+ picture_scaled->linesize,
+ out_buf,
+ (output_ctx.codec_ctx)->pix_fmt,
+ (output_ctx.codec_ctx)->width,
+ (output_ctx.codec_ctx)->height,
+ 1);
sw_scale_ctx = sws_getCachedContext(NULL,
(input_ctx.codec_ctx)->width,
goto cleanup_out_buf;
}
+ got_packet = 0;
while (run) {
/* read packet */
ret = av_read_frame(input_ctx.format_ctx, &in_packet);
goto end_while;
}
- /* if we get the complete frame */
+ /* if we got the complete frame */
if (got_picture) {
- /* convert it to YUV */
+ /*
+ * Rescaling the picture also changes its pixel format
+ * to the raw format supported by the projector if
+ * this was set in video_output_init()
+ */
sws_scale(sw_scale_ctx,
- (const uint8_t * const*)picture_raw->data,
+ (const uint8_t * const *)picture_raw->data,
picture_raw->linesize,
0,
(input_ctx.codec_ctx)->height,
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
- char filename[NAME_MAX];
- FILE *file;
- if (!output_ctx.raw_output)
- snprintf(filename, NAME_MAX, "out_q%03d.jpg", quality);
- else
- snprintf(filename, NAME_MAX, "out.raw");
- file = fopen(filename, "wb");
- fwrite(out_buf, 1, out_picture_size, file);
- fclose(file);
+ if (dump_frame) {
+ char filename[NAME_MAX];
+ FILE *file;
+ if (!output_ctx.raw_output)
+ snprintf(filename, NAME_MAX, "out_q%03d.jpg", quality);
+ else
+ snprintf(filename, NAME_MAX, "out.raw");
+ file = fopen(filename, "wb");
+ fwrite(out_picture, 1, out_picture_size, file);
+ fclose(file);
+ }
+#else
+ (void) dump_frame;
#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");
+ perror("am7xxx_send_image_async");
run = 0;
goto end_while;
}
}
end_while:
- av_free_packet(&in_packet);
+ if (!output_ctx.raw_output && got_packet)
+ av_packet_unref(&out_packet);
+ av_packet_unref(&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,
static char *get_x_screen_size(const char *input_path)
{
(void) input_path;
- fprintf(stderr, "%s: fallback implementation\n", __func__);
+ fprintf(stderr, "%s: fallback implementation, assuming a vga screen\n", __func__);
return strdup("vga");
}
#endif
{
struct sigaction new_action;
struct sigaction old_action;
- int ret = 0;
+ int ret;
new_action.sa_handler = signal_handler;
sigemptyset(&new_action.sa_mask);
printf("usage: %s [OPTIONS]\n\n", name);
printf("OPTIONS:\n");
printf("\t-d <index>\t\tthe device index (default is 0)\n");
+#ifdef DEBUG
+ printf("\t-D \t\t\tdump the last frame to a file (only active in DEBUG mode)\n");
+#endif
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");
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 (test)\n",
- AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
+ 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 quality = 95;
int log_level = AM7XXX_LOG_INFO;
int device_index = 0;
- am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
- am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL;
+ int power_mode = AM7XXX_POWER_LOW;
+ int zoom = AM7XXX_ZOOM_ORIGINAL;
int format = AM7XXX_IMAGE_FORMAT_JPEG;
am7xxx_context *ctx;
am7xxx_device *dev;
+ int dump_frame = 0;
- while ((opt = getopt(argc, argv, "d:f:i:o:s:uF:q:l:p:z:h")) != -1) {
+ while ((opt = getopt(argc, argv, "d:Df:i:o:s:uF:q:l:p:z:h")) != -1) {
switch (opt) {
case 'd':
device_index = atoi(optarg);
goto out;
}
break;
+ case 'D':
+ dump_frame = 1;
+#ifndef DEBUG
+ fprintf(stderr, "Warning: the -D option is only active in DEBUG mode.\n");
+#endif
+ break;
case 'f':
input_format_string = strdup(optarg);
break;
* 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) {
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 zoom mode value, must be between %d and %d\n",
- AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
- exit(EXIT_FAILURE);
+ AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE);
+ ret = -EINVAL;
+ goto out;
}
break;
case 'h':
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;
}
upscale,
quality,
format,
- dev);
+ dev,
+ dump_frame);
if (ret < 0) {
fprintf(stderr, "am7xxx_play failed\n");
goto cleanup;
projects / libam7xxx.git / blobdiff