From: Antonio Ospite Date: Wed, 21 Mar 2012 10:45:36 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/rettichschnidi' into unstable X-Git-Tag: v0.1.0~1^2~9 X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/f02525e0c94885e18a7cff407d87184db6b9c0ff?hp=b19775ece86f40df15ffadcb358c8896bc847482 Merge remote-tracking branch 'origin/rettichschnidi' into unstable Conflicts: examples/am7xxx-play.c --- diff --git a/README.asciidoc b/README.asciidoc index 0d878bc..133c13b 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -46,7 +46,7 @@ manually with the command: Examples of devices based on AM7XXX are: - - Acer Series C pico projectors (C20 C110 C112): + - Acer Series C pico projectors (C20, C110, C112): * http://www.acer.it/ac/it/IT/content/models/projector-c * http://support.acer.com/product/default.aspx?modelId=3888 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index c70d121..234e666 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -28,7 +28,7 @@ endif() add_executable(am7xxx-play am7xxx-play.c) target_link_libraries(am7xxx-play am7xxx - ${FFMPEG_LIBAVDEVICE_LIBRARIES} + ${FFMPEG_LIBRARIES} ${FFMPEG_LIBSWSCALE_LIBRARIES} ${LIBXCB_LIBRARIES}) install(TARGETS am7xxx-play diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c index 56fd8b2..5aa53ae 100644 --- a/examples/am7xxx-play.c +++ b/examples/am7xxx-play.c @@ -561,14 +561,16 @@ static void usage(char *name) printf("\t-o \t\ta comma separated list of input format options\n"); printf("\t\t\t\tEXAMPLE:\n"); printf("\t\t\t\t\t-o draw_mouse=1,framerate=100,video_size=800x480\n"); - printf("\t-s \t\tthe rescaling method (see swscale.h)\n"); + printf("\t-s \tthe rescaling method (see swscale.h)\n"); printf("\t-u \t\t\tupscale the image if smaller than the display dimensions\n"); printf("\t-F \t\tthe image format to use (default is JPEG)\n"); printf("\t\t\t\tSUPPORTED FORMATS:\n"); printf("\t\t\t\t\t1 - JPEG\n"); printf("\t\t\t\t\t2 - NV12\n"); - printf("\t-q \t\t\tquality of jpeg sent to the device, between 1 and 100\n"); + printf("\t-q \t\tquality of jpeg sent to the device, between 1 and 100\n"); printf("\t-l \t\tthe verbosity level of libam7xxx output (0-5)\n"); + printf("\t-p \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-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); @@ -591,11 +593,12 @@ int main(int argc, char *argv[]) unsigned int upscale = 0; unsigned int quality = 95; int log_level = AM7XXX_LOG_INFO; + am7xxx_power_mode power_mode = AM7XXX_POWER_LOW; int format = AM7XXX_IMAGE_FORMAT_JPEG; am7xxx_context *ctx; am7xxx_device *dev; - while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:h")) != -1) { + while ((opt = getopt(argc, argv, "f:i:o:s:uF:q:l:hp:")) != -1) { switch (opt) { case 'f': input_format_string = strdup(optarg); @@ -623,7 +626,7 @@ int main(int argc, char *argv[]) break; case 's': rescale_method = atoi(optarg); - switch(format) { + switch(rescale_method) { case SWS_FAST_BILINEAR: case SWS_BILINEAR: case SWS_BICUBIC: @@ -639,7 +642,7 @@ int main(int argc, char *argv[]) default: fprintf(stderr, "Unsupported rescale method\n"); ret = -EINVAL; - goto out;; + goto out; } break; case 'u': @@ -657,7 +660,7 @@ int main(int argc, char *argv[]) default: fprintf(stderr, "Unsupported format\n"); ret = -EINVAL; - goto out;; + goto out; } break; case 'q': @@ -665,7 +668,7 @@ int main(int argc, char *argv[]) if (quality < 1 || quality > 100) { fprintf(stderr, "Invalid quality value, must be between 1 and 100\n"); ret = -EINVAL; - goto out;; + goto out; } break; case 'l': @@ -680,6 +683,22 @@ int main(int argc, char *argv[]) ret = 0; goto out; break; + case 'p': + power_mode = atoi(optarg); + switch(power_mode) { + case AM7XXX_POWER_OFF: + case AM7XXX_POWER_LOW: + case AM7XXX_POWER_MIDDLE: + case AM7XXX_POWER_HIGH: + case AM7XXX_POWER_TURBO: + fprintf(stdout, "Power mode: %x\n", power_mode); + break; + default: + fprintf(stderr, "Invalid power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO); + ret = -EINVAL; + goto out; + } + break; default: /* '?' */ usage(argv[0]); ret = -EINVAL; @@ -734,7 +753,7 @@ int main(int argc, char *argv[]) goto cleanup; } - ret = am7xxx_set_power_mode(dev, AM7XXX_POWER_LOW); + ret = am7xxx_set_power_mode(dev, power_mode); if (ret < 0) { perror("am7xxx_set_power_mode"); goto cleanup; diff --git a/src/am7xxx.c b/src/am7xxx.c index a8bcc49..6574100 100644 --- a/src/am7xxx.c +++ b/src/am7xxx.c @@ -69,7 +69,7 @@ static struct am7xxx_usb_device_descriptor supported_devices[] = { }; /* The header size on the wire is known to be always 24 bytes, regardless of - * the memory configuration enforced by different architechtures or compilers + * the memory configuration enforced by different architectures or compilers * for struct am7xxx_header */ #define AM7XXX_HEADER_WIRE_SIZE 24 @@ -244,6 +244,7 @@ static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h) (void)ctx; (void)h; } + static void trace_dump_buffer(am7xxx_context *ctx, const char *message, uint8_t *buffer, unsigned int len) { diff --git a/src/am7xxx.h b/src/am7xxx.h index df305e5..e67bcb6 100644 --- a/src/am7xxx.h +++ b/src/am7xxx.h @@ -99,9 +99,9 @@ typedef enum { typedef enum { AM7XXX_POWER_OFF = 0, /**< Display is powered off, no image shown. */ AM7XXX_POWER_LOW = 1, /**< Low power consumption but also low brightness. */ - AM7XXX_POWER_MIDDLE = 2, /**< Middle level of brightness. */ + AM7XXX_POWER_MIDDLE = 2, /**< Middle level of brightness. This and upper modes need both the Master and Slave USB connectors plugged. */ AM7XXX_POWER_HIGH = 3, /**< More brightness, but more power consumption. */ - AM7XXX_POWER_TURBO = 4, /**< Max brightness and power consumprion. This may need both the Master and Slave USB connectors plugged. */ + AM7XXX_POWER_TURBO = 4, /**< Max brightness and power consumption. */ } am7xxx_power_mode; /** @@ -186,7 +186,7 @@ int am7xxx_get_device_info(am7xxx_device *dev, * that the original image aspect ratio is preserved. * * @param[in] dev A pointer to the structure representing the device to get info of - * @param[in] upscale Whether to calculate scaled dimensions for images smaller than the native dimesions + * @param[in] upscale Whether to calculate scaled dimensions for images smaller than the native dimensions * @param[in] original_width The width of the original image * @param[in] original_height The height of the original image * @param[out] scaled_width The width the rescaled image should have