Move assets from vp9 to testdata module

PiperOrigin-RevId: 293781786
This commit is contained in:
kimvde 2020-02-07 11:24:02 +00:00 committed by kim-vde
parent bcbb7d23fa
commit b081b6ea4a
6 changed files with 10 additions and 7 deletions

View File

@ -29,10 +29,13 @@ android {
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }
sourceSets.main { sourceSets {
main {
jniLibs.srcDir 'src/main/libs' jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
} }
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
testOptions.unitTests.includeAndroidResources = true testOptions.unitTests.includeAndroidResources = true
} }

View File

@ -42,10 +42,10 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class VpxPlaybackTest { public class VpxPlaybackTest {
private static final String BEAR_URI = "asset:///bear-vp9.webm"; private static final String BEAR_URI = "asset:///vp9/bear-vp9.webm";
private static final String BEAR_ODD_DIMENSIONS_URI = "asset:///bear-vp9-odd-dimensions.webm"; private static final String BEAR_ODD_DIMENSIONS_URI = "asset:///vp9/bear-vp9-odd-dimensions.webm";
private static final String ROADTRIP_10BIT_URI = "asset:///roadtrip-vp92-10bit.webm"; private static final String ROADTRIP_10BIT_URI = "asset:///vp9/roadtrip-vp92-10bit.webm";
private static final String INVALID_BITSTREAM_URI = "asset:///invalid-bitstream.webm"; private static final String INVALID_BITSTREAM_URI = "asset:///vp9/invalid-bitstream.webm";
private static final String TAG = "VpxPlaybackTest"; private static final String TAG = "VpxPlaybackTest";