Changes of Revision 53

ffhevc.changes Changed
x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Tue May 16 08:57:00 UTC 2017 - neutrino8@opensuse.org
4
+
5
+- Update to version 3.2.7
6
+  * Added support for FFmpeg's internal Opus audio encoder
7
+
8
+-------------------------------------------------------------------
9
 Sun May 14 09:36:00 UTC 2017 - neutrino8@opensuse.org
10
 
11
 - Update to version 3.2.6
12
ffhevc.spec Changed
10
 
1
@@ -17,7 +17,7 @@
2
 
3
 
4
 Name:           ffhevc
5
-Version:        3.2.6
6
+Version:        3.2.7
7
 Release:        0
8
 Summary:        A small shell script for encoding to H.265/HEVC with ffmpeg
9
 License:        GPL-2.0+
10
ffhevc-3.2.6.tar.gz/ChangeLog -> ffhevc-3.2.7.tar.gz/ChangeLog Changed
8
 
1
@@ -1,3 +1,6 @@
2
+2017-05-16 - ffhevc 3.2.7
3
+   * Added support for FFmpeg's internal Opus audio encoder
4
+   
5
 2017-05-14 - ffhevc 3.2.6
6
    * Bugfix in the software scale code. Use an if conditional
7
      to check for an y/n answer
8
ffhevc-3.2.6.tar.gz/ffhevc -> ffhevc-3.2.7.tar.gz/ffhevc Changed
175
 
1
@@ -2,8 +2,8 @@
2
 #
3
 # Small script to encode to H.265/HEVC video using FFmpeg and libx265.
4
 # Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>
5
-# Version: 3.2.6
6
-# Date: 2017-05-14
7
+# Version: 3.2.7
8
+# Date: 2017-05-16
9
 #
10
 # ffhevc is free software ; you can redistribute it and/or modify
11
 # it under the terms of the GNU General Public License as published by
12
@@ -24,7 +24,7 @@
13
 brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }
14
 error() { echo -e "\e[1;31m$1\e[0;39;49m"; }
15
 
16
-version="3.2.6"
17
+version="3.2.7"
18
 
19
 CFG="$HOME/.ffhevc"
20
 cfgversion="34"
21
@@ -1685,7 +1685,8 @@
22
        echo " DTS -----> Channels Support: 6 (codec max)"
23
        echo " AAC -----> Channels Support: 8 (ffmpeg max)"
24
        echo " FDK-AAC -> Channels Support: 8 (ffmpeg max)"
25
-       echo " Opus ----> Channels Support: 8 (ffmpeg max)"
26
+       echo " Libopus -> Channels Support: 8 (ffmpeg max)"
27
+       echo " Opus ----> Channels Support: 2 (encoder max)"
28
        echo " Vorbis --> Channels Support: 8 (ffmpeg max)"
29
        echo " MP3 -----> Channels Support: 2 (codec max)"
30
        echo " TrueHD --> Channels Support: 6 (encoder max)"
31
@@ -1756,12 +1757,18 @@
32
            abropts[i]="32-320"
33
            abrdef[i]="320"
34
            ;;
35
-           opus)
36
+           libopus)
37
            acdc[i]="libopus"
38
            ameta[i]="Opus"
39
            abropts[i]="6-512"
40
            abrdef[i]="384"
41
            ;;
42
+           opus)
43
+           acdc[i]="opus"
44
+           ameta[i]="Opus"
45
+           abropts[i]="6-512"
46
+           abrdef[i]="192"
47
+           ;;
48
            vorbis)
49
            acdc[i]="libvorbis"
50
            ameta[i]="Vorbis"
51
@@ -1827,17 +1834,17 @@
52
            case "$c" in
53
                ts|mts|m2ts)
54
                case "${acodec[i]}" in
55
-                   alac|opus) conerror_func ;;
56
+                   alac|libopus|opus) conerror_func ;;
57
                esac
58
                ;;
59
                mp4)
60
                case "${acodec[i]}" in
61
-                   pcm|opus|truehd|alac) conerror_func ;;
62
+                   pcm|libopus|opus|truehd|alac) conerror_func ;;
63
                esac
64
                ;;
65
                mov)
66
                case "${acodec[i]}" in
67
-                   pcm|opus|flac|truehd) conerror_func ;;
68
+                   pcm|libopus|opus|flac|truehd) conerror_func ;;
69
                esac
70
                ;;
71
            esac
72
@@ -1884,7 +1891,7 @@
73
            esac
74
            
75
            case "${acodec[i]}" in
