From 41e4c6d8c5fb621341f0c197f9ec32d4002d600d Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Fri, 2 May 2014 00:06:38 +0200 Subject: [PATCH 1/6] lavd/opengl_enc: use flag to mark inited context Signed-off-by: Lukasz Marek --- libavdevice/opengl_enc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 5f9748dd6f..35c048e734 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -178,6 +178,7 @@ typedef struct OpenGLContext { #endif FFOpenGLFunctions glprocs; + int inited; ///< Set to 1 when write_header was successfully called. uint8_t background[4]; ///< Background color int no_window; ///< 0 for create default window char *window_title; ///< Title of the window @@ -309,8 +310,7 @@ static int opengl_resize(AVFormatContext *h, int width, int height) OpenGLContext *opengl = h->priv_data; opengl->window_width = width; opengl->window_height = height; - /* max_viewport_width == 0 means write_header was not called yet. */ - if (opengl->max_viewport_width) { + if (opengl->inited) { if (opengl->no_window && (ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER, NULL , 0)) < 0) { av_log(opengl, AV_LOG_ERROR, "Application failed to prepare window buffer.\n"); @@ -1110,6 +1110,8 @@ static av_cold int opengl_write_header(AVFormatContext *h) ret = AVERROR_EXTERNAL; OPENGL_ERROR_CHECK(opengl); + + opengl->inited = 1; return 0; fail: From 45601854b148ef2ed358d3130ed7345018c79378 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Fri, 2 May 2014 00:16:25 +0200 Subject: [PATCH 2/6] lavd/opengl_enc: add window size param Signed-off-by: Lukasz Marek --- doc/outdevs.texi | 4 ++++ libavdevice/opengl_enc.c | 15 +++++++++++++-- libavdevice/version.h | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/outdevs.texi b/doc/outdevs.texi index a1d89eb801..1104133c61 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -237,6 +237,10 @@ Application must provide OpenGL context and both @code{window_size_cb} and @code @item window_title Set the SDL window title, if not specified default to the filename specified for the output device. Ignored when @option{no_window} is set. +@item window_size +Set preferred window size, can be a string of the form widthxheight or a video size abbreviation. +If not specified it defaults to the size of the input video, downscaled according to the aspect ratio. +Mostly usable when @option{no_window} is not set. @end table diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 35c048e734..cbd0b3a12a 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -407,7 +407,8 @@ static int av_cold opengl_sdl_create_window(AVFormatContext *h) av_log(opengl, AV_LOG_ERROR, "Unable to initialize SDL: %s\n", SDL_GetError()); return AVERROR_EXTERNAL; } - if ((ret = opengl_sdl_recreate_window(opengl, opengl->width, opengl->height)) < 0) + if ((ret = opengl_sdl_recreate_window(opengl, opengl->window_width, + opengl->window_height)) < 0) return ret; av_log(opengl, AV_LOG_INFO, "SDL driver: '%s'.\n", SDL_VideoDriverName(buffer, sizeof(buffer))); message.width = opengl->surface->w; @@ -951,7 +952,12 @@ static int opengl_create_window(AVFormatContext *h) return AVERROR(ENOSYS); #endif } else { - if ((ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_CREATE_WINDOW_BUFFER, NULL , 0)) < 0) { + AVDeviceRect message; + message.x = message.y = 0; + message.width = opengl->window_width; + message.height = opengl->window_height; + if ((ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_CREATE_WINDOW_BUFFER, + &message , sizeof(message))) < 0) { av_log(opengl, AV_LOG_ERROR, "Application failed to create window buffer.\n"); return ret; } @@ -1067,6 +1073,10 @@ static av_cold int opengl_write_header(AVFormatContext *h) opengl->width = st->codec->width; opengl->height = st->codec->height; opengl->pix_fmt = st->codec->pix_fmt; + if (!opengl->window_width) + opengl->window_width = opengl->width; + if (!opengl->window_height) + opengl->window_height = opengl->height; if (!opengl->window_title && !opengl->no_window) opengl->window_title = av_strdup(h->filename); @@ -1268,6 +1278,7 @@ static const AVOption options[] = { { "background", "set background color", OFFSET(background), AV_OPT_TYPE_COLOR, {.str = "black"}, CHAR_MIN, CHAR_MAX, ENC }, { "no_window", "disable default window", OFFSET(no_window), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, ENC }, { "window_title", "set window title", OFFSET(window_title), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, ENC }, + { "window_size", "set window size", OFFSET(window_width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, ENC }, { NULL } }; diff --git a/libavdevice/version.h b/libavdevice/version.h index 4267872042..163a4c63c2 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -29,7 +29,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 55 #define LIBAVDEVICE_VERSION_MINOR 13 -#define LIBAVDEVICE_VERSION_MICRO 100 +#define LIBAVDEVICE_VERSION_MICRO 101 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ From db4b03146cc3a355b000c4a8444efac3ee5b33f2 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Fri, 2 May 2014 00:28:27 +0200 Subject: [PATCH 3/6] lavd/opengl_enc: fix window size correction code Signed-off-by: Lukasz Marek --- libavdevice/opengl_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index cbd0b3a12a..28a01181a0 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -872,8 +872,8 @@ static av_cold int opengl_prepare_vertex(AVFormatContext *s) int tex_w, tex_h; if (opengl->window_width > opengl->max_viewport_width || opengl->window_height > opengl->max_viewport_height) { - opengl->window_width = FFMAX(opengl->window_width, opengl->max_viewport_width); - opengl->window_height = FFMAX(opengl->window_height, opengl->max_viewport_height); + opengl->window_width = FFMIN(opengl->window_width, opengl->max_viewport_width); + opengl->window_height = FFMIN(opengl->window_height, opengl->max_viewport_height); av_log(opengl, AV_LOG_WARNING, "Too big viewport requested, limited to %dx%d", opengl->window_width, opengl->window_height); } glViewport(0, 0, opengl->window_width, opengl->window_height); From ba52fb11dc6305ec2ded10ad172ebb28e6583038 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Tue, 29 Apr 2014 23:57:24 +0200 Subject: [PATCH 4/6] lavu/opt: add av_opt_set_dict2() function Existing av_opt_set_dict doesn't accept flags. It doesn't allow to pass options to nested structs. New function alllows that. Signed-off-by: Lukasz Marek --- doc/APIchanges | 3 +++ libavutil/opt.c | 9 +++++++-- libavutil/opt.h | 18 ++++++++++++++++++ libavutil/version.h | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 7e3c592d75..b4fa99f2d4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-05-xx - xxxxxxx - lavu 52.81.0 - opt.h + Add av_opt_set_dict2() function. + 2014-04-xx - xxxxxxx - lavc 55.50.3 - avcodec.h Deprecate CODEC_FLAG_MV0. It is replaced by the flag "mv0" in the "mpv_flags" private option of the mpegvideo encoders. diff --git a/libavutil/opt.c b/libavutil/opt.c index 33ebe52749..199eadbc05 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1415,7 +1415,7 @@ void av_opt_free(void *obj) av_freep((uint8_t *)obj + o->offset); } -int av_opt_set_dict(void *obj, AVDictionary **options) +int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) { AVDictionaryEntry *t = NULL; AVDictionary *tmp = NULL; @@ -1425,7 +1425,7 @@ int av_opt_set_dict(void *obj, AVDictionary **options) return 0; while ((t = av_dict_get(*options, "", t, AV_DICT_IGNORE_SUFFIX))) { - ret = av_opt_set(obj, t->key, t->value, 0); + ret = av_opt_set(obj, t->key, t->value, search_flags); if (ret == AVERROR_OPTION_NOT_FOUND) av_dict_set(&tmp, t->key, t->value, 0); else if (ret < 0) { @@ -1439,6 +1439,11 @@ int av_opt_set_dict(void *obj, AVDictionary **options) return ret; } +int av_opt_set_dict(void *obj, AVDictionary **options) +{ + return av_opt_set_dict2(obj, options, 0); +} + const AVOption *av_opt_find(void *obj, const char *name, const char *unit, int opt_flags, int search_flags) { diff --git a/libavutil/opt.h b/libavutil/opt.h index 6a1ae4354a..1e1dd69b30 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -541,6 +541,24 @@ int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name) */ int av_opt_set_dict(void *obj, struct AVDictionary **options); + +/** + * Set all the options from a given dictionary on an object. + * + * @param obj a struct whose first element is a pointer to AVClass + * @param options options to process. This dictionary will be freed and replaced + * by a new one containing all options not found in obj. + * Of course this new dictionary needs to be freed by caller + * with av_dict_free(). + * @param search_flags A combination of AV_OPT_SEARCH_*. + * + * @return 0 on success, a negative AVERROR if some option was found in obj, + * but could not be set. + * + * @see av_dict_copy() + */ +int av_opt_set_dict2(void *obj, struct AVDictionary **options, int search_flags); + /** * Extract a key-value pair from the beginning of a string. * diff --git a/libavutil/version.h b/libavutil/version.h index a17cb506de..3cb5b66666 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 80 +#define LIBAVUTIL_VERSION_MINOR 81 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From 330d547ef3cceb0a90b4db3bb0ea58d07dabe4d4 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Wed, 30 Apr 2014 00:00:44 +0200 Subject: [PATCH 5/6] lavf/mux: pass options to nested structs of priv data This commit allows to benefit from implementing child_next callback for muxers' AVClasses. Without that, options cannot be set in nested structs. Signed-off-by: Lukasz Marek --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 6847ec342b..7b4f7c77d3 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -334,7 +334,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) if (of->priv_class) { *(const AVClass **)s->priv_data = of->priv_class; av_opt_set_defaults(s->priv_data); - if ((ret = av_opt_set_dict(s->priv_data, &tmp)) < 0) + if ((ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) goto fail; } } From fa4f7b17bc120effb82874538d895da1c92ba886 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Fri, 2 May 2014 17:52:57 +0200 Subject: [PATCH 6/6] lavd/xv: reident after previous commits Signed-off-by: Lukasz Marek --- libavdevice/xv.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavdevice/xv.c b/libavdevice/xv.c index 7353310892..d1f8907d99 100644 --- a/libavdevice/xv.c +++ b/libavdevice/xv.c @@ -145,19 +145,18 @@ static int xv_write_header(AVFormatContext *s) } } if (!xv->window_id) { - //TODO: reident - xv->window = XCreateSimpleWindow(xv->display, DefaultRootWindow(xv->display), - xv->window_x, xv->window_y, - xv->window_width, xv->window_height, - 0, 0, 0); - if (!xv->window_title) { - if (!(xv->window_title = av_strdup(s->filename))) { - ret = AVERROR(ENOMEM); - goto fail; + xv->window = XCreateSimpleWindow(xv->display, DefaultRootWindow(xv->display), + xv->window_x, xv->window_y, + xv->window_width, xv->window_height, + 0, 0, 0); + if (!xv->window_title) { + if (!(xv->window_title = av_strdup(s->filename))) { + ret = AVERROR(ENOMEM); + goto fail; + } } - } - XStoreName(xv->display, xv->window, xv->window_title); - XMapWindow(xv->display, xv->window); + XStoreName(xv->display, xv->window, xv->window_title); + XMapWindow(xv->display, xv->window); } else xv->window = xv->window_id;