October 2015 - ffmpeg-cvslog - lists.ffmpeg.org

Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'
by git＠videolan.org 23 Dec '15

23 Dec '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Wed Oct 14 13:48:22 2015 +0200| [64ceeac26a441ede6eaf4bb99a5c3224b1803745] | committer: Hendrik Leppkes Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c' * commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c': nullenc: Use the wrapped avframe pseudo-encoder Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64ceeac26a441ede6… ---

2 2

avcodec/h264_slice: Disable slice threads if there are multiple access units in a packet
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 31 21:36:00 2015 +0100| [507b01f89969601f15555f7416804fb691632cbb] | committer: Michael Niedermayer avcodec/h264_slice: Disable slice threads if there are multiple access units in a packet Fixes null pointer dereference Fixes Ticket4977 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=507b01f89969601f1… --- libavcodec/h264_slice.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 3f41e9b..eceda8a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1177,6 +1177,15 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) av_log(h->avctx, AV_LOG_ERROR, "Too many fields\n"); return AVERROR_INVALIDDATA; } + if (h->max_contexts > 1) { + if (!h->single_decode_warning) { + av_log(h->avctx, AV_LOG_WARNING, "Cannot decode multiple access units as slice threads\n"); + h->single_decode_warning = 1; + } + h->max_contexts = 1; + return SLICE_SINGLETHREAD; + } + if (h->cur_pic_ptr && FIELD_PICTURE(h) && h->first_field) { ret = ff_h264_field_end(h, h->slice_ctx, 1); h->current_slice = 0;

1 0

avformat/icecast: Initialize .str based default for AV_OPT_TYPE_STRING types
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 31 14:43:48 2015 +0100| [58346f6a294b481351d5a671b0cda97635a78515] | committer: Michael Niedermayer avformat/icecast: Initialize .str based default for AV_OPT_TYPE_STRING types Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58346f6a294b48135… --- libavformat/icecast.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/icecast.c b/libavformat/icecast.c index a7c7001..ace2044 100644 --- a/libavformat/icecast.c +++ b/libavformat/icecast.c @@ -53,14 +53,14 @@ typedef struct IcecastContext { #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "ice_genre", "set stream genre", OFFSET(genre), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, - { "ice_name", "set stream description", OFFSET(name), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, - { "ice_description", "set stream description", OFFSET(description), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, - { "ice_url", "set stream website", OFFSET(url), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, + { "ice_genre", "set stream genre", OFFSET(genre), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, + { "ice_name", "set stream description", OFFSET(name), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, + { "ice_description", "set stream description", OFFSET(description), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, + { "ice_url", "set stream website", OFFSET(url), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, { "ice_public", "set if stream is public", OFFSET(public), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E }, - { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, - { "password", "set password", OFFSET(pass), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, - { "content_type", "set content-type, MUST be set if not audio/mpeg", OFFSET(content_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E }, + { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, + { "password", "set password", OFFSET(pass), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, + { "content_type", "set content-type, MUST be set if not audio/mpeg", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, { "legacy_icecast", "use legacy SOURCE method, for Icecast < v2.4", OFFSET(legacy_icecast), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E }, { NULL } };

1 0

avformat/http: Initialize .str based default for AV_OPT_TYPE_STRING types
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 31 14:42:29 2015 +0100| [4d76e89c1818ea4ffcbc203a84091096e8927cd1] | committer: Michael Niedermayer avformat/http: Initialize .str based default for AV_OPT_TYPE_STRING types Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d76e89c1818ea4ff… --- libavformat/http.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 075dda7..4b4a225 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -126,23 +126,23 @@ typedef struct HTTPContext { static const AVOption options[] = { { "seekable", "control seekability of connection", OFFSET(seekable), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, D }, { "chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, E }, - { "headers", "set custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D | E }, - { "content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D | E }, + { "headers", "set custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, + { "content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, { "user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, { "multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, D | E }, { "post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D | E }, - { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, - { "cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D }, + { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, + { "cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, { "icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, D }, - { "icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT }, - { "icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT }, + { "icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT }, + { "icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT }, { "metadata", "metadata read from the bitstream", OFFSET(metadata), AV_OPT_TYPE_DICT, {0}, 0, 0, AV_OPT_FLAG_EXPORT }, { "auth_type", "HTTP authentication type", OFFSET(auth_state.auth_type), AV_OPT_TYPE_INT, { .i64 = HTTP_AUTH_NONE }, HTTP_AUTH_NONE, HTTP_AUTH_BASIC, D | E, "auth_type"}, { "none", "No auth method set, autodetect", 0, AV_OPT_TYPE_CONST, { .i64 = HTTP_AUTH_NONE }, 0, 0, D | E, "auth_type"}, { "basic", "HTTP basic authentication", 0, AV_OPT_TYPE_CONST, { .i64 = HTTP_AUTH_BASIC }, 0, 0, D | E, "auth_type"}, { "send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E }, - { "location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D | E }, + { "location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "offset", "initial byte offset", OFFSET(off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D }, { "end_offset", "try to limit the request to bytes preceding this offset", OFFSET(end_off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D }, { "method", "Override the HTTP method or set the expected HTTP method from a client", OFFSET(method), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E },

1 0

avcodec/libopenh264enc: use AV_OPT_TYPE_BOOL for allow_skip_frames option
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Sat Oct 31 17:33:22 2015 +0100| [953d358462f226638dce2092a95043f7cb03952b] | committer: Clément Bœsch avcodec/libopenh264enc: use AV_OPT_TYPE_BOOL for allow_skip_frames option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=953d358462f226638… --- libavcodec/libopenh264enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index cf79ab6..2f63da1 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -57,7 +57,7 @@ static const AVOption options[] = { { "loopfilter", "enable loop filter", OFFSET(loopfilter), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { "profile", "set profile restrictions", OFFSET(profile), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE }, { "max_nal_size", "Set maximum NAL size in bytes", OFFSET(max_nal_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, - { "allow_skip_frames", "Allow skipping frames to hit the target bitrate", OFFSET(skip_frames), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "allow_skip_frames", "Allow skipping frames to hit the target bitrate", OFFSET(skip_frames), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } };

1 0

avutil/x86/intmath: Add missing header.
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Matt Oliver <protogonoi(a)gmail.com> | Sun Nov 1 02:00:41 2015 +1100| [bff009697d0278fafaef533d4656daae1abdc29a] | committer: Matt Oliver avutil/x86/intmath: Add missing header. Signed-off-by: Matt Oliver <protogonoi(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bff009697d0278faf… --- libavutil/x86/intmath.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h index 61d1a73..d504079 100644 --- a/libavutil/x86/intmath.h +++ b/libavutil/x86/intmath.h @@ -22,6 +22,9 @@ #define AVUTIL_X86_INTMATH_H #include <stdint.h> +#if HAVE_FAST_CLZ && (defined(__INTEL_COMPILER) || defined(_MSC_VER)) +#include <immintrin.h> +#endif #include "config.h" #if HAVE_FAST_CLZ

1 0

avcodec/nvenc: fix potential profile error when encoding yuv444p
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Agatha Hu <ahu(a)nvidia.com> | Sat Oct 31 16:00:39 2015 +0100| [20abda6b626c0efe1df298eab697d61ba52669c3] | committer: Timo Rothenpieler avcodec/nvenc: fix potential profile error when encoding yuv444p Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20abda6b626c0efe1… --- libavcodec/nvenc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 0e6ef43..812b0b4 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -913,6 +913,12 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) } } + // force setting profile as high444p if input is AV_PIX_FMT_YUV444P + if (avctx->pix_fmt == AV_PIX_FMT_YUV444P) { + ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID; + avctx->profile = FF_PROFILE_H264_HIGH_444_PREDICTIVE; + } + ctx->encode_config.encodeCodecConfig.h264Config.chromaFormatIDC = avctx->profile == FF_PROFILE_H264_HIGH_444_PREDICTIVE ? 3 : 1; if (ctx->level) { @@ -1452,7 +1458,7 @@ static const enum AVPixelFormat pix_fmts_nvenc[] = { #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "preset", "Set the encoding preset (one of slow = hq 2pass, medium = hq, fast = hp, hq, hp, bd, ll, llhq, llhp, default)", OFFSET(preset), AV_OPT_TYPE_STRING, { .str = "hq" }, 0, 0, VE }, - { "profile", "Set the encoding profile (high, main or baseline)", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, + { "profile", "Set the encoding profile (high, main, baseline or high444p)", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "level", "Set the encoding level restriction (auto, 1.0, 1.0b, 1.1, 1.2, ..., 4.2, 5.0, 5.1)", OFFSET(level), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "tier", "Set the encoding tier (main or high)", OFFSET(tier), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "cbr", "Use cbr encoding mode", OFFSET(cbr), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },

1 0

avutil/opencl_internal: add av_warn_unused_result
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sat Oct 31 10:36:22 2015 -0400| [8a5b60a6b1d841b74c2670f5165c8b05321f395a] | committer: Ganesh Ajjanagadde avutil/opencl_internal: add av_warn_unused_result clSetKernelArg can return an error due to lack of memory (for instance): https://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clSetKernelArg.h…. Thus this error must be propagated. Currently should not trigger warnings, but adds robustness. Untested. Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a5b60a6b1d841b74… --- libavutil/opencl_internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/opencl_internal.h b/libavutil/opencl_internal.h index dacd930..ddc6d3a 100644 --- a/libavutil/opencl_internal.h +++ b/libavutil/opencl_internal.h @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "attributes.h" #include "opencl.h" #define FF_OPENCL_PARAM_INFO(a) ((void*)(&(a))), (sizeof(a)) @@ -30,4 +31,5 @@ typedef struct { void *ctx; } FFOpenclParam; +av_warn_unused_result int avpriv_opencl_set_parameter(FFOpenclParam *opencl_param, ...);

1 0

avfilter/vf_deshake: replace qsort with AV_QSORT
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Fri Oct 30 19:07:13 2015 -0400| [7910a2c26939c4e2400af930b0995ada56a895c8] | committer: Ganesh Ajjanagadde avfilter/vf_deshake: replace qsort with AV_QSORT qsort is called indirectly in filter_frame, suggesting its performance criticality. AV_QSORT is substantially faster due to the inlining of the comparison callback. Thus, the increase in performance should be worth the increase in binary size. This optimization is just a low hanging fruit. The trac ticket 1430 is a request for an improved deshake filter. Sample benchmark (x86-64, Haswell, GNU/Linux): File: original from https://trac.ffmpeg.org/ticket/1430 command: ffmpeg -stream_loop 8 -i file.webm -vf deshake=rx=64:ry=64 -f null - Timer truncated at 1024 runs. new: 28260 decicycles in qsort, 1 runs, 0 skips 35570 decicycles in qsort, 2 runs, 0 skips 39010 decicycles in qsort, 4 runs, 0 skips 46897 decicycles in qsort, 8 runs, 0 skips 40442 decicycles in qsort, 16 runs, 0 skips 41611 decicycles in qsort, 32 runs, 0 skips 40345 decicycles in qsort, 64 runs, 0 skips 38967 decicycles in qsort, 128 runs, 0 skips 38647 decicycles in qsort, 256 runs, 0 skips 40238 decicycles in qsort, 512 runs, 0 skips 39676 decicycles in qsort, 1024 runs, 0 skips old: 1740280 decicycles in qsort, 1 runs, 0 skips 923560 decicycles in qsort, 2 runs, 0 skips 511330 decicycles in qsort, 4 runs, 0 skips 309720 decicycles in qsort, 8 runs, 0 skips 194900 decicycles in qsort, 16 runs, 0 skips 142686 decicycles in qsort, 32 runs, 0 skips 112516 decicycles in qsort, 64 runs, 0 skips 98166 decicycles in qsort, 128 runs, 0 skips 88147 decicycles in qsort, 256 runs, 0 skips 88706 decicycles in qsort, 512 runs, 0 skips 86783 decicycles in qsort, 1024 runs, 0 skips Reviewed-by: Nicolas George <george(a)nsup.org> Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7910a2c26939c4e24… --- libavfilter/vf_deshake.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 885569a..e32436d 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -57,6 +57,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/qsort.h" #include "deshake.h" #include "deshake_opencl.h" @@ -106,7 +107,7 @@ static double clean_mean(double *values, int count) int cut = count / 5; int x; - qsort(values, count, sizeof(double), cmp); + AV_QSORT(values, count, double, cmp); for (x = cut; x < count - cut; x++) { mean += values[x];

1 0

gdigrab: grab right desktop size if DPI in use, based on patch from Alexander Brotzge
by git＠videolan.org 31 Oct '15

31 Oct '15

ffmpeg | branch: master | Matt Oliver <protogonoi(a)gmail.com> | Mon Oct 5 20:00:37 2015 +1100| [e82883aa88bfccf2669e914eab9deef6cecfd0db] | committer: Matt Oliver gdigrab: grab right desktop size if DPI in use, based on patch from Alexander Brotzge Signed-off-by: Matt Oliver <protogonoi(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e82883aa88bfccf26… --- libavdevice/gdigrab.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/libavdevice/gdigrab.c b/libavdevice/gdigrab.c index 9a185d4..4428a34 100644 --- a/libavdevice/gdigrab.c +++ b/libavdevice/gdigrab.c @@ -235,6 +235,8 @@ gdigrab_read_header(AVFormatContext *s1) AVStream *st = NULL; int bpp; + int vertres; + int desktopvertres; RECT virtual_rect; RECT clip_rect; BITMAP bmp; @@ -263,13 +265,26 @@ gdigrab_read_header(AVFormatContext *s1) goto error; } + /* This will get the device context for the selected window, or if + * none, the primary screen */ + source_hdc = GetDC(hwnd); + if (!source_hdc) { + WIN32_API_ERROR("Couldn't get window device context"); + ret = AVERROR(EIO); + goto error; + } + bpp = GetDeviceCaps(source_hdc, BITSPIXEL); + if (hwnd) { GetClientRect(hwnd, &virtual_rect); } else { + /* desktop -- get the right height and width for scaling DPI */ + vertres = GetDeviceCaps(source_hdc, VERTRES); + desktopvertres = GetDeviceCaps(source_hdc, DESKTOPVERTRES); virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN); virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN); - virtual_rect.right = virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); - virtual_rect.bottom = virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + virtual_rect.right = (virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN)) * desktopvertres / vertres; + virtual_rect.bottom = (virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN)) * desktopvertres / vertres; } /* If no width or height set, use full screen/window area */ @@ -299,15 +314,6 @@ gdigrab_read_header(AVFormatContext *s1) goto error; } - /* This will get the device context for the selected window, or if - * none, the primary screen */ - source_hdc = GetDC(hwnd); - if (!source_hdc) { - WIN32_API_ERROR("Couldn't get window device context"); - ret = AVERROR(EIO); - goto error; - } - bpp = GetDeviceCaps(source_hdc, BITSPIXEL); if (name) { av_log(s1, AV_LOG_INFO,

1 0