Skip to content

Commit 047e831

Browse files
dericeddericed
authored
Merge pull request #6 from amiaopensource/so-many-updates
So many updates
2 parents bcf1eac + 288b2ff commit 047e831

1 file changed

Lines changed: 24 additions & 14 deletions

File tree

‎astataudit‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fi
7676

7777
_add_column(){
7878
IF_FULL="n"
79-
unset RELABEL
79+
unset RELABEL AS_PERCENT ROUND
8080
OPTIND=1
8181
while getopts "fr:PH" opt ; do
8282
case "${opt}" in
@@ -131,10 +131,10 @@ _add_column(){
131131
_report -w "Unexpected error in _add_column, REPORT_SOURCE=(${REPORT_SOURCE}), SECTION=(${SECTION}), KEY=(${KEY})"
132132
CSV_VALUE=""
133133
fi
134-
if [[ "${AS_PERCENT}" == "Y" ]] ; then
135-
CSV_VALUE="$(echo "${CSV_VALUE}" | awk '{printf "%.2f%%\n", $1 * 100}')"
136-
elif [[ "${ROUND}" == "Y" ]] ; then
137-
CSV_VALUE="$(echo "${CSV_VALUE}" | awk '{printf "%.2f"}')"
134+
if [[ "${AS_PERCENT}" == "Y" && -n "${CSV_VALUE}" ]] ; then
135+
CSV_VALUE="$(echo "${CSV_VALUE}" | awk '{printf "%.2f%%", $1 * 100}')"
136+
elif [[ "${ROUND}" == "Y" && -n "${CSV_VALUE}" ]] ; then
137+
CSV_VALUE="$(echo "${CSV_VALUE}" | awk '{printf "%.2f", $1}')"
138138
fi
139139
CSV_ROW+="${CSV_VALUE},"
140140
fi
@@ -557,14 +557,15 @@ _make_graph(){
557557
done
558558
GRAPH_FILTER="asplit=3[j][k][l];
559559
`#timeline`
560-
color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT}${TIMELINE},split=6[top1][top2][top3][top4][top5][top6];
560+
color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT}${TIMELINE},split=7[top1][top2][top3][top4][top5][top6][top7];
561561
color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT_BIG},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=36:text='Audio QC Graph\: Filename\: ${BASENAME}, Duration\: $(_ss_to_hhmmss "${DURATION}"), Audio Frame Size Displayed\: ${AUDIO_FRAME_SIZE}'[Header];
562562
`#peak/rms left`color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=24:text='Channel 1 Level, -144 to 0 dBFS, Blue=peak, Yellow=RMS'[peakLH];
563563
`#peak/rms right`color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=24:text='Channel 2 Level, -144 to 0 dBFS, Purple=peak, Yellow=RMS'[peakRH];
564564
`#min/max`color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=24:text='Audio Min/Max Level -1...1. Blue=channel 1, Purple=channel 2.'[minmaxH];
565+
`#zero crossing rate`color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=24:text='Ratio of Zero Crossing Count to Sample Rate. Blue=channel 1, Purple=channel 2.'[zeroH];
565566
`#phase`color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=24:text='Correlation, -1 to 1'[phaseH];
566567
`#dc offset`color=c=${BORDER_COLOR}:s=${GRAPH_W}x${HEADER_HEIGHT},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=24:text='DC Offset, -0.01 to 0.01 dBFS offset in the mean displacement from 0'[dcoffH];
567-
[j]${AUDIOFORMAT},astats=metadata=1:reset=1,asplit=3[astats1][astats2][astats3];
568+
[j]${AUDIOFORMAT},astats=metadata=1:reset=1,asplit=4[astats1][astats2][astats3][astats4];
568569
[astats1]adrawgraph=${DRAWGRAPH_SETTINGS}:
569570
m1=lavfi.astats.1.Peak_level:fg1=0xFFE6D8AD:
570571
m2=lavfi.astats.1.RMS_level:fg2=0xFF00FFFF:
@@ -587,6 +588,12 @@ _make_graph(){
587588
min=-1:max=1:
588589
slide=picture:
589590
s=${GRAPH_W}x${GRAPH_H},${HORIZONTAL_MARKINGS_240}[minmax1];
591+
[astats4]adrawgraph=${DRAWGRAPH_SETTINGS}:
592+
m1=lavfi.astats.1.Zero_crossings_rate:fg1=0xFFE6D8AD:
593+
m2=lavfi.astats.2.Zero_crossings_rate:fg2=0xFFFF00FF:
594+
min=0:max=1:
595+
slide=picture:
596+
s=${GRAPH_W}x${GRAPH_H},${HORIZONTAL_MARKINGS_240}[zero1];
590597
[k]${AUDIOFORMAT},astats=metadata=1,adrawgraph=${DRAWGRAPH_SETTINGS}:
591598
m1=lavfi.astats.1.DC_offset:fg1=0xFFE6D8AD:
592599
m2=lavfi.astats.2.DC_offset:fg2=0xFFFF00FF:
@@ -603,20 +610,23 @@ _make_graph(){
603610
[top1][peakLH][peakL1]
604611
[top2][peakRH][peakR1]
605612
[top3][minmaxH][minmax1]
606-
[top4][phaseH][phase1]
607-
[top5][dcoffH][dcoff1]
608-
[top6]vstack=17,drawgrid=thickness=1:color=gray@0.5:width=iw/${VERTICAL_MARKINGS},drawgrid=thickness=1:color=${BORDER_COLOR}@0.2:width=(iw/${VERTICAL_MARKINGS})/10[graph];
613+
[top4][zeroH][zero1]
614+
[top5][phaseH][phase1]
615+
[top6][dcoffH][dcoff1]
616+
[top7]vstack=20,drawgrid=thickness=1:color=gray@0.5:width=iw/${VERTICAL_MARKINGS},drawgrid=thickness=1:color=${BORDER_COLOR}@0.2:width=(iw/${VERTICAL_MARKINGS})/10[graph];
609617
color=c=${BORDER_COLOR}:s=${PAD_W}x${HEADER_HEIGHT_BIG}[HeaderG];
610-
color=c=${BORDER_COLOR}:s=${PAD_W}x${HEADER_HEIGHT},split=11[top1G][top2G][top3G][top4G][top5G][top6G][peakLHG][peakRHG][minmaxHG][phaseHG][dcoffHG];
618+
color=c=${BORDER_COLOR}:s=${PAD_W}x${HEADER_HEIGHT},split=13[top1G][top2G][top3G][top4G][top5G][top6G][top7G][peakLHG][peakRHG][minmaxHG][zeroHG][phaseHG][dcoffHG];
619+
`#0-0.1_240p_grat`color=c=${BORDER_COLOR}:s=${PAD_W}x${GRAPH_H},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.52:x=w*0.7:text='0.050',drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.77:x=w*0.7:text='0.025',drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.27:x=w*0.7:text='0.075',drawgrid=thickness=1:color=black@0.2:height=ih/16,drawgrid=thickness=1:color=black@0.5:height=ih/4,drawgrid=thickness=1:color=black@0.8:height=ih/2[zero1G];
611620
`#1-1_240p_grat`color=c=${BORDER_COLOR}:s=${PAD_W}x${GRAPH_H},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.52:x=w*0.7:text='0',drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.77:x=w*0.7:text='-0.5',drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.27:x=w*0.7:text='+0.5',drawgrid=thickness=1:color=black@0.2:height=ih/16,drawgrid=thickness=1:color=black@0.5:height=ih/4,drawgrid=thickness=1:color=black@0.8:height=ih/2,split=3[minmax1G][phase1G][dcoff1G];
612621
`#-144-0_240p_grat`color=c=${BORDER_COLOR}:s=${PAD_W}x${GRAPH_H},drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.52:x=w*0.7:text='-72',drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.77:x=w*0.7:text='-108',drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.27:x=w*0.7:text='-36',drawtext=fontfile=${FONT_FILE}:fontcolor=black:fontsize=${TIMELINE_FONTSIZE}:y=h*0.02:x=w*0.7:text='0',drawgrid=thickness=1:color=black@0.2:height=ih/16,drawgrid=thickness=1:color=black@0.5:height=ih/4,drawgrid=thickness=1:color=black@0.8:height=ih/2,split=2[peakL1G][peakR1G];
613622
[HeaderG]
614623
[top1G][peakLHG][peakL1G]
615624
[top2G][peakRHG][peakR1G]
616625
[top3G][minmaxHG][minmax1G]
617-
[top4G][phaseHG][phase1G]
618-
[top5G][dcoffHG][dcoff1G]
619-
[top6G]vstack=17[grat];
626+
[top4G][zeroHG][zero1G]
627+
[top5G][phaseHG][phase1G]
628+
[top6G][dcoffHG][dcoff1G]
629+
[top7G]vstack=20[grat];
620630
[grat][graph]hstack=2[chart]"
621631
ffmpeg "${FFMPEG_VERBOSE[@]}" -nostdin -y -i "$FILENAME" -filter_complex "${GRAPH_FILTER}" \
622632
-map "[chart]" -vframes 1 "${OUTPUT_GRAPH}"

0 commit comments

Comments
 (0)