diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-02 13:58:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-02 13:58:03 +0300 |
| commit | 7158e0eb4cfa32f49527f660f73031207bc8f8be (patch) | |
| tree | a7e692d87ad8bd0a4dcb074844b4d3bcb500f27b /intern/ffmpeg/tests/ffmpeg_codecs.cc | |
| parent | 75794f95c0d41fbc1d279058ec9293e69abdd5b2 (diff) | |
| parent | 460c9d3d92e9f74254d58c6bb07d7e4fcb53e8b7 (diff) | |
Merge branch 'master' into blender-projects-basicsblender-projects-basics
Diffstat (limited to 'intern/ffmpeg/tests/ffmpeg_codecs.cc')
| -rw-r--r-- | intern/ffmpeg/tests/ffmpeg_codecs.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/intern/ffmpeg/tests/ffmpeg_codecs.cc b/intern/ffmpeg/tests/ffmpeg_codecs.cc index d0c40736884..e5c33202417 100644 --- a/intern/ffmpeg/tests/ffmpeg_codecs.cc +++ b/intern/ffmpeg/tests/ffmpeg_codecs.cc @@ -130,6 +130,7 @@ FFMPEG_TEST_VCODEC_ID(AV_CODEC_ID_DVVIDEO, AV_PIX_FMT_YUV420P) FFMPEG_TEST_VCODEC_ID(AV_CODEC_ID_MPEG1VIDEO, AV_PIX_FMT_YUV420P) FFMPEG_TEST_VCODEC_ID(AV_CODEC_ID_MPEG2VIDEO, AV_PIX_FMT_YUV420P) FFMPEG_TEST_VCODEC_ID(AV_CODEC_ID_FLV1, AV_PIX_FMT_YUV420P) +FFMPEG_TEST_VCODEC_ID(AV_CODEC_ID_AV1, AV_PIX_FMT_YUV420P) /* Audio codecs */ @@ -149,6 +150,12 @@ FFMPEG_TEST_VCODEC_NAME(libx264, AV_PIX_FMT_YUV420P) FFMPEG_TEST_VCODEC_NAME(libvpx, AV_PIX_FMT_YUV420P) FFMPEG_TEST_VCODEC_NAME(libopenjpeg, AV_PIX_FMT_YUV420P) FFMPEG_TEST_VCODEC_NAME(libxvid, AV_PIX_FMT_YUV420P) +/* aom's AV1 encoder is "libaom-av1". FFMPEG_TEST_VCODEC_NAME(libaom-av1, ...) + * will not work because the dash will not work with the test macro. */ +TEST(ffmpeg, libaom_av1_AV_PIX_FMT_YUV420P) +{ + EXPECT_TRUE(test_codec_video_by_name("libaom-av1", AV_PIX_FMT_YUV420P)); +} FFMPEG_TEST_ACODEC_NAME(libvorbis, AV_SAMPLE_FMT_FLTP) FFMPEG_TEST_ACODEC_NAME(libopus, AV_SAMPLE_FMT_FLT) FFMPEG_TEST_ACODEC_NAME(libmp3lame, AV_SAMPLE_FMT_FLTP) |