Commit 888f07c1 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents e05c154a 1df0959b
Pipeline #44864 passed with stage
in 10 minutes and 28 seconds
......@@ -12,7 +12,7 @@
<parameter type="constant" name="av.blend" default="0" max="1" min="0" decimals="2">
<name>Blend</name>
</parameter>
<paramter type="bool" name="av.yuv" default="false">
<parameter type="bool" name="av.yuv" default="false">
<name>for YUV color</name>
</parameter>
</effect>
......@@ -10,7 +10,7 @@
<name>Red white input</name>
</parameter>
<parameter type="constant" name="av.romin" default="0" min="0" max="1" decimals="2">
<name>Red black ouput input</name>
<name>Red black output input</name>
</parameter>
<parameter type="constant" name="av.romax" default="1" min="0" max="1" decimals="2">
<name>Red white output</name>
......@@ -22,7 +22,7 @@
<name>Green white input</name>
</parameter>
<parameter type="constant" name="av.gomin" default="0" min="0" max="1" decimals="2">
<name>Green black ouput input</name>
<name>Green black output input</name>
</parameter>
<parameter type="constant" name="av.gomax" default="1" min="0" max="1" decimals="2">
<name>Green white output</name>
......@@ -34,7 +34,7 @@
<name>Blue white input</name>
</parameter>
<parameter type="constant" name="av.bomin" default="0" min="0" max="1" decimals="2">
<name>Blue black ouput input</name>
<name>Blue black output input</name>
</parameter>
<parameter type="constant" name="av.bomax" default="1" min="0" max="1" decimals="2">
<name>Blue white output</name>
......
......@@ -23,8 +23,9 @@
</parameter>
<parameter type="constant" name="av.o" max="1" min="0" default="0.75" decimals="2">
<name>Opacity</name>
<parameter type="list" name="av.f" default="hex" paramlist="hex;dec">
</parameter>
<parameter type="list" name="av.f" default="hex" paramlist="hex;dec">
<paramlistdisplay>Hex,Dec</paramlistdisplay>
<name>Format</name>
</parameter>
</effect>
</effect>
......@@ -3,9 +3,9 @@
<name>DeBlock</name>
<description>Remove blocking artifacts from input video.</description>
<author>libavfilter</author>
<parameter type="list" name="av.fiter" default="strong" paramlist="weak;strong">
<paramlistdisplay>All,Y,U,V,Alpha,Red,Green,Blue</paramlistdisplay>
<name>Filter strenght</name>
<parameter type="list" name="av.filter" default="strong" paramlist="weak;strong">
<paramlistdisplay>Weak,Strong</paramlistdisplay>
<name>Filter strength</name>
</parameter>
<parameter type="constant" name="av.block" default="8" min="4" max="512" factor="1">
<name>Block size</name>
......
......@@ -5,6 +5,6 @@
<author>libavfilter</author>
<parameter type="list" name="av.first_field" default="top" paramlist="top;botom">
<paramlistdisplay>Top field first,Bottom field first</paramlistdisplay>
<name>First Fied</name>
<name>First Field</name>
</parameter>
</effect>
......@@ -4,7 +4,7 @@
<description>Apply posterize effect, using the ELBG algorithm</description>
<author>libavfilter</author>
<parameter type="constant" name="av.l" default="50" min="1" max="50" factor="1" suffix=" Colors">
<name>Codebook Lenght</name>
<name>Codebook Length</name>
</parameter>
<parameter type="constant" name="av.n" default="1" min="1" max="10" factor="1">
<name>Steps</name>
......
......@@ -5,6 +5,6 @@
<author>libavfilter</author>
<parameter type="list" name="av.type" default="top" paramlist="top;botom">
<paramlistdisplay>Top field first,Bottom field first</paramlistdisplay>
<name>Fied priority</name>
<name>Field priority</name>
</parameter>
</effect>
......@@ -5,6 +5,6 @@
<author>libavfilter</author>
<parameter type="list" name="av.order" default="tff" paramlist="tff;bff">
<paramlistdisplay>Top field first,Bottom field first</paramlistdisplay>
<name>Fied priority</name>
<name>Field priority</name>
</parameter>
</effect>
......@@ -4,21 +4,22 @@
<description>Fill borders of the input video, without changing video stream dimensions. Sometimes video can have garbage at the four edges and you may not want to crop video input to keep size multiple of some number</description>
<author>libavfilter</author>
<parameter type="constant" name="av.left" default="0" min="0" max="%width/2" factor="1">
<name>Left</name>
</parameter>
<parameter type="constant" name="av.right" default="0" min="0" max="%width/2" factor="1">
<name>Right</name>
</parameter>
<name>Left</name>
</parameter>
<parameter type="constant" name="av.right" default="0" min="0" max="%width/2" factor="1">
<name>Right</name>
</parameter>
<parameter type="constant" name="av.top" default="0" min="0" max="%height/2" factor="1">
<name>Top</name>
</parameter>
<parameter type="constant" name="av.bottom" default="0" min="0" max="%height/2" factor="1">
<name>Botton</name>
</parameter>
<parameter type="list" name="av.mode" default="smear" paramlist="smear;mirror;fixed">
<name>Top</name>
</parameter>
<parameter type="constant" name="av.bottom" default="0" min="0" max="%height/2" factor="1">
<name>Bottom</name>
</parameter>
<parameter type="list" name="av.mode" default="smear" paramlist="smear;mirror;fixed">
<paramlistdisplay>Smear,Mirror,Fixed</paramlistdisplay>
<name>Mode</name>
</parameter>
<parameter type="color" name="av.color" default="black">
<name>Color</name>
<name>Mode</name>
</parameter>
<parameter type="color" name="av.color" default="black">
<name>Color</name>
</parameter>
</effect>
......@@ -14,6 +14,6 @@
<name>Strength</name>
</parameter>
<parameter type="switch" name="av.use_bframe_qp" default="0" max="1" min="0">
<name>QP on B-Frames/name>
<name>QP on B-Frames</name>
</parameter>
</effect>
......@@ -20,8 +20,7 @@
<parameter type="list" name="av.c" default="7" paramlist="0;1;2;3;4;5;6;7;8">
<paramlistdisplay>All,Y,U,YU,V,YV,UV,YUV,Alpha</paramlistdisplay>
<name>Components to display</name>
</parameter>
</parameter>
</parameter>
<parameter type="constant" name="av.f" default="0.7" min="0" max="1" decimals="1">
<name>Foreground Opacity</name>
</parameter>
......
......@@ -3,7 +3,7 @@
<name>Invert</name>
<description>Negate (invert) the input video.</description>
<author>libavfilter</author>
<paramter type="bool" name="av.negate_alpha" default="0">
<parameter type="bool" name="av.negate_alpha" default="0">
<name>Negate alpha</name>
</parameter>
</effect>
......@@ -7,7 +7,7 @@
<name>Luma radius</name>
</parameter>
<parameter type="constant" name="av.ls" default="1.0" min="-1.0" max="1.0" decimals="1">
<name>Luma strenght</name>
<name>Luma strength</name>
</parameter>
<parameter type="constant" name="av.lt" default="0" min="-30" max="+30" factor="1">
<name>Luma Threshold</name>
......@@ -16,7 +16,7 @@
<name>Chroma radius</name>
</parameter>
<parameter type="constant" name="av.cs" default="1.0" min="-1.0" max="1.0" decimals="1">
<name>Chroma strenght</name>
<name>Chroma strength</name>
</parameter>
<parameter type="constant" name="av.ct" default="0" min="-30" max="+30" factor="1">
<name>Chroma Threshold</name>
......
......@@ -10,4 +10,5 @@
<parameter type="list" name="av.out" default="arcd" paramlist="sbsl;sbsr;abl;abr;irl;irr;arbg;argg;arcg;arch;arcc;arcd;agmg;agmh;agmc;agmd;aybg;aybh;aybc;aybd;ml;mr;chl;chr;icl;icr;hdmi">
<paramlistdisplay>side by side parallel,side by side crosseye,above-below left top,above-below right top,interleaved rows (letf top),interleaved rows (right top),anaglyph red/blue gray,anaglyph red/green gray,anaglyph red/cyan gray,anaglyph red/cyan half colored,anaglyph red/cyan color,anaglyph red/cyan dubois,anaglyph green/magenta gray,anaglyph green/magenta half colored,anaglyph green/magenta colored,anaglyph green/magenta dubois,anaglyph yellow/blue gray,anaglyph yellow/blue half colored,anaglyph yellow/blue colored,anaglyph yellow/blue dubois,mono output left,mono output right,checkerboard left eye first,checkerboard right eye first,interleaved columns left eye first,interleaved columns right eye first,HDMI frame pack</paramlistdisplay>
<name>Output format</name>
</effect>
</parameter>
</effect>
......@@ -10,4 +10,5 @@
<parameter type="list" name="av.passthrough" default="none" paramlist="none;portrait;landscape">
<paramlistdisplay>None,Portrait,Landscape</paramlistdisplay>
<name>Override if</name>
</effect>
</parameter>
</effect>
......@@ -3,10 +3,10 @@
<name>Light Show</name>
<description>An audio visualization filter that colors the image proportional to the magnitude of the audio spectrum.</description>
<author>Brian Matherly</author>
<parameter type="integer" name="frequency_low" deafult="20" min="20" max="20000" factor="1" suffix=" Hz">
<parameter type="integer" name="frequency_low" default="20" min="20" max="20000" factor="1" suffix=" Hz">
<name>Low frequency</name>
</parameter>
<parameter type="integer" name="frequency_high" deafult="20000" min="20" max="20000" factor="1" suffix=" Hz">
<parameter type="integer" name="frequency_high" default="20000" min="20" max="20000" factor="1" suffix=" Hz">
<name>High frequency</name>
</parameter>
<parameter type="float" name="threshold" default="-30" min="-100" max="0" factor="1" suffix=" db">
......
......@@ -118,7 +118,7 @@ int main(int argc, char **argv)
fprintf(stderr, "DONE:%d \n", frame.toInt());
}
// Mlt::Factory::close();
fprintf(stderr, "+ + + RENDERING FINSHED + + + \n");
fprintf(stderr, "+ + + RENDERING FINISHED + + + \n");
return 0;
}
int in = -1;
......
......@@ -42,6 +42,11 @@ BoolParamWidget::BoolParamWidget(std::shared_ptr<AssetParameterModel> model, QMo
// emit the signal of the base class when appropriate
connect(this->m_checkBox, &QCheckBox::stateChanged, this, [this](int state) {
// To represent 'checked' status, Qt uses number '2', but
// the boolean parameters in MLT effects use number '1'
if (state == 2) {
state = 1;
}
emit valueChanged(m_index, QString::number(state), true); });
}
......
......@@ -48,7 +48,7 @@ public:
void deregisterTrack(int tid);
void setModel(std::shared_ptr<TimelineItemModel> model);
void cleanup();
/** @brief Connect the mixer widgets to the correspondant filters */
/** @brief Connect the mixer widgets to the correspondent filters */
void connectMixer(bool doConnect);
void collapseMixers();
/** @brief Pause/unpause audio monitoring */
......
......@@ -60,13 +60,13 @@ public:
void clear();
static void property_changed( mlt_service , MixerWidget *self, char *name );
void setMute(bool mute);
/** @brief Returs true if track is muted
/** @brief Returns true if track is muted
* */
bool isMute() const;
/** @brief Uncheck the solo button
* */
void unSolo();
/** @brief Connect the mixer widgets to the correspondant filters */
/** @brief Connect the mixer widgets to the correspondent filters */
void connectMixer(bool doConnect);
/** @brief Disable/enable monitoring by disabling/enabling filter */
void pauseMonitoring(bool pause);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment