update camera video audio

Signed-off-by: Nredjie <hongshaojie@h-partners.com>
Change-Id: Ia65329ef724832194f193bb7dd62e65bf8df621e

screenshot/resource/app_capture_screen_test_config.json

@@ -55,11 +55,11 @@
         "mk_test_dir":["hdc_std shell mkdir -p /data/app/el1/bundle/public/ohos.acts.multimedia.video.videoplayer/ohos.acts.multimedia.video.videoplayer/assets/entry/resources/rawfile"],
         "send_video":["hdc_std file send D:\\DeviceTestTools\\screenshot\\vediotest\\H264_AAC.mp4 /data/app/el1/bundle/public/ohos.acts.multimedia.video.videoplayer/ohos.acts.multimedia.video.videoplayer/assets/entry/resources/rawfile/"],
         "close_auto_log":["hdc_std shell \"hilog -w stop;rm /data/log/hilog/*\""],
-        "start_video_log":["hdc_std shell \"hilog -b X;hilog -b D -T JSApp;hilog -r\""],
+        "start_video_log":["hdc_std shell \"hilog -r;hilog -w start -l 400000000 -m none;hilog -G 512M\""],
         "start_test":["hdc_std shell aa start -a ohos.acts.multimedia.video.videoplayer.MainAbility -b ohos.acts.multimedia.video.videoplayer"],
-        "recover_log":["hdc_std shell \"cd data/log/hilog/;hilog -x > video_log.txt;hilog -b D"],
+        "recover_log":["hdc_std shell \"cd data/log/hilog/;hilog -x > video_log.txt"],
         "stop_hilog":["hdc_std shell hilog -w stop"],
-        "check_result":["hdc_std shell \"cd /data/log/hilog && grep -nr 'total cases'\"", "failure 0,error 0,pass 1"],
+        "check_result":["hdc_std shell \"cd /data/log/hilog && grep 'total cases' video_log.txt\"", ""],
         "compress_log":["hdc_std shell \"cd /data/log/hilog && tar -cf video_log.tar video_*\""],
         "clear_log":["hdc_std shell rm /data/log/hilog/*"],
         "all_actions": [
@@ -72,26 +72,25 @@
         "app_name": "audio_render",
         "entry": "",
         "remount":["hdc_std shell mount -o rw,remount /"],
-        "sendfile1":["hdc_std file send D:\\DeviceTestTools\\screenshot\\audiotest\\hdf_audio_hdi_server_function_test /data/"],
-        "sendfile2":["hdc_std file send D:\\DeviceTestTools\\screenshot\\audiotest\\audiorendertest.wav /data/"],
-        "chmodfile1":["hdc_std shell chmod 777 /data/hdf_audio_hdi_server_function_test"],
-        "executefile1":["hdc_std shell ./data/hdf_audio_hdi_server_function_test"],
-        "audio_render_test":["hdc_std shell \"cd /data && ./hdf_audio_hdi_server_function_test --gtest_filter=AudioServerFunctionTest.SUB_Audio_Function_Render_Test_* && rm *.xml\"", "[  PASSED  ] 12 tests."],
-        "audio_capture_test":["hdc_std shell \"cd /data && ./hdf_audio_hdi_server_function_test --gtest_filter=AudioServerFunctionTest.SUB_Audio_Function_Capture_Test_* && rm *.xml\"", "[  PASSED  ] 10 test."],
+        "sendfile1":["hdc_std file send D:\\DeviceTestTools\\screenshot\\audiotest\\audio_renderer_unit_test /data/"],
+        "sendfile2":["hdc_std file send D:\\DeviceTestTools\\screenshot\\audiotest\\test_44100_2.wav /data/"],
+        "chmodfile":["hdc_std shell chmod 777 /data/audio_renderer_unit_test"],
+        "audio_render_test":["hdc_std shell ./data/audio_renderer_unit_test",""],
+        "stop_hilog":["hdc_std shell hilog -w stop"],
         "compress_log":["hdc_std shell \"cd /data/log/hilog && tar -cf audio_render_log.tar *\""],
         "all_actions": [
-            [2, "remount"], [2, "sendfile1"], [2, "sendfile2"], [2, "chmodfile1"],
+            [2, "remount"], [2, "sendfile1"], [2, "sendfile2"], [2, "chmodfile"],
             [5, "audio_render_test"], [2, "stop_hilog"], [2, "compress_log"], [2, "recv_log-file", "/data/log/hilog/audio_render_log.tar"]
         ]
     },
     {
         "app_name": "camera",
         "entry": "",
-        "check_result":["hdc_std shell \"cd /data/log/hilog && grep -nr PreviewOutputCallback\"", ""],
+        "check_result":["hdc_std shell \"cd /data/log/hilog && grep -nr PreviewOutputCallback\"", "OnFrameStarted"],
         "compress_log":["hdc_std shell \"cd /data/log/hilog && tar -cf camera_log.tar *\""],
-        "close_auto_log":["hdc_std shell \"hilog -w stop;rm /data/log/hilog/*\""],
+        "close_auto_log":["hdc_std shell \"hilog -w stop;rm /data/log/hilog/*;hilog -G 512M\""],
         "open_camera_log":["hdc_std shell \"hilog -b X;hilog -b D -T CAMERA;hilog -r\""],
-        "start_camera":["hdc_std shell aa start -a com.ohos.camera.MainAbility -b com.ohos.camera"],
+        "start_camera":["hdc_std shell aa start -a MainAbility -b com.ohos.camera"],
         "recover_log":["hdc_std shell \"cd data/log/hilog/;hilog -x > camera_log.txt;hilog -b D"],
         "take_photo-x-y":[360, 1050], "picture-x-y":[245, 1060], "to_photo-x-y":[225, 25],
         "first_pic-x-y":[100, 250], "pic_del1-x-y":[500, 1165], "pic_del2-x-y":[445, 1150],

screenshot/resource/capturescreentest.py

@@ -102,8 +102,8 @@ if __name__ == "__main__":
     parser.add_argument('--config', type=str, default = './app_capture_screen_test_config.json')
     parser.add_argument('--test_num', type=int, nargs='+', default = [])
     parser.add_argument('--tools_path', type=str, default = 'D:\\DeviceTestTools')
-    parser.add_argument('--anwser_path', type=str, default = 'screenshot\\RK\\')
-    parser.add_argument('--save_path', type=str, default = './report/screenshot_1/')
+    parser.add_argument('--anwser_path', type=str, default = 'D:\\DeviceTestTools\\screenshot\\resource')
+    parser.add_argument('--save_path', type=str, default = 'D:\\DeviceTestTools\\screenshot')
     args = parser.parse_args()
 
     with open(args.config) as f: