From dedaf1ced7ed8fc7a1a304fd9a8176fd232f7a7c Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Fri, 18 Nov 2016 04:52:22 -0800 Subject: [PATCH] Modify audio_processing_unittest to use ResourcePath instead of ProjectRootPath. Move the resources to //resources and upload them to Google Storage. BUG=webrtc:6727 Review-Url: https://codereview.webrtc.org/2508943004 Cr-Commit-Position: refs/heads/master@{#15152} --- .gitignore | 1 + data/audio_processing/output_data_fixed.pb | Bin 308 -> 0 bytes data/audio_processing/output_data_float.pb | Bin 15595 -> 0 bytes data/audio_processing/output_data_mac.pb | Bin 15586 -> 0 bytes .../audio_processing/output_data_fixed.pb.sha1 | 1 + .../audio_processing/output_data_float.pb.sha1 | 1 + .../audio_processing/output_data_mac.pb.sha1 | 1 + webrtc/modules/BUILD.gn | 6 +++--- .../audio_processing_unittest.cc | 16 ++++++---------- 9 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 data/audio_processing/output_data_fixed.pb delete mode 100644 data/audio_processing/output_data_float.pb delete mode 100644 data/audio_processing/output_data_mac.pb create mode 100644 resources/audio_processing/output_data_fixed.pb.sha1 create mode 100644 resources/audio_processing/output_data_float.pb.sha1 create mode 100644 resources/audio_processing/output_data_mac.pb.sha1 diff --git a/.gitignore b/.gitignore index 958c71d86f..6722d69888 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ /resources/**/*.frames /resources/**/*.gai /resources/**/*.jpg +/resources/**/*.pb /resources/**/*.pcap /resources/**/*.pcm /resources/**/*.rtp diff --git a/data/audio_processing/output_data_fixed.pb b/data/audio_processing/output_data_fixed.pb deleted file mode 100644 index 93a9378d2e258c603e2252dc4163ae5c0510235e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmXqDWMJSD=U^0IlwediU}sQoaZ<#A!Q&uH07C^rqM;TjaaR;5aUUWf0oBp)ixH$n z3@Gy+p@m6;31Zd;382IQR0*(I^CW>19}#AObU@5nAqA9q3Dd%a%Uuu&uvzy&?s^V0 g3o3zd*C&KosP5W~DgicYF34S95N4sd>kU{202y6EhyVZp diff --git a/data/audio_processing/output_data_float.pb b/data/audio_processing/output_data_float.pb deleted file mode 100644 index b5fe04275ced7811f04411f69e96e78a876e2d41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15595 zcmeHO&1(}u6rWw2blg^*q{dE@O)`xK4_d7hN)NS-ABWuZTs+mw9=sO32o*%FUOkB* z_<@)Dfg*Yl{Tn=3DvF?jdQ%ZaMeCdWn%QM*JKNSK?F0g|!_1rAWPk7X-u&LYA4bT! zg0VpiYOtpx{pXFLXPx!WW@Fksg2o;j)-HT`&i@!hG^uDZ(abB2E-H<#DUI$!X!1$R z-~VyNpFf8)@_&?JnPLui%U#{9yOzV2++{Hfel3K?ntinm@?B@x26(o}E7{Eqc(zEF z#f-Gi)-tP&Z^Ve;GXD#g-gE|?1I{6*>=fWzn%FU28a;um-&x;7OrGqYGKOw!u75Ba zx3q^4o-f%SuCRwoh1sl(qAbe-in`>kF4mRgA*`A0`^E+>j2U5+F_y;|6HGA}z_^D{ z+LJub^(+mTXA_&+%+43_FF`0-Fd#0$5+d8c5`sHG@=aL`^;t95hR2r0((>Jt54tvj z0{ktp>GV4zfWQEM7w=a&{{Dpc`)P2Bey#z?-=T=B7g&@65)D9){+0zcO$H=?Z5+H%B$8$#c|m#?YrNI!A2=0)!k}J!@=}BfB=%wz4_u|6R?D zKAX9+Icm$Smfk}oq_)lg_=kgz?QC^()Neg*jylU@WbPp#M?C``B3J)tHtuVNULy=$ zkbzZT1;`LPe z8B$Y;1T!#CT)K2h!2kjSh*)3%dF!pZf%MqIB5Dqr&Thy*_q*7#o#I61t;@bILTo|) zdDa+ukmulfsKKSdwI0CL8Eoz#viN3zD1c|sjDhR=ml(Jpw}jaCuFG7vHMrIzxOz!1 z?Pa|Y<|>gQEiJ@cKSWB&nM+*y%vD;5xx@_ezYMs{)meV^^5{s4roZNJZALb{wYCW!KqdH{SKIVFgr{xZbfpzt{UGO7f{3-W z;?b-@!>Wn3F0CYN(E{kw^v0x>^P#rsf|Qn8N87v(Qdbwm%e(^u%>@Po&6xc1 z`b{9e_}KEa%|}|>)Zo&E1EIQ-bh0Es)coK&6>6J4xMXefj@CBCj!sM0%_=dM);1R{ zbB5^i>J4JrCZ2P(&FL(J=3D>RJGox;PjK;7!I0FDtT!QDGG*8H*o& z@-{GzDIT-LU?)Sf?jkh02u)hVJv$YzOUr^vZ-O|_&qY-jg|agLJe7CQiI2Z5q&$${IlAn9{On_R_9|#P!%iJa QM0tTIFJgQC8v;G!FX&!r@&Et; diff --git a/data/audio_processing/output_data_mac.pb b/data/audio_processing/output_data_mac.pb deleted file mode 100644 index b7359b039ea8fdb71ae93e28f2d5221acd2e03a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15586 zcmeHO&2JM&6rWk*^<QA;hOpE7V>pdgx!!LlFqLP*v@%MU~ppkML$^cV~9BG?|S9b~2VM&5mZ??ArT# zzxU?%=J6qfyo-cjiW%nLE-ieD7r&qC{pR#lZyTyRd}UUCo_8244>)NiKlmY+=E{Wp~0xHwnM+`3f}?G zmU$&-IEH7-ba@cFg-BS#@35pW@ZLk?GgiC=O9Wn8_&q85-?0808B z3T#FgfJgz*q*(w~4S+rn;Dv=80RM0V1OEP+V8Aad11i*623$V_KFczox-@1$HI)i3 zRhR#7sel31RAWo!!_FcA?hBVS2K@8mj$ptjM|GGZa@2Ep@z*zOjyehi2syTS);OU@ zb`yMJb92;}yPA`IHfM8l)UjEuyoV@AZNmfLAKnT5aA%aGe%Oj~)cYbv79Ij})HC2A z>b+l_{+E`aw+KTwbzn7l6Eeh_-c{o@8S2hMuGyts*5zHuQLD7ds!@*W(>COv%`Sm? zHI@!vhT#DXSil2FO*Im%z&v#s(J2E12n-Pl zR*pQ0*!Mw-EyzF5;>9}+0j{qsxGcD~1GuJ=%^gJ7-%Jn%@JyOHaQ*l+2QJ7hA-268 zG1n~%uI&h}IXcJY_*{m$+O);mYcbbfDy0<6r7mOUYOlpyY6g8-1|sH~3LZWDV5vki z-g`|j8SaI=F=4Lu%BfX9&Kn)8ZHiQJ)U;XiywPf#nGJ8NZGs0d34U|h=G9c&lpaEA zn^z)f#a2J)xs@VfE3HVH#VoCw*y_?s!4@rmu1s%ETG^Run=$^Rwt3%bo8leIxOxk~ zZCqS{)Gm!lvjCwv0KT7Un=t^bwrNyjXp0MqiVM`9sgaIYP+U;b()ehb_>)B2bRy-# zYMY~kKdWtGE!=O^$=IlkB{b;`Jex@hy5`uNws}0&Hl>G<+U8TMZEmR$*=n0YQ!P?g z*Tl;U2PB#c3`m+e`K6U=n=!Vew)wTyHZ8bp;Xtac6rC(d5cOhkeV1yRF}SR@IZCnZ zuuhH`F_+ag*DZ6V=#%vZIc@WT)HW}<5Ryj~Z<4vLHhMof{cBsHaKKy~%mnZb7loIB zu3T+qnfXpzk6$^cGRCg-B6^1zZPN7G+?7sPo7H2F4^ zqsielItkTe@o-U1)}bBN;hpSBDWS>dPD;&!0a=bF3~1$OuhhV?2Kh$>5aNR=4GuJR cFAu$Ml1!;x(WDvf4|{0^Kx<`s6?RwfbJr_iLI3~& diff --git a/resources/audio_processing/output_data_fixed.pb.sha1 b/resources/audio_processing/output_data_fixed.pb.sha1 new file mode 100644 index 0000000000..a790bb5da0 --- /dev/null +++ b/resources/audio_processing/output_data_fixed.pb.sha1 @@ -0,0 +1 @@ +31f83357d6f5a78c7eb828c8073ce35f7cd2b1fa \ No newline at end of file diff --git a/resources/audio_processing/output_data_float.pb.sha1 b/resources/audio_processing/output_data_float.pb.sha1 new file mode 100644 index 0000000000..dd2e4d33e4 --- /dev/null +++ b/resources/audio_processing/output_data_float.pb.sha1 @@ -0,0 +1 @@ +c2907879eee3f1abeeb1fe2e29dd25bdb4ef5961 \ No newline at end of file diff --git a/resources/audio_processing/output_data_mac.pb.sha1 b/resources/audio_processing/output_data_mac.pb.sha1 new file mode 100644 index 0000000000..f2efccd300 --- /dev/null +++ b/resources/audio_processing/output_data_mac.pb.sha1 @@ -0,0 +1 @@ +eb0db8379eb703a49cd08d6c5c53a15a6cfc6b9f \ No newline at end of file diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn index 9120541041..042b38e4bd 100644 --- a/webrtc/modules/BUILD.gn +++ b/webrtc/modules/BUILD.gn @@ -138,9 +138,6 @@ if (rtc_include_tests) { } modules_unittests_resources = [ - "//data/audio_processing/output_data_fixed.pb", - "//data/audio_processing/output_data_float.pb", - "//data/audio_processing/output_data_mac.pb", "//data/voice_engine/audio_tiny48.wav", "//resources/att-downlink.rx", "//resources/att-uplink.rx", @@ -161,6 +158,9 @@ if (rtc_include_tests) { "//resources/audio_processing/agc/agc_vad.dat", "//resources/audio_processing/agc/agc_voicing_prob.dat", "//resources/audio_processing/agc/agc_with_circular_buffer.dat", + "//resources/audio_processing/output_data_fixed.pb", + "//resources/audio_processing/output_data_float.pb", + "//resources/audio_processing/output_data_mac.pb", "//resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm", "//resources/audio_processing/transient/audio16kHz.pcm", "//resources/audio_processing/transient/audio32kHz.pcm", diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc index fb2f214bed..139aa9daaf 100644 --- a/webrtc/modules/audio_processing/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc @@ -391,7 +391,6 @@ class ApmTest : public ::testing::Test { void VerifyDebugDumpTest(Format format); const std::string output_path_; - const std::string ref_path_; const std::string ref_filename_; std::unique_ptr apm_; AudioFrame* frame_; @@ -407,21 +406,18 @@ class ApmTest : public ::testing::Test { ApmTest::ApmTest() : output_path_(test::OutputPath()), -#ifndef WEBRTC_IOS - ref_path_(test::ProjectRootPath() + "data/audio_processing/"), -#else - // On iOS test data is flat in the project root dir - ref_path_(test::ProjectRootPath()), -#endif #if defined(WEBRTC_AUDIOPROC_FIXED_PROFILE) - ref_filename_(ref_path_ + "output_data_fixed.pb"), + ref_filename_(test::ResourcePath("audio_processing/output_data_fixed", + "pb")), #elif defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE) #if defined(WEBRTC_MAC) // A different file for Mac is needed because on this platform the AEC // constant |kFixedDelayMs| value is 20 and not 50 as it is on the rest. - ref_filename_(ref_path_ + "output_data_mac.pb"), + ref_filename_(test::ResourcePath("audio_processing/output_data_mac", + "pb")), #else - ref_filename_(ref_path_ + "output_data_float.pb"), + ref_filename_(test::ResourcePath("audio_processing/output_data_float", + "pb")), #endif #endif frame_(NULL),