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
|
--- a/src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp
+++ b/src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp
@@ -688,7 +688,7 @@
Preset="-fpre \""+Preset+"libx264-hq.ffpreset\"";
#endif
#ifdef LIBAV_08
- if (isAVCONV) Preset="-preset veryfast -refs:0 3";
+ if (isAVCONV) Preset="-pre \""+Preset+"libx264-hq.ffpreset\"";
else Preset="-preset veryfast -x264opts ref=3";
#endif
} else if (VIDEOCODECDEF[VideoCodecIndex].FFD_VCODEC==VCODEC_H264PQ) {
@@ -696,7 +696,7 @@
Preset="-fpre \""+Preset+"libx264-pq.ffpreset\"";
#endif
#ifdef LIBAV_08
- if (isAVCONV) Preset="-preset veryfast -profile:v baseline -tune:v fastdecode";
+ if (isAVCONV) Preset="-pre \""+Preset+"libx264-pq.ffpreset\"";
else Preset="-preset veryfast -x264opts ref=3 -profile:v baseline -tune:v fastdecode";
#endif
} else if (VIDEOCODECDEF[VideoCodecIndex].FFD_VCODEC==VCODEC_X264LL) {
@@ -704,7 +704,8 @@
Preset="-fpre \""+Preset+"libx264-lossless.ffpreset\"";
#endif
#ifdef LIBAV_08
- Preset="-preset veryfast -qp 0 ";
+ if (isAVCONV) Preset="-pre \""+Preset+"libx264-lossless.ffpreset\"";
+ else Preset="-preset veryfast -qp 0 ";
#endif
}
vCodec=vCodec+" "+Preset;
@@ -769,7 +770,11 @@
AudioChannels=1;
AudioFrequency=8000;
}
- if (QString(AUDIOCODECDEF[AudioCodecIndex].ShortName)==QString("aac")) aCodec=aCodec+" -strict experimental -absf aac_adtstoasc";
+ if (QString(AUDIOCODECDEF[AudioCodecIndex].ShortName)==QString("aac"))
+ if (isAVCONV)
+ aCodec=aCodec+" -strict experimental -bsf:a aac_adtstoasc";
+ else
+ aCodec=aCodec+" -strict experimental -absf aac_adtstoasc";
if (AudioFrequency!=48000) aCodec=aCodec+QString(" -ar %1").arg(AudioFrequency);
if (AudioChannels !=2) aCodec=aCodec+QString(" -ac %1").arg(AudioChannels);
|
