Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (4)
......@@ -266,6 +266,27 @@ FocusScope {
leftMargin: VLCStyle.applicationHorizontalMargin
}
// This item is the root of a large hierarchy
// which requires many batches to be rendered.
// When the miniPlayer effect is active, this
// item (source item) gets rendered in an offscreen
// surface. If we don't enable layer here,
// it (along with children) gets rendered again
// in the assigned window.
// If layer is enabled, instead of rendering one
// more time with many batches, a dynamic texture
// from the offscreen surface is used. This behavior
// reduces the amount of batches from 2x to x+1.
// A side effect is having to draw a large texture
// with blending on, but this must be cheaper redrawing
// all the batches.
// TODO: Reconsider this behavior when batching is optimized.
layer.enabled: miniPlayer.visible && miniPlayer.effectAvailable
// Enable clipping so that the effect does not sit
// on top of the source.
clip: miniPlayer.visible && miniPlayer.effectAvailable
Loader {
z: 1
anchors {
......
......@@ -35,6 +35,7 @@ FocusScope {
property alias effectSource: effect.source
property alias effectSourceRect: effect.sourceRect
property alias effectAvailable: effect.effectAvailable
state: (Player.playingState === Player.PLAYING_STATE_STOPPED) ? ""
: "expanded"
......
......@@ -20,7 +20,6 @@ import QtQuick.Controls 2.4
import QtQuick.Templates 2.4 as T
import QtQuick.Layouts 1.11
import QtQml.Models 2.2
import QtGraphicalEffects 1.0
import org.videolan.vlc 0.1
......@@ -144,8 +143,6 @@ Control {
isRight: true
rightPadding: VLCStyle.margin_xsmall + VLCStyle.applicationHorizontalMargin
bottomPadding: VLCStyle.margin_large + root.bottomPadding
effectSource: contentItem
}
}
......
......@@ -21,75 +21,98 @@ import QtGraphicalEffects 1.0
import "qrc:///style/"
Rectangle {
Item {
id: effect
property alias source: effectSource.sourceItem
property alias sourceRect: effectSource.sourceRect
property alias recursive: effectSource.recursive
property alias blurRadius: blurEffect.radius
property alias tint: effect.color
property Item source
property rect sourceRect: mapToItem(source, x, y, width, height)
property bool recursive: false
property real blurRadius: 64
property color tint
property real tintStrength: 0.7
property real noiseStrength: 0.02
property real exclusionStrength: 0.09
FastBlur {
id: blurEffect
readonly property bool effectAvailable: (GraphicsInfo.shaderType === GraphicsInfo.GLSL) &&
(GraphicsInfo.shaderSourceType & GraphicsInfo.ShaderSourceString)
opacity: source.opacity
Loader {
id: loader
anchors.fill: parent
source: ShaderEffectSource {
id: effectSource
sourceItem: effect.source
sourceRect: effect.mapToItem(effect.source,
effect.x,
effect.y,
effect.width,
effect.height)
visible: false
samples: 0
sourceComponent: effect.effectAvailable ? effectComponent : rectComponent
Component {
id: rectComponent
Rectangle {
color: effect.tint
}
}
radius: 64
Component {
id: effectComponent
layer.enabled: true
layer.effect: ShaderEffect {
readonly property color tint: effect.tint
readonly property real tintStrength: effect.tintStrength
readonly property real noiseStrength: effect.noiseStrength
readonly property real exclusionStrength: effect.exclusionStrength
FastBlur {
id: blurEffect
fragmentShader: "
uniform lowp sampler2D source; // this item
varying highp vec2 qt_TexCoord0;
source: ShaderEffectSource {
id: effectSource
sourceItem: effect.source
sourceRect: effect.sourceRect
visible: false
samples: 0
}
uniform lowp vec4 tint;
radius: effect.blurRadius
uniform lowp float exclusionStrength;
uniform lowp float noiseStrength;
uniform lowp float tintStrength;
layer.enabled: true
layer.effect: ShaderEffect {
readonly property color tint: effect.tint
readonly property real tintStrength: effect.tintStrength
readonly property real noiseStrength: effect.noiseStrength
readonly property real exclusionStrength: effect.exclusionStrength
mediump float rand(highp vec2 co){
return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
}
fragmentShader: "
uniform lowp sampler2D source; // this item
varying highp vec2 qt_TexCoord0;
mediump vec4 exclude(mediump vec4 src, mediump vec4 dst)
{
return src + dst - 2.0 * src * dst;
}
uniform lowp float qt_Opacity;
uniform lowp vec4 tint;
uniform lowp float exclusionStrength;
uniform lowp float noiseStrength;
uniform lowp float tintStrength;
mediump float rand(highp vec2 co){
return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
}
void main() {
mediump float r = rand(qt_TexCoord0) - 0.5;
mediump vec4 noise = vec4(r,r,r,1.0) * noiseStrength;
mediump vec4 blurred = texture2D(source, qt_TexCoord0);
mediump vec4 exclude(mediump vec4 src, mediump vec4 dst)
{
return src + dst - 2.0 * src * dst;
}
mediump vec4 exclColor = vec4(exclusionStrength, exclusionStrength, exclusionStrength, 0.0);
void main() {
mediump float r = rand(qt_TexCoord0) - 0.5;
mediump vec4 noise = vec4(r,r,r,1.0) * noiseStrength;
mediump vec4 blurred = texture2D(source, qt_TexCoord0);
blurred = exclude(blurred, exclColor);
mediump vec4 exclColor = vec4(exclusionStrength, exclusionStrength, exclusionStrength, 0.0);
gl_FragColor = mix(blurred, tint, tintStrength) + noise;
}"
blurred = exclude(blurred, exclColor);
gl_FragColor = (mix(blurred, tint, tintStrength) + noise) * qt_Opacity;
}"
}
}
}
}
}
......@@ -57,8 +57,6 @@ FocusScope {
listView.resetStack()
}
property alias effectSource: effect.source
property alias scrollBarActive: scrollBar.active
visible: false
......@@ -103,9 +101,11 @@ FocusScope {
}
}
Item {
Rectangle {
id: parentItem
color: root.colors.bg
anchors {
top: parent.top
bottom: parent.bottom
......@@ -114,6 +114,7 @@ FocusScope {
left: isRight ? undefined : parent.left
}
// TODO: Qt >= 5.12 use TapHandler
MouseArea {
anchors.fill: parent
hoverEnabled: true
......@@ -121,18 +122,6 @@ FocusScope {
acceptedButtons: Qt.NoButton
}
FrostedGlassEffect {
id: effect
anchors.fill: parent
source: backgroundItem
color: VLCStyle.colors.topBanner
tintStrength: 0.0
exclusionStrength: 0.1
}
ListView {
id: listView
......