forked from rpmfusion/avidemux
-
Notifications
You must be signed in to change notification settings - Fork 0
/
avidemux-2.6.16-filter-preview.patch
379 lines (358 loc) · 11.7 KB
/
avidemux-2.6.16-filter-preview.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
commit b77bac1b214215eb30d86d426018e95d7b0231ce
Author: mean <[email protected]>
Date: Sun Jan 1 14:19:49 2017 +0100
[autoZoom] if unzooming make sure it is at least 1.5
avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 1fcc43c2defde1fad7bfbba41b40ec00d0a0e868
Author: mean <[email protected]>
Date: Mon Jan 2 18:58:45 2017 +0100
[flyDialog] Begin to simplify zoom computation
avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h | 6 +-
avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 99 +++++++++++++++++++------
2 files changed, 79 insertions(+), 26 deletions(-)
commit 6803a6185e7f9abe529b6f7f05eae5b904c92407
Author: mean <[email protected]>
Date: Tue Jan 3 07:52:48 2017 +0100
[flyDialog] Tweak a bit more autozoom
avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 12 +++++++-----
.../qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui | 8 ++++----
2 files changed, 11 insertions(+), 9 deletions(-)
commit befdc396c667c730cf0e91f3ce261369aee60e80
Author: eumagga0x2a <[email protected]>
Date: Tue Jan 3 15:24:00 2017 +0100
[flyDialog] Fix navigation slider (WIP), add missing tooltips
avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h | 4 ++
avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 68 +++++++++++++++++++++----
2 files changed, 61 insertions(+), 11 deletions(-)
diff -uprN a/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h b/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h
--- a/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h 2016-12-31 08:10:19.000000000 +0100
+++ b/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h 2017-01-03 20:41:52.197003667 +0100
@@ -81,7 +81,7 @@ class ADM_UIQT46_EXPORT ADM_flyDialog :
ResizeMethod _resizeMethod;
uint64_t lastPts;
double _computedZoom;
-
+ int _usedWidth, _usedHeight;
ADM_coreVideoFilter *_in;
@@ -117,7 +117,9 @@ protected:
virtual ADM_colorspace toRgbColor(void);
void updateZoom(void);
void EndConstructor(void);
- uint8_t cleanup(void);
+ uint8_t cleanup(void);
+ bool initializeSize();
+ float calcZoomToBeDisplayable(uint32_t imageWidth, uint32_t imageHeight);
/* Filter dependant : you have to implement them*/
//
virtual void resetScaler(void)=0; // dont bother, implemented by yuv or rgb subclass
@@ -143,7 +145,11 @@ public:
virtual void postInit(uint8_t reInit);
public:
virtual uint8_t sliderChanged(void);
+ virtual void updateSlider(void);
virtual bool goToTime(uint64_t tme);
+
+private:
+ virtual bool nextImageInternal(void);
public slots:
virtual bool nextImage(void);
diff -uprN a/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp b/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp
--- a/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp 2016-12-31 08:10:19.000000000 +0100
+++ b/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp 2017-01-03 20:41:52.197003667 +0100
@@ -124,14 +124,18 @@ ADM_flyDialog::~ADM_flyDialog(void)
}
/**
- \fn sliderChanged
- \brief callback to handle image changes
+ \fn goToTime
*/
bool ADM_flyDialog::goToTime(uint64_t tme)
{
_in->goToTime(tme);
- return nextImage();
+ return nextImageInternal();
}
+
+/**
+ \fn sliderChanged
+ \brief callback to handle image changes
+*/
uint8_t ADM_flyDialog::sliderChanged(void)
{
uint32_t fn= sliderGet();
@@ -205,9 +209,10 @@ bool ADM_flyDialog::addControl(QH
pushButton_back1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Back one minute", 0));
pushButton_back1mn->setText(QApplication::translate("seekablePreviewDialog", "<<", 0));
pushButton_play->setText(QApplication::translate("seekablePreviewDialog", "Play", 0));
- pushButton_next->setStatusTip(QApplication::translate("seekablePreviewDialog", "next image", 0));
+ pushButton_next->setToolTip(QApplication::translate("seekablePreviewDialog", "Next image", 0));
pushButton_next->setText(QApplication::translate("seekablePreviewDialog", ">", 0));
pushButton_fwd1mn->setText(QApplication::translate("seekablePreviewDialog", ">>", 0));
+ pushButton_fwd1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Forward one minute", 0));
radioButton_autoZoom->setText(QApplication::translate("seekablePreviewDialog", "A&utoZoom", 0));
QObject::connect(pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
@@ -232,9 +237,9 @@ uint64_t ADM_flyDialog::getCurrentPts()
return lastPts;
}
/**
- \fn nextImage
+ \fn nextImageInternal
*/
-bool ADM_flyDialog::nextImage(void)
+bool ADM_flyDialog::nextImageInternal(void)
{
uint32_t frameNumber;
if(!_in->getNextFrame(&frameNumber,_yuvBuffer))
@@ -248,6 +253,88 @@ bool ADM_flyDialog::nextImage(void)
process();
return display(_rgbByteBufferDisplay.at(0));
}
+
+/**
+ \fn nextImage
+*/
+bool ADM_flyDialog::nextImage(void)
+{
+ QSlider *slide=(QSlider *)_slider;
+ ADM_assert(slide);
+ bool oldState=slide->blockSignals(true);
+ bool r=nextImageInternal();
+ if(r)
+ updateSlider();
+ slide->blockSignals(oldState);
+ return r;
+}
+
+/**
+ *
+ * @return
+ */
+bool ADM_flyDialog::initializeSize()
+{
+ _canvas->resize(1,1);
+ QSize qsize= _canvas->parentWidget()->parentWidget()->size();
+ //_usedWidth = qsize.width();
+ // Normally there is nothing interesting left and right, we can use a hardcoded value
+ _usedWidth=64;
+ _usedHeight= 32+qsize.height(); // keep a border margin
+
+ if (_resizeMethod != RESIZE_NONE)
+ {
+ _zoom = calcZoomFactor();
+ if (_zoom == 1)
+ {
+ _resizeMethod = RESIZE_NONE;
+ }
+ }
+ if (_resizeMethod == RESIZE_NONE)
+ {
+ _zoom = 1;
+ _zoomW = _w;
+ _zoomH = _h;
+ } else
+ {
+ _zoomW = uint32_t(_w * _zoom);
+ _zoomH = uint32_t(_h * _zoom);
+ }
+
+
+ ADM_info("xAutoZoom : base size= %d x %d\n",_usedWidth,_usedHeight);
+ return true;
+}
+/**
+ * \brief Calculate the zoom ratio required to fit the whole image on the screen.
+ * @param imageWidth
+ * @param imageHeight
+ * @return
+ */
+float ADM_flyDialog::calcZoomToBeDisplayable( uint32_t imageWidth, uint32_t imageHeight)
+{
+ uint32_t screenWidth, screenHeight;
+ QWidget *topWindow=_canvas->parentWidget()->parentWidget();
+ UI_getPhysicalScreenSize(topWindow, &screenWidth, &screenHeight);
+
+ // Usable width/height
+ int usableWidth =(int)screenWidth -_usedWidth;
+ int usableHeight=(int)screenHeight-_usedHeight;
+
+ if(usableWidth<160) usableWidth=160;
+ if(usableHeight<160) usableHeight=160;
+
+
+ float widthRatio = (float)usableWidth / (float)imageWidth;
+ float heightRatio = (float)usableHeight / (float)imageHeight;
+
+ ADM_info("autoZoom : Raw w=%f h=%f\n",widthRatio,heightRatio);
+
+ float r= (widthRatio < heightRatio ? widthRatio : heightRatio);
+ return r;
+
+}
+
//************************************
// Implement the specific part
// i.e. yuv processing or RGB processing
@@ -258,6 +345,7 @@ bool ADM_flyDialog::nextImage(void)
{
_yuvBufferOut=new ADMImageDefault(_w,_h);
yuvToRgb=NULL;
+ initializeSize();
updateZoom();
postInit(false);
}
@@ -294,6 +382,7 @@ ADM_flyDialogRgb::ADM_flyDialogRgb(QDial
yuv2rgb =new ADMColorScalerSimple(_w,_h,ADM_COLOR_YV12,
toRgbColor());
rgb2rgb=NULL;
+ initializeSize();
updateZoom();
postInit(false);
@@ -335,7 +424,8 @@ bool ADM_flyDialogRgb::process(void)
return true;
}
-extern float UI_calcZoomToFitScreen(QWidget* window, QWidget* canvas, uint32_t imageWidth, uint32_t imageHeight);
+
+
/**
\fn FlyDialogEventFilter
@@ -377,9 +467,10 @@ bool FlyDialogEventFilter::eventFilter(Q
ADM_QCanvas *canvas, QSlider *slider, ResizeMethod resizeMethod)
{
ADM_assert(canvas);
-
- if (slider)
- ADM_assert(in);
+ {
+ ADM_assert(in);
+ slider->setMaximum(ADM_FLY_SLIDER_MAX);
+ }
_parent=parent;
_w = width;
_h = height;
@@ -391,25 +482,9 @@ bool FlyDialogEventFilter::eventFilter(Q
_resizeMethod = resizeMethod;
_zoomChangeCount = 0;
_yuvBuffer=new ADMImageDefault(_w,_h);
+ _usedWidth= _usedHeight=0;
lastPts=0;
- if (_resizeMethod != RESIZE_NONE)
- {
- _zoom = calcZoomFactor();
- if (_zoom == 1)
- {
- _resizeMethod = RESIZE_NONE;
- }
- }
- if (_resizeMethod == RESIZE_NONE)
- {
- _zoom = 1;
- _zoomW = _w;
- _zoomH = _h;
- } else
- {
- _zoomW = uint32_t(_w * _zoom);
- _zoomH = uint32_t(_h * _zoom);
- }
+
connect(&timer,SIGNAL(timeout()),this,SLOT(timeout()));
timer.setSingleShot(true);
@@ -451,22 +526,22 @@ void ADM_flyDialog::postInit(uint8_t reI
\fn calcZoomFactor
\brief
*/
-
float ADM_flyDialog::calcZoomFactor(void)
{
+#define APPROXIMATE 20.
if(_computedZoom) return _computedZoom;
double zoom;
- zoom=UI_calcZoomToFitScreen(((ADM_QCanvas*)_canvas)->parentWidget()->parentWidget(), ((ADM_QCanvas*)_canvas)->parentWidget(), _w, _h);
+ zoom=calcZoomToBeDisplayable(_w, _h);
// Find the closest integer
// zoom it ?
- if((zoom+0.3)>1)
+ if((zoom)>1)
{
- _computedZoom=floor(2*(zoom+0.3))/2;
+ _computedZoom=floor(APPROXIMATE*(zoom))/APPROXIMATE;
ADM_info("AutoZoom %f ->%f \n",(float)zoom,(float)_computedZoom);
return _computedZoom;
}
double invertZoom=1/zoom;
- _computedZoom=2./floor((2*(invertZoom+0.3)));
+ _computedZoom=APPROXIMATE/floor((1+APPROXIMATE*(invertZoom)));
ADM_info("AutoZoom 1/%f\n",(float)(1./_computedZoom));
return _computedZoom;
@@ -513,6 +588,24 @@ uint8_t ADM_flyDialog::sliderSet(uin
slide->setValue(value);
return 1;
}
+
+/**
+ \fn updateSlider
+ \brief
+*/
+void ADM_flyDialog::updateSlider(void)
+{
+ ADM_assert(_in);
+ uint64_t dur=_in->getInfo()->totalDuration;
+ uint64_t pts=getCurrentPts();
+ double pos;
+ pos=pts;
+ pos/=dur;
+ pos*=ADM_FLY_SLIDER_MAX;
+ pos+=0.5; // round up
+ sliderSet((uint32_t)pos);
+}
+
/**
\fn isRgbInverted
\brief
@@ -534,6 +627,7 @@ void ADM_flyDialog::backOneMinute(void)
if(pts<JUMP_LENGTH) pts=0;
else pts-=JUMP_LENGTH;
goToTime(pts);
+ updateSlider();
}
/**
*
@@ -543,18 +637,21 @@ void ADM_flyDialog::fwdOneMinute(void)
uint64_t pts=getCurrentPts();
pts+=JUMP_LENGTH;
goToTime(pts);
-
+ updateSlider();
}
/**
*
*/
void ADM_flyDialog::play(bool state)
{
+ QSlider *slide=(QSlider *)_slider;
+ ADM_assert(slide);
if(state)
{
pushButton_back1mn->setEnabled(false);
pushButton_fwd1mn->setEnabled(false);
pushButton_next->setEnabled(false);
+ slide->setEnabled(false);
timer.start();
}else
{
@@ -562,6 +659,8 @@ void ADM_flyDialog::play(bool state)
pushButton_back1mn->setEnabled(true);
pushButton_fwd1mn->setEnabled(true);
pushButton_next->setEnabled(true);
+ updateSlider();
+ slide->setEnabled(true);
}
}
@@ -589,7 +688,7 @@ void ADM_flyDialog::autoZoom(bool state)
void ADM_flyDialog::timeout()
{
- bool r=nextImage();
+ bool r=nextImageInternal();
if(r)
{
timer.start();