Skip to content

Commit 0077c08

Browse files
ex-nerdex-nerd
committed
ffmpeg changed their parameters again.. audio bitrate is now in bits instead of kbits. Use the new ab parameter function where necessary.
1 parent b80ffb1 commit 0077c08

10 files changed

Lines changed: 16 additions & 12 deletions

File tree

‎nuvexport/export/ffmpeg/ASF.pm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ package export::ffmpeg::ASF;
146146
. ' -bufsize 65535'
147147
# . ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.7'
148148
. ' -acodec mp3'
149-
. ' -ab ' . $self->{'a_bitrate'}
149+
.$self->param('ab', $self->{'a_bitrate'})
150150
. " -pass 2 -passlogfile '/tmp/asf.$$.log'"
151151
. ' -f asf';
152152
}
@@ -163,7 +163,7 @@ package export::ffmpeg::ASF;
163163
# . ' -lumi_mask 0.05 -dark_mask 0.02'
164164
# . ' -scplx_mask 0.7'
165165
. ' -acodec mp3'
166-
. ' -ab ' . $self->{'a_bitrate'}
166+
.$self->param('ab', $self->{'a_bitrate'})
167167
. ' -f asf';
168168
}
169169
# Execute the (final pass) encode

‎nuvexport/export/ffmpeg/DVCD.pm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ package export::ffmpeg::DVCD;
7777
# Build the transcode string
7878
$self->{'ffmpeg_xtra'} = $self->param('bit_rate', 1150)
7979
." -vcodec mpeg1video"
80-
." -ab 224 -ar 48000 -acodec mp2"
80+
.$self->param('ab', 224)
81+
." -ar 48000 -acodec mp2"
8182
." -f vcd";
8283
# Execute the parent method
8384
$self->SUPER::export($episode, ".mpg");

‎nuvexport/export/ffmpeg/DVD.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ package export::ffmpeg::DVD;
140140
$self->{'ffmpeg_xtra'} = $self->param('bit_rate', $self->{'v_bitrate'})
141141
. ' -vcodec mpeg2video'
142142
. ' -qmin ' . $self->{'quantisation'}
143-
. ' -ab ' . $self->{'a_bitrate'}
143+
.$self->param('ab', $self->{'a_bitrate'})
144144
. " -ar 48000 -acodec mp2 -f dvd";
145145
# Execute the parent method
146146
$self->SUPER::export($episode, ".mpg");

‎nuvexport/export/ffmpeg/DivX.pm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ package export::ffmpeg::DivX;
154154
. ' -part'
155155
. ' -vtag divx'
156156
. ' -acodec mp3'
157-
. ' -ab ' . $self->{'a_bitrate'}
157+
.$self->param('ab', $self->{'a_bitrate'})
158158
. " -pass 2 -passlogfile '/tmp/divx.$$.log'"
159159
. ' -f avi';
160160
}
@@ -174,7 +174,7 @@ package export::ffmpeg::DivX;
174174
. ' -part'
175175
. ' -vtag divx'
176176
. ' -acodec mp3'
177-
. ' -ab ' . $self->{'a_bitrate'}
177+
.$self->param('ab', $self->{'a_bitrate'})
178178
. ' -f avi';
179179
}
180180
# Execute the (final pass) encode

‎nuvexport/export/ffmpeg/MP3.pm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ package export::ffmpeg::MP3;
7878
my $self = shift;
7979
my $episode = shift;
8080
# Build the ffmpeg string
81-
$self->{'ffmpeg_xtra'} = ' -ab '.$self->val('bitrate').' -acodec mp3 -f mp3';
81+
$self->{'ffmpeg_xtra'} = $self->param('ab', $self->val('bitrate'))
82+
.' -acodec mp3 -f mp3';
8283
# Execute ffmpeg
8384
$self->SUPER::export($episode, '.mp3');
8485
# Now tag it

‎nuvexport/export/ffmpeg/MP4.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ package export::ffmpeg::MP4;
299299
# Don't forget the audio, etc.
300300
$self->{'ffmpeg_xtra'} = $ffmpeg_xtra
301301
.' -acodec aac -ar 48000 -async 1'
302-
.' -ab '.$self->{'a_bitrate'};
302+
.$self->param('ab', $self->{'a_bitrate'});
303303
# Execute the (final pass) encode
304304
$self->SUPER::export($episode, '.mp4');
305305
}

‎nuvexport/export/ffmpeg/PSP.pm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ package export::ffmpeg::PSP;
168168
my $safe_title = shell_escape($episode->{'title'}.' - '.$episode->{'subtitle'});
169169
$self->{'ffmpeg_xtra'} = $self->param('bit_rate', $self->{'v_bitrate'})
170170
.' -bufsize 65535'
171-
.' -ab 32 -acodec aac'
171+
.$self->param('ab', 32)
172+
.' -acodec aac'
172173
." -f psp -title $safe_title";
173174
# Execute the parent method
174175
$self->SUPER::export($episode, '.MP4');

‎nuvexport/export/ffmpeg/SVCD.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ package export::ffmpeg::SVCD;
143143
$self->{'ffmpeg_xtra'} = $self->param('bit_rate', $self->{'v_bitrate'})
144144
.' -vcodec mpeg2video'
145145
.' -qmin ' . $self->{'quantisation'}
146-
.' -ab ' . $self->{'a_bitrate'}
146+
.$self->param('ab', $self->{'a_bitrate'})
147147
." -ar 44100 -acodec mp2"
148148
." -f svcd";
149149
# Execute the parent method

‎nuvexport/export/ffmpeg/VCD.pm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ package export::ffmpeg::VCD;
7777
# Build the transcode string
7878
$self->{'ffmpeg_xtra'} = $self->param('bit_rate', 1150)
7979
." -vcodec mpeg1video"
80-
." -ab 224 -ar 44100 -acodec mp2"
80+
.$self->param('ab', 224)
81+
." -ar 44100 -acodec mp2"
8182
." -f vcd";
8283
# Execute the parent method
8384
$self->SUPER::export($episode, ".mpg");

‎nuvexport/export/ffmpeg/XviD.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ package export::ffmpeg::XviD;
179179
}
180180
# Don't forget the audio, etc.
181181
$self->{'ffmpeg_xtra'} .= ' -acodec mp3 -async 1'
182-
.' -ab '.$self->{'a_bitrate'}
182+
.$self->param('ab', $self->{'a_bitrate'})
183183
.' -f avi';
184184
# Execute the (final pass) encode
185185
$self->SUPER::export($episode, '.avi');

0 commit comments

Comments
 (0)