Showing the changes to test/encoder_binary_comparison/Scripts (1 of 8 files). Show all
Unified · Split
| @@ -54,10 +54,11 @@ runEncoderCommandInital() · 53 unmodified lines | ||
| 54 | 54 | "-frout 0" "-frout 1" "-frout 2" "-frout 3" \ |
| 55 | 55 | "-lqp 0" "-lqp 1" "-lqp 2" "-lqp 3" \ |
| 56 | 56 | -rc -fs -tarb "-ltarb 0" "-ltarb 1" "-ltarb 2" "-ltarb 3" \ |
| 57 | + "-lmaxb 0" "-lmaxb 1" "-lmaxb 2" "-lmaxb 3" \ | |
| 57 | 58 | "-slcmd 0" "-slcnum 0" "-slcmd 1" "-slcnum 1"\ |
| 58 | 59 | "-slcmd 2" "-slcnum 2" "-slcmd 3" "-slcnum 3"\ |
| 59 | 60 | -nalsize \ |
| 60 | − -iper -thread -ltr \ | |
| 61 | + -iper -thread "-loadbalancing" -ltr \ | |
| 61 | 62 | -db -denois -scene -bgd -aq ) |
| 62 | 63 | |
| 63 | 64 | aEncoderCommandName=(usagetype frms numl numtl \ |
| @@ -65,13 +66,13 @@ runEncoderCommandInital() · 1 unmodified line | ||
| 65 | 66 | frout0 frout1 frout2 frout3 \ |
| 66 | 67 | lqp0 lqp1 lqp2 lqp3 \ |
| 67 | 68 | rc FrSkip tarb ltarb0 ltarb1 ltarb2 ltarb3 \ |
| 69 | + lmaxb0 lmaxb1 lmaxb2 lmaxb3 \ | |
| 68 | 70 | slcmd0 slcnum0 slcmd1 slcnum1 \ |
| 69 | 71 | slcmd2 slcnum2 slcmd3 slcnum3 \ |
| 70 | − MaxNalSZ \ | |
| 71 | − iper thread ltr \ | |
| 72 | + MaxNalSZ \ | |
| 73 | + iper thread loadbalancing ltr \ | |
| 72 | 74 | db denois scene bgd aq ) |
| 73 | 75 | |
| 74 | − | |
| 75 | 76 | NumParameter=${#aEncoderCommandSet[@]} |
| 76 | 77 | for ((i=0;i<NumParameter; i++)) |
| 77 | 78 | do |
| @@ -94,32 +95,32 @@ runGlobalVariableInitial() · 16 unmodified lines | ||
| 94 | 95 | UnpassCaseFile="${FinalResultPath}/${TestYUVName}_unpassCaseOutput.csv" |
| 95 | 96 | UpdateSHA1TableFile="${FinalResultPath}/${TestYUVName}_UpdateSHA1Table.csv" |
| 96 | 97 | |
| 97 | − HeadLine1="EncoderFlag, DecoderFlag, FPS, BitSreamSHA1, BitSreamMD5, InputYUVSHA1, InputYUVMD5,\ | |
| 98 | + HeadLine1="EncoderFlag, DecoderFlag, FPS, BitSreamSHA1, InputYUVSHA1, \ | |
| 98 | 99 | -utype, -frms, -numl, -numtl, -sw, -sh,\ |
| 99 | 100 | -dw 0, -dh 0, -dw 1, -dh 1, -dw 2, -dh 2, -dw 3, -dh 3,\ |
| 100 | 101 | -frout 0, -frout 1, -frout 2, -frout 3,\ |
| 101 | 102 | -lqp 0, -lqp 1, -lqp 2, -lqp 3,\ |
| 102 | 103 | -rc,-fs, -tarb, -ltarb 0, -ltarb 1, -ltarb 2, -ltarb 3,\ |
| 104 | + -lmaxb 0, -lmaxb 1, -lmaxb 2, -lmaxb 3,\ | |
| 103 | 105 | -slcmd 0, -slcnum 0, -slcmd 1, -slcnum 1,\ |
| 104 | 106 | -slcmd 2, -slcnum 2, -slcmd 3, -slcnum 3,\ |
| 105 | 107 | -nalsize,\ |
| 106 | − -iper, -thread, -ltr, -db, -denois,\ | |
| 108 | + -iper, -thread, -loadbalancing, -ltr, -db, -denois,\ | |
| 107 | 109 | -scene, -bgd , -aq, " |
| 108 | 110 | |
| 109 | − HeadLine2="BitSreamSHA1, BitSreamMD5, InputYUVSHA1, InputYUVMD5,\ | |
| 111 | + HeadLine2="BitSreamSHA1, InputYUVSHA1,\ | |
| 110 | 112 | -utype, -frms, -numl, -numtl, -sw, -sh,\ |
| 111 | 113 | -dw 0, -dh 0, -dw 1, -dh 1,-dw 2, -dh 2, -dw 3, -dh 3,\ |
| 112 | 114 | -frout 0, -frout 1, -frout 2, -frout 3,\ |
| 113 | 115 | -lqp 0, -lqp 1, -lqp 2, -lqp 3,\ |
| 114 | 116 | -rc, -fs, -tarb, -ltarb 0, -ltarb 1, -ltarb 2, -ltarb 3,\ |
| 117 | + -lmaxb 0, -lmaxb 1, -lmaxb 2, -lmaxb 3,\ | |
| 115 | 118 | -slcmd 0, -slcnum 0, -slcmd 1, -slcnum 1,\ |
| 116 | 119 | -slcmd 2, -slcnum 2, -slcmd 3, -slcnum 3,\ |
| 117 | 120 | -nalsize,\ |
| 118 | − -iper, -thread, -ltr, -db, -denois,\ | |
| 121 | + -iper, -thread, -loadbalancing, -ltr, -db, -denois,\ | |
| 119 | 122 | -scene , bgd , -aq " |
| 120 | 123 | |
| 121 | − | |
| 122 | − | |
| 123 | 124 | echo ${HeadLine1}>${AllCasePassStatusFile} |
| 124 | 125 | echo ${HeadLine1}>${UnpassCaseFile} |
| 125 | 126 | echo ${HeadLine2}>${UpdateSHA1TableFile} |
| @@ -156,8 +157,8 @@ runParseCaseInfo() · 30 unmodified lines | ||
| 156 | 157 | |
| 157 | 158 | local CaseData=$@ |
| 158 | 159 | BenchmarkSHA1=`echo $CaseData |awk 'BEGIN {FS="[,\r]"} {print $1} ' ` |
| 159 | − BenchmarkYUVSHA1=`echo $CaseData |awk 'BEGIN {FS="[,\r]"} {print $3} ' ` | |
| 160 | − aEncoderCommandValue=(`echo $CaseData |awk 'BEGIN {FS="[,\r]"} {for(i=5;i<=NF;i++) printf(" %s",$i)} ' `) | |
| 160 | + BenchmarkYUVSHA1=`echo $CaseData |awk 'BEGIN {FS="[,\r]"} {print $2} ' ` | |
| 161 | + aEncoderCommandValue=(`echo $CaseData |awk 'BEGIN {FS="[,\r]"} {for(i=3;i<=NF;i++) printf(" %s",$i)} ' `) | |
| 161 | 162 | BitstreamTarget=${TempDataPath}/${TestYUVName}_codec_target.264 |
| 162 | 163 | } |
| 163 | 164 | |
| @@ -204,9 +205,7 @@ runBitStreamVerify() · 40 unmodified lines | ||
| 204 | 205 | echo -e "Bit stream SHA1 value comparison.... " |
| 205 | 206 | #******************************************* |
| 206 | 207 | TargetSHA1="NULL" |
| 207 | − TargetMD5="NULL" | |
| 208 | 208 | TargetYUVSHA1="NULL" |
| 209 | − TargetYUVMD5="NULL" | |
| 210 | 209 | |
| 211 | 210 | if [ ${EncoderFlag} -eq 1 ] |
| 212 | 211 | then |
| @@ -253,7 +252,11 @@ runSingleCasePostAction() · 40 unmodified lines | ||
| 253 | 252 | return 1 |
| 254 | 253 | fi |
| 255 | 254 | local CaseData=$@ |
| 256 | − CaseInfo=`echo $CaseData | awk 'BEGIN {FS="[,\r]"} {for(i=5;i<=NF;i++) printf(" %s,",$i)} '` | |
| 255 | + #formating for update, keep the same with origin SHA1 table | |
| 256 | + CaseInfo=`echo $CaseData | awk 'BEGIN {FS="[,\r]"} {for(i=3;i<=NF-1;i++) printf("%s,",$i)} '` | |
| 257 | + LastEncCommandOption=`echo $CaseData | awk 'BEGIN {FS="[,\r]"} {print $NF} '` | |
| 258 | + CaseInfo="${CaseInfo}${LastEncCommandOption}" | |
| 259 | + | |
| 257 | 260 | PassStatusInfo="${DiffFlag}, ${TargetSHA1}, ${BenchmarkSHA1}, ${TargetYUVSHA1}, ${BenchmarkYUVSHA1}, ${CaseInfo}, ${EncoderCommand} " |
| 258 | 261 | echo "${PassStatusInfo}">>${AllCasePassStatusFile} |
| 259 | 262 | if [ "$DiffFlag" != "0:passed!" ] |
| @@ -261,7 +264,7 @@ runSingleCasePostAction() · 1 unmodified line | ||
| 261 | 264 | echo "${PassStatusInfo}">>${UnpassCaseFile} |
| 262 | 265 | fi |
| 263 | 266 | |
| 264 | − echo "${TargetSHA1}, ${TargetMD5},${TargetYUVMD5}, ${TargetYUVSHA1},${CaseInfo}">>${UpdateSHA1TableFile} | |
| 267 | + echo "${TargetSHA1}, ${TargetYUVSHA1},${CaseInfo}">>${UpdateSHA1TableFile} | |
| 265 | 268 | #./run_SafeDelete.sh ${BitstreamTarget} >>${AllCaseConsoleLogFile} |
| 266 | 269 | } |
| 267 | 270 | |