76
-               ac3|eac3|truehd|dts|aac|fdk*|mp3|vorbis|opus|"")
77
+               ac3|eac3|truehd|dts|aac|fdk*|mp3|vorbis|libopus|opus|"")
78
                printf "Track $i: Specify the Audio Bitrate in kbps [${abropts[i]} - default is ${abrdef[i]}]: "
79
                read abr[i]
80
                test -z "${abr[i]}" && abitrate[i]="${abrdef[i]}k" || abitrate[i]="${abr[i]}k"
81
@@ -1894,15 +1901,15 @@
82
            esac
83
            
84
            case "${acodec[i]}" in
85
-               ac3|eac3|"")            chanrange[i]="1-6"; defchan[i]="6" ;;
86
-               aac|opus|vorbis|flac|alac|pcm)  chanrange[i]="1-8"; defchan[i]="8" ;;
87
-               mp3)                chanrange[i]="1-2"; defchan[i]="2" ;;
88
-               truehd)             chanrange[i]="2/5/6"; defchan[i]="6" ;;
89
-               dts)                chanrange[i]="1/2/4/5/6"; defchan[i]="6" ;;
90
+               ac3|eac3|"")                chanrange[i]="1-6"; defchan[i]="6" ;;
91
+               aac|libopus|vorbis|flac|alac|pcm)   chanrange[i]="1-8"; defchan[i]="8" ;;
92
+               mp3|opus)               chanrange[i]="1-2"; defchan[i]="2" ;;
93
+               truehd)                 chanrange[i]="2/5/6"; defchan[i]="6" ;;
94
+               dts)                    chanrange[i]="1/2/4/5/6"; defchan[i]="6" ;;
95
                fdk*)
96
                case "${aacprof[i]}" in
97
-                   aac_low|aac_he|aac_ld)  chanrange[i]="1-8"; defchan[i]="8" ;;
98
-                   *)          chanrange[i]="1-2"; defchan[i]="2" ;;
99
+                   aac_low|aac_he|aac_ld)      chanrange[i]="1-8"; defchan[i]="8" ;;
100
+                   *)              chanrange[i]="1-2"; defchan[i]="2" ;;
101
                esac
102
                ;;
103
            esac
104
@@ -1963,12 +1970,20 @@
105
                    ;;
106
                esac
107
                ;;
108
-               mp3)
109
+               mp3|opus)
110
                case "${ach[i]}" in
111
                    1|2) true ;;
112
                    *)
113
-                   error "-> MP3 supports only 1-2 channels!"
114
-                   exit 1
115
+                   case "${acodec[i]}" in
116
+                       mp3)
117
+                       error "-> MP3 supports only 1-2 channels!"
118
+                       exit 1
119
+                       ;;
120
+                       opus)
121
+                       error "-> Internal Opus encoder supports only 1-2 channels!"
122
+                       exit 1
123
+                       ;;
124
+                   esac
125
                    ;;
126
                esac
127
                ;;
128
@@ -2102,7 +2117,7 @@
129
                    ;;
130
                esac
131
                ;;
132
-               opus)
133
+               libopus)
134
                echo " 0 -> Mono     4 -> 5.0   8 -> 7.1"
135
                echo " 1 -> Stereo   5 -> 5.1"
136
                echo " 2 -> 3.0      6 -> 6.1"
137
@@ -2126,7 +2141,7 @@
138
                    ;;
139
                esac
140
                ;;
141
-               mp3)
142
+               mp3|opus)
143
                echo " 0 -> Mono"
144
                echo " 1 -> Stereo"
145
                echo
146
@@ -2290,6 +2305,19 @@
147
                    brown " Supported Sample Rates"
148
                    brown " ~~~~~~~~~~~~~~~~~~~~~~"
149
                    case "${acodec[i]}" in
150
+                       opus)
151
+                       echo " 0 -> 48000 Hz"
152
+                       echo
153
+                       printf "Track $i: Specify the Audio Sample Rate option [default is 0]: "
154
+                       read arate[i]
155
+                       case "${arate[i]}" in
156
+                           0|"")   audhz[i]="48000" ;;
157
+                           *)
158
+                           error "-> Invalid option!"
159
+                           exit 1
160
+                           ;;
161
+                       esac
162
+                       ;;
163
                        ac3|eac3|"")
164
                        echo " 0 -> 32000 Hz"
165
                        echo " 1 -> 44100 Hz"
166
@@ -2387,7 +2415,7 @@
167
                            ;;
168
                        esac
169
                        ;;
170
-                       opus)
171
+                       libopus)
172
                        echo " 0 -> 8000 Hz"
173
                        echo " 1 -> 12000 Hz"
174
                        echo " 2 -> 16000 Hz"
175