transcoding: Add more test assets for testing.
Also move the test file used by transocder to another folder in order
to be reused by both transcoding service and transcoder for testing.
Bug: 145628554
Bug: 154734285
Test: Unit test
Change-Id: I61e16ab5deba70da71f4d23fc87157be2f3b3bca
diff --git a/services/mediatranscoding/tests/README.txt b/services/mediatranscoding/tests/README.txt
index 5ee0296..cde465e 100644
--- a/services/mediatranscoding/tests/README.txt
+++ b/services/mediatranscoding/tests/README.txt
@@ -5,4 +5,4 @@
Tests media transcoding service with real transcoder. Uses the same test assets
as the MediaTranscoder unit tests. Before running the test, please make sure
to push the test assets to /sdcard:
- adb push $TOP/frameworks/av/media/libmediatranscoding/transcoder/tests/assets /data/local/tmp/TranscoderTestAssets
\ No newline at end of file
+ adb push $TOP/frameworks/av/media/libmediatranscoding/tests/assets /data/local/tmp/TranscodingTestAssets
diff --git a/services/mediatranscoding/tests/build_and_run_all_unit_tests.sh b/services/mediatranscoding/tests/build_and_run_all_unit_tests.sh
index 37a827c..d66b340 100644
--- a/services/mediatranscoding/tests/build_and_run_all_unit_tests.sh
+++ b/services/mediatranscoding/tests/build_and_run_all_unit_tests.sh
@@ -13,6 +13,9 @@
mm
+# Push the files onto the device.
+. $ANDROID_BUILD_TOP/frameworks/av/media/libmediatranscoding/tests/assets/push_assets.sh
+
echo "[==========] installing test apps"
adb root
adb install -t -r -g -d $ANDROID_TARGET_OUT_TESTCASES/TranscodingUidPolicy_TestAppA/arm64/TranscodingUidPolicy_TestAppA.apk
diff --git a/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
index 57a79f7..8cecfed 100644
--- a/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
+++ b/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
@@ -27,7 +27,7 @@
* Uses the same test assets as the MediaTranscoder unit tests. Before running the test,
* please make sure to push the test assets to /sdcard:
*
- * adb push $TOP/frameworks/av/media/libmediatranscoding/transcoder/tests/assets /data/local/tmp/TranscoderTestAssets
+ * adb push $TOP/frameworks/av/media/libmediatranscoding/transcoder/tests/assets /data/local/tmp/TranscodingTestAssets
*/
namespace android {
@@ -37,7 +37,7 @@
constexpr int64_t kJobWithPaddingUs = 10000000 + kPaddingUs;
constexpr const char* kSrcPath =
- "/data/local/tmp/TranscoderTestAssets/cubicle_avc_480x240_aac_24KHz.mp4";
+ "/data/local/tmp/TranscodingTestAssets/cubicle_avc_480x240_aac_24KHz.mp4";
class MediaTranscodingServiceRealTest : public MediaTranscodingServiceTestBase {
public: