rendered paste bodyIndex: todisc===================================================================--- todisc (revision 2162)+++ todisc (working copy)@@ -4001,20 +4001,30 @@ fi VMGM_TIME=$(vid_length "$WORK_DIR/dummy.m2v") yecho- mencoder "$WORK_DIR/dummy.m2v" -ovc copy -oac pcm -o /dev/null >>"$LOG_FILE.tmp" 2>&1 SED_VAR="Pos" cleanlog 3 yecho- BGAUDIO_CMD=(ffmpeg -f s16le -i /dev/zero -t $VMGM_TIME \- $AUDIO_OPTS -y "$WORK_DIR/dummy.$AUDIO_EXT")- yecho "${BGAUDIO_CMD[@]}"- if "${BGAUDIO_CMD[@]}" >> "$LOG_FILE.tmp" 2>&1; then #run command+ # temporarily use mp2enc for svcd audio as ffmpeg broken # FIXME+ # see r2162 todisc or older for how to fix this block when ffmpeg is fixed+ if [[ $TARGET = "dvd" ]]; then+ BGAUDIO_CMD=(ffmpeg -f s16le -i /dev/zero -t $VMGM_TIME \+ $AUDIO_OPTS -y "$WORK_DIR/dummy.$AUDIO_EXT")+ yecho "${BGAUDIO_CMD[@]}"+ "${BGAUDIO_CMD[@]}" >> "$LOG_FILE.tmp" 2>&1+ else+ # generate wav from /dev/zero+ ffmpeg -f s16le -i /dev/zero -t $VMGM_TIME -ar 48000 \+ -ac 2 -acodec pcm_s16le -y "$WORK_DIR/dummy.wav"+ BGAUDIO_CMD=(mp2enc -r 44100 -o "$WORK_DIR/dummy.$AUDIO_EXT")+ echo "Running "${BGAUDIO_CMD[@]}" < $WORK_DIR/dummy.wav" | fold -bs >> "$LOG_FILE"+ "${BGAUDIO_CMD[@]}" < "$WORK_DIR/dummy.wav" 2>&1 |fold -bs >> "$LOG_FILE.tmp"+ fi+ if [[ -s "$WORK_DIR/dummy.$AUDIO_EXT" ]]; then cleanlog 3 else cleanlog 3 runtime_error fi- MPLEX_CMD=(mplex -V -f $MPLEX_FORMAT -o "$BASEDIR/dummy.mpg" \ "$WORK_DIR/dummy.$AUDIO_EXT" "$WORK_DIR/dummy.m2v") echo "Running: "${MPLEX_CMD[@]}"" >> "$LOG_FILE.tmp"@@ -4991,11 +5001,20 @@ unset BGAUDIO_CMD TIME # convert to proper audio format-BGAUDIO_CMD=(ffmpeg -i $WORK_DIR/intro.wav \-$AUDIO_OPTS -y $WORK_DIR/intro.$AUDIO_EXT)-if "${BGAUDIO_CMD[@]}" >> "$LOG_FILE.tmp" 2>&1; then+# temporarily have to use mp2enc for svcd as ffmpeg broken FIXME+# see r2162 todisc or older for how to fix this block when ffmpeg is fixed+if [[ $TARGET = "dvd" ]]; then+ BGAUDIO_CMD=(ffmpeg -i $WORK_DIR/intro.wav \+ $AUDIO_OPTS -y $WORK_DIR/intro.$AUDIO_EXT)+ yecho "Running "${BGAUDIO_CMD[@]}"" | fold -bs >> "$LOG_FILE"+ "${BGAUDIO_CMD[@]}" >> "$LOG_FILE.tmp" 2>&1+else+ BGAUDIO_CMD=(mp2enc -r 44100 -o $WORK_DIR/intro.$AUDIO_EXT)+ "${BGAUDIO_CMD[@]}" < "$WORK_DIR/intro.wav" 2>&1 |fold -bs >> "$LOG_FILE.tmp"+fi+if [[ -s $WORK_DIR/intro.$AUDIO_EXT ]]; then cleanlog 3- else+else cleanlog 3 runtime_error fi