Ticket #26454: patch-src-makempg.diff

./src/makempg

@@ -289 +289 @@
 # Args: $@ == text string containing complete command-line
 # To filter/prettify the subprocess output before writing it to the log file,
 # set the LOG_FILTER variable before calling this function, to e.g.
-#    LOG_FILTER="sed {s/\r/\n/g}"    # Replace LF with CR/LF
+#    LOG_FILTER="gsed {s/\r/\n/g}"    # Replace LF with CR/LF
 # ******************************************************************************
-CRLF="sed {s/\r/\n/g}"  # Turn carriage-returns into newlines
+CRLF="gsed {s/\r/\n/g}"  # Turn carriage-returns into newlines
 FOLD="fold -bs"
 function cmd_exec()
 {
@@ -338 +338 @@
     # based on original file size
     $SLICE && VIDEO_DURATION=$CLIP_LENGTH || VIDEO_DURATION=$V_DURATION
     if test "$VIDEO_DURATION" = "0"; then
-        CUR_SIZE=$(du -Dck \"$IN_FILE\" | awk 'END{print $1}')
+        CUR_SIZE=$(gdu -Dck \"$IN_FILE\" | awk 'END{print $1}')
         NEED_SPACE=$(expr $CUR_SIZE \* 2)
         yecho  "The encoding process will require about"
     # Estimate space based as kbps * duration
@@ -441 +441 @@
                 ;;
             "-safe" )
                 shift
-                SAFE_AREA=$(echo $1 | sed 's/%//g')
+                SAFE_AREA=$(echo $1 | gsed 's/%//g')
                 ;;
             "-crop" )
                 USE_FILTERS=1
@@ -452 +452 @@
                 USE_FILTERS=1
                 shift
                 # Parse comma-separated values
-                for FILTER in $(echo "$1" | sed 's/,/ /g'); do
+                for FILTER in $(echo "$1" | gsed 's/,/ /g'); do
                     case "$FILTER" in
                         "none" )
                             DO_DENOISE=false
@@ -532 +532 @@
             "-subtitles" )
                 shift
                 if test -e "$1"; then
-                    SUBS_FILE=$(readlink -f "$1")
+                    SUBS_FILE=$(greadlink -f "$1")
                     SUBTITLES="-sub \"$SUBS_FILE\""
                     DO_SUBS=:
                 else
@@ -675 +675 @@
 {
     # Get total size of all output files
     cd "$(dirname "$OUT_FILENAME")"
-    FINAL_SIZE=$(du -c -k "$OUT_PREFIX"*.mpg | awk 'END{print $1}')
+    FINAL_SIZE=$(gdu -c -k "$OUT_PREFIX"*.mpg | awk 'END{print $1}')
     test -z $FINAL_SIZE && FINAL_SIZE=0
 
     if $FAKE; then
         :
     else
         yecho "Output files:"
-        du -shc "$OUT_PREFIX".mpg "$OUT_PREFIX".[0-9].mpg 2>/dev/null
+        gdu -shc "$OUT_PREFIX".mpg "$OUT_PREFIX".[0-9].mpg 2>/dev/null
     fi
 
     # Create stats directory if it doesn't already exist.
@@ -747 +747 @@
         # get lines with frame= , and print last field with kbit/s removed
         bitrates=$(awk -F= '/^frame=/ {gsub("kbits/s", ""); print $NF}' "$LOG_FILE")
         # get highest value, and remove spaces with sed
-        bitrates=$(sort -un <<< "$bitrates" | sed 's/^[ \t]*//;s/[ \t]*$//')
+        bitrates=$(sort -un <<< "$bitrates" | gsed 's/^[ \t]*//;s/[ \t]*$//')
         # average the values.  Add 000, so it is in bits.
         AVG_BITRATE=$(awk '{t+=$0} END{printf "%d\n", t/NR}' <<< "$bitrates")
         AVG_BITRATE=${AVG_BITRATE}000
@@ -903 +903 @@
     IN_FILE_TYPE="uri"
 else
     IN_FILE_TYPE="file"
-    IN_FILE=$(readlink -f "$IN_FILE")
+    IN_FILE=$(greadlink -f "$IN_FILE")
 fi
 
 
@@ -928 +928 @@
     OUT_PREFIX="$OUTPUT_DIR/$OUT_PREFIX"
 # Otherwise, use the full qualified pathname
 else
-    OUT_PREFIX=$(readlink -f "$OUT_PREFIX")
+    OUT_PREFIX=$(greadlink -f "$OUT_PREFIX")
     mkdir -p "$(dirname "$OUT_PREFIX")"
 fi
 
@@ -1109 +1109 @@
     yecho "Probing video for information. This may take several minutes..."
 
     # Get an MD5sum of the input file for statistics
-    IN_FILE_MD5=$(md5sum "$IN_FILE" | awk '{print $1}')
+    IN_FILE_MD5=$(gmd5sum "$IN_FILE" | awk '{print $1}')
 
     # Assume nothing is compliant unless idvid says so
     # (these will be overridden by idvid for compliant A/V)
@@ -1737 +1737 @@
 
 # Remove extraneous commas from filter command
 if test -n "$VID_FILTER"; then
-    VID_FILTER="-vf $(echo "$VID_FILTER" | sed -e 's/,,/,/g' -e 's/^,//')"
+    VID_FILTER="-vf $(echo "$VID_FILTER" | gsed -e 's/,,/,/g' -e 's/^,//')"
 fi
 # ******************************************************************************
 #
@@ -2113 +2113 @@
 # ******************************************************************************
 
 if ! $FAKE; then
-    AUDIO_SIZE=$(du -c -b "$AUDIO_STREAM" | awk 'END{print $1}')
-    VIDEO_SIZE=$(du -c -b "$VIDEO_STREAM" | awk 'END{print $1}')
+    AUDIO_SIZE=$(gdu -c -b "$AUDIO_STREAM" | awk 'END{print $1}')
+    VIDEO_SIZE=$(gdu -c -b "$VIDEO_STREAM" | awk 'END{print $1}')
     # Total size of streams so far (in MBytes)
     STREAM_SIZE=$(expr \( $AUDIO_SIZE \+ $VIDEO_SIZE \) \/ 1000000)
     # If it exceeds disc size, add '%d' field to allow mplex to split output
     if test $STREAM_SIZE -gt $DISC_SIZE; then
-        OUT_FILENAME=$(echo "$OUT_FILENAME" | sed -e 's/\.mpg$/.%d.mpg/')
+        OUT_FILENAME=$(echo "$OUT_FILENAME" | gsed -e 's/\.mpg$/.%d.mpg/')
     fi
 fi