diff options
author | Lukasz Marek <lukasz.m.luki@gmail.com> | 2014-01-19 19:11:09 +0400 |
---|---|---|
committer | Lukasz Marek <lukasz.m.luki@gmail.com> | 2014-01-27 18:18:17 +0400 |
commit | 7151411b9cf74ce43ab56f0ff8577b8031b997d9 (patch) | |
tree | be9ee49037847eb427cc8d36d78c96b1bcdc3548 /libavdevice | |
parent | bceeccc648baf94a02b7b2c53e44bf77a47773ef (diff) |
lavd: add avdevice_app_to_dev_control_message API
New API allows to send messages from application to devices.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Diffstat (limited to 'libavdevice')
-rw-r--r-- | libavdevice/avdevice.c | 8 | ||||
-rw-r--r-- | libavdevice/avdevice.h | 52 | ||||
-rw-r--r-- | libavdevice/version.h | 4 |
3 files changed, 62 insertions, 2 deletions
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index b9b18f2576..c232bbdc8f 100644 --- a/libavdevice/avdevice.c +++ b/libavdevice/avdevice.c @@ -36,3 +36,11 @@ const char * avdevice_license(void) #define LICENSE_PREFIX "libavdevice license: " return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1; } + +int avdevice_app_to_dev_control_message(struct AVFormatContext *s, enum AVAppToDevMessageType type, + void *data, size_t data_size) +{ + if (!s->oformat || !s->oformat->control_message) + return AVERROR(ENOSYS); + return s->oformat->control_message(s, type, data, data_size); +} diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 93a044f270..1bc91e4d0f 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -66,4 +66,56 @@ const char *avdevice_license(void); */ void avdevice_register_all(void); +typedef struct AVDeviceRect { + int x; /**< x coordinate of top left corner */ + int y; /**< y coordinate of top left corner */ + int width; /**< width */ + int height; /**< height */ +} AVDeviceRect; + +/** + * Message types used by avdevice_app_to_dev_control_message(). + */ +enum AVAppToDevMessageType { + /** + * Dummy message. + */ + AV_APP_TO_DEV_NONE = MKBETAG('N','O','N','E'), + + /** + * Window size change message. + * + * Message is sent to the device every time the application changes the size + * of the window device renders to. + * Message should also be sent right after window is created. + * + * data: AVDeviceRect: new window size. + */ + AV_APP_TO_DEV_WINDOW_SIZE = MKBETAG('G','E','O','M'), + + /** + * Repaint request message. + * + * Message is sent to the device when window have to be rapainted. + * + * data: AVDeviceRect: area required to be repainted. + * NULL: whole area is required to be repainted. + */ + AV_APP_TO_DEV_WINDOW_REPAINT = MKBETAG('R','E','P','A') +}; + +/** + * Send control message from application to device. + * + * @param s device context. + * @param type message type. + * @param data message data. Exact type depends on message type. + * @param data_size size of message data. + * @return >= 0 on success, negative on error. + * AVERROR(ENOSYS) when device doesn't implement handler of the message. + */ +int avdevice_app_to_dev_control_message(struct AVFormatContext *s, + enum AVAppToDevMessageType type, + void *data, size_t data_size); + #endif /* AVDEVICE_AVDEVICE_H */ diff --git a/libavdevice/version.h b/libavdevice/version.h index d569faefc5..bfd4a7089d 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVDEVICE_VERSION_MAJOR 55 -#define LIBAVDEVICE_VERSION_MINOR 5 -#define LIBAVDEVICE_VERSION_MICRO 102 +#define LIBAVDEVICE_VERSION_MINOR 6 +#define LIBAVDEVICE_VERSION_MICRO 100 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ |