Skip to content
Snippets Groups Projects
Commit dab60b44 authored by David Staessens's avatar David Staessens
Browse files

v4l2_codec2: Update e2e encoder tests to try both old and new encoders.

ag/11749538 updated the encoder tests to use the new V4L2 video encoder.
But a single test apk is built of the rvc-arc-dev branch for both ARC++
and ARCVM, causing all ARC++ video encoder tests to start failing.

This CL fixes this by adding the names of both ARC++ and ARCVM video
encoders so the tests tries both.

Bug: 160755362
Test: mmm external/v4l2_codec2/tests/c2_e2e_test
Change-Id: Ib31c711d365e5e33a5a54ae6cd9d852431066310
parent bbc3d7ed
No related branches found
No related tags found
No related merge requests found
...@@ -34,10 +34,12 @@ constexpr int kTimeoutUs = 1000; // 1ms. ...@@ -34,10 +34,12 @@ constexpr int kTimeoutUs = 1000; // 1ms.
constexpr int kBufferPeriodTimeoutUs = 1000000; // 1 sec constexpr int kBufferPeriodTimeoutUs = 1000000; // 1 sec
// Helper function to get possible encoder names from |type|. // Helper function to get possible encoder names from |type|.
// Note: A single test APK is built for both ARC++ and ARCVM, so both the C2 VEA encoder and the new
// V4L2 encoder names need to be specified here.
std::vector<const char*> GetArcVideoEncoderNames(VideoCodecType type) { std::vector<const char*> GetArcVideoEncoderNames(VideoCodecType type) {
switch (type) { switch (type) {
case VideoCodecType::H264: case VideoCodecType::H264:
return {"c2.v4l2.avc.encoder"}; return {"c2.v4l2.avc.encoder", "c2.vea.avc.encoder"};
default: // unsupported type: VP8, VP9, or unknown default: // unsupported type: VP8, VP9, or unknown
return {}; return {};
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment