diff mbox

[FFmpeg-devel] Allow borderless playback windows

Message ID e7f19287-11aa-d349-6866-602ee01867a3@adam.com.au
State Accepted
Headers show

Commit Message

Lucas Sandery Feb. 1, 2017, 2:49 a.m. UTC 
On 2017-02-01 12:34, Marton Balint wrote:
> No, your code is not yet committed to the ffmpeg master repository, I 
> am not sure which github repo you are referring to. So you might still 
> change your mind. Also I plan to squash your two patches into one.
I managed to stuff up (and misuse) my local repo. Attached an updated patch.

Sorry for the noise, everyone.

Comments

Marton Balint Feb. 1, 2017, 9:06 p.m. UTC | #1 
On Wed, 1 Feb 2017, Lucas Sandery wrote:

> On 2017-02-01 12:34, Marton Balint wrote:
>> No, your code is not yet committed to the ffmpeg master repository, I am 
>> not sure which github repo you are referring to. So you might still change 
>> your mind. Also I plan to squash your two patches into one.
>
> I managed to stuff up (and misuse) my local repo. Attached an updated patch.
>

Thanks, applied.

Regards,
Marton
diff mbox

Patch

From a4b32dbb6715d42eff4b57cf2cbe8f2db2294baa Mon Sep 17 00:00:00 2001
From: Lucas Sandery <lucas-sandery@users.noreply.github.com>
Date: Wed, 1 Feb 2017 13:11:29 +1030
Subject: [PATCH] Allow borderless playback windows

For a pure video tile effect, and enabling better integration of playback windows
into other programs. It would improve the looks in many situations and avoid ugly
hacks like this: http://stackoverflow.com/q/31465630/315024

Signed-off-by: Lucas Sandery <lucas-sandery@users.noreply.github.com>
---
 doc/ffplay.texi | 2 ++
 ffplay.c        | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 378a229d67..a76bed4663 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -62,6 +62,8 @@  see @ref{time duration syntax,,the Time duration section in the ffmpeg-utils(1)
 Seek by bytes.
 @item -nodisp
 Disable graphical display.
+@item -noborder
+Borderless window.
 @item -volume
 Set the startup volume. 0 means silence, 100 means no volume reduction or
 amplification. Negative values are treated as 0, values above 100 are treated
diff --git a/ffplay.c b/ffplay.c
index 7ea172f8da..6325e6f999 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -321,6 +321,7 @@  static int subtitle_disable;
 static const char* wanted_stream_spec[AVMEDIA_TYPE_NB] = {0};
 static int seek_by_bytes = -1;
 static int display_disable;
+static int borderless;
 static int startup_volume = 100;
 static int show_status = 1;
 static int av_sync_type = AV_SYNC_AUDIO_MASTER;
@@ -1265,6 +1266,8 @@  static int video_open(VideoState *is)
             window_title = input_filename;
         if (is_full_screen)
             flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+        if (borderless)
+            flags |= SDL_WINDOW_BORDERLESS;
         window = SDL_CreateWindow(window_title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h, flags);
         SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
         if (window) {
@@ -3513,6 +3516,7 @@  static const OptionDef options[] = {
     { "t", HAS_ARG, { .func_arg = opt_duration }, "play  \"duration\" seconds of audio/video", "duration" },
     { "bytes", OPT_INT | HAS_ARG, { &seek_by_bytes }, "seek by bytes 0=off 1=on -1=auto", "val" },
     { "nodisp", OPT_BOOL, { &display_disable }, "disable graphical display" },
+    { "noborder", OPT_BOOL, { &borderless }, "borderless window" },
     { "volume", OPT_INT | HAS_ARG, { &startup_volume}, "set startup volume 0=min 100=max", "volume" },
     { "f", HAS_ARG, { .func_arg = opt_format }, "force format", "fmt" },
     { "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, { .func_arg = opt_frame_pix_fmt }, "set pixel format", "format" },
-- 
2.11.0.windows.3