summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Mohan M2017-11-10 20:19:09 -0600
committerandroid-build-merger2017-11-10 20:19:09 -0600
commit8dd130603852c6cd47c4d0f669110ddcd7599c11 (patch)
treef39dee8af74bccb430da8fb8e38dcd42dd621799 /media/omx/1.0
parentba01f8ff7ae8423f1a04e826773b9607b0af0051 (diff)
parent3a29e0d0ade324e0f65d72b7b5f5f2c57c62a5fa (diff)
downloadplatform-hardware-interfaces-8dd130603852c6cd47c4d0f669110ddcd7599c11.tar.gz
platform-hardware-interfaces-8dd130603852c6cd47c4d0f669110ddcd7599c11.tar.xz
platform-hardware-interfaces-8dd130603852c6cd47c4d0f669110ddcd7599c11.zip
Merge "omxvts:vid:dec: modify resource files for avc dec and mpeg4 dec" into oc-mr1-dev
am: 3a29e0d0ad Change-Id: I35af870e6e370b7752d276d5e9e182f56b6d2ecc
Diffstat (limited to 'media/omx/1.0')
-rw-r--r--media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
index 9b74a339..034992ec 100644
--- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
+++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
@@ -395,9 +395,9 @@ void GetURLForComponent(VideoDecHidlTest::standardComp comp, char* mURL,
395 static const CompToURL kCompToURL[] = { 395 static const CompToURL kCompToURL[] = {
396 {VideoDecHidlTest::standardComp::avc, 396 {VideoDecHidlTest::standardComp::avc,
397 {"bbb_avc_176x144_300kbps_60fps.h264", 397 {"bbb_avc_176x144_300kbps_60fps.h264",
398 "bbb_avc_1920x1080_5000kbps_30fps.h264"}, 398 "bbb_avc_640x360_768kbps_30fps.h264"},
399 {"bbb_avc_176x144_300kbps_60fps.info", 399 {"bbb_avc_176x144_300kbps_60fps.info",
400 "bbb_avc_1920x1080_5000kbps_30fps.info"}}, 400 "bbb_avc_640x360_768kbps_30fps.info"}},
401 {VideoDecHidlTest::standardComp::hevc, 401 {VideoDecHidlTest::standardComp::hevc,
402 {"bbb_hevc_176x144_176kbps_60fps.hevc", 402 {"bbb_hevc_176x144_176kbps_60fps.hevc",
403 "bbb_hevc_640x360_1600kbps_30fps.hevc"}, 403 "bbb_hevc_640x360_1600kbps_30fps.hevc"},
@@ -412,8 +412,8 @@ void GetURLForComponent(VideoDecHidlTest::standardComp comp, char* mURL,
412 {"", "bbb_h263_352x288_300kbps_12fps.h263"}, 412 {"", "bbb_h263_352x288_300kbps_12fps.h263"},
413 {"", "bbb_h263_352x288_300kbps_12fps.info"}}, 413 {"", "bbb_h263_352x288_300kbps_12fps.info"}},
414 {VideoDecHidlTest::standardComp::mpeg4, 414 {VideoDecHidlTest::standardComp::mpeg4,
415 {"", "bbb_mpeg4_1280x720_1000kbps_25fps.m4v"}, 415 {"", "bbb_mpeg4_352x288_512kbps_30fps.m4v"},
416 {"", "bbb_mpeg4_1280x720_1000kbps_25fps.info"}}, 416 {"", "bbb_mpeg4_352x288_512kbps_30fps.info"}},
417 {VideoDecHidlTest::standardComp::vp8, 417 {VideoDecHidlTest::standardComp::vp8,
418 {"bbb_vp8_176x144_240kbps_60fps.vp8", 418 {"bbb_vp8_176x144_240kbps_60fps.vp8",
419 "bbb_vp8_640x360_2mbps_30fps.vp8"}, 419 "bbb_vp8_640x360_2mbps_30fps.vp8"},