tests: migrate gtest suite to the ffmpeg_bridge API and add bridge coverage
- Replace direct FFmpeg usage in the test suite (channel layout masks, pixel/sample format constants, AVFrame field access, sws_scale) with the bridge equivalents and the olive::AVFrame adapter - Drop CoreRational.ToAVRational (API removed with core's FFmpeg dependency) and the GetSwsColorspaceFromAVColorSpace tests (helper moved inside the bridge) - New ffmpeg_bridge_test.cpp exercises the C API directly: constants vs core, error strings, pixel format utilities, frames/packets, scaler, resampler, audio graph tempo processing, probe/decoder round-trip on tests/demo.mp4 (including hw-frame transfer), SRT subtitle reading, and encoder end-to-end tests (PNG video and PCM audio probed back)
This commit is contained in:
@@ -6,100 +6,78 @@ using namespace olive;
|
||||
|
||||
TEST(CommonFFmpegUtils, GetNativeSampleFormatMapsCorrectly)
|
||||
{
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_U8),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_U8),
|
||||
SampleFormat::U8);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_S16),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_S16),
|
||||
SampleFormat::S16);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_S32),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_S32),
|
||||
SampleFormat::S32);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_S64),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_S64),
|
||||
SampleFormat::S64);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_FLT),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_FLT),
|
||||
SampleFormat::F32);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_DBL),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_DBL),
|
||||
SampleFormat::F64);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_U8P),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_U8P),
|
||||
SampleFormat::U8P);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_S16P),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_S16P),
|
||||
SampleFormat::S16P);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_S32P),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_S32P),
|
||||
SampleFormat::S32P);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_S64P),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_S64P),
|
||||
SampleFormat::S64P);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_FLTP),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_FLTP),
|
||||
SampleFormat::F32P);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_DBLP),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_DBLP),
|
||||
SampleFormat::F64P);
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(AV_SAMPLE_FMT_NONE),
|
||||
EXPECT_EQ(FFmpegUtils::GetNativeSampleFormat(FB_SAMPLE_FMT_NONE),
|
||||
SampleFormat::INVALID);
|
||||
}
|
||||
|
||||
TEST(CommonFFmpegUtils, GetFFmpegSampleFormatMapsCorrectly)
|
||||
{
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::U8),
|
||||
AV_SAMPLE_FMT_U8);
|
||||
FB_SAMPLE_FMT_U8);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::S16),
|
||||
AV_SAMPLE_FMT_S16);
|
||||
FB_SAMPLE_FMT_S16);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::S32),
|
||||
AV_SAMPLE_FMT_S32);
|
||||
FB_SAMPLE_FMT_S32);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::S64),
|
||||
AV_SAMPLE_FMT_S64);
|
||||
FB_SAMPLE_FMT_S64);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::F32),
|
||||
AV_SAMPLE_FMT_FLT);
|
||||
FB_SAMPLE_FMT_FLT);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::F64),
|
||||
AV_SAMPLE_FMT_DBL);
|
||||
FB_SAMPLE_FMT_DBL);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::U8P),
|
||||
AV_SAMPLE_FMT_U8P);
|
||||
FB_SAMPLE_FMT_U8P);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::S16P),
|
||||
AV_SAMPLE_FMT_S16P);
|
||||
FB_SAMPLE_FMT_S16P);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::S32P),
|
||||
AV_SAMPLE_FMT_S32P);
|
||||
FB_SAMPLE_FMT_S32P);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::S64P),
|
||||
AV_SAMPLE_FMT_S64P);
|
||||
FB_SAMPLE_FMT_S64P);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::F32P),
|
||||
AV_SAMPLE_FMT_FLTP);
|
||||
FB_SAMPLE_FMT_FLTP);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::F64P),
|
||||
AV_SAMPLE_FMT_DBLP);
|
||||
FB_SAMPLE_FMT_DBLP);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegSampleFormat(SampleFormat::INVALID),
|
||||
AV_SAMPLE_FMT_NONE);
|
||||
}
|
||||
|
||||
TEST(CommonFFmpegUtils, GetSwsColorspaceFromAVColorSpace)
|
||||
{
|
||||
EXPECT_EQ(FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVCOL_SPC_BT709),
|
||||
SWS_CS_ITU709);
|
||||
EXPECT_EQ(FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVCOL_SPC_FCC),
|
||||
SWS_CS_FCC);
|
||||
EXPECT_EQ(FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVCOL_SPC_BT470BG),
|
||||
SWS_CS_ITU624);
|
||||
EXPECT_EQ(
|
||||
FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVCOL_SPC_SMPTE170M),
|
||||
SWS_CS_SMPTE170M);
|
||||
EXPECT_EQ(
|
||||
FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVCOL_SPC_SMPTE240M),
|
||||
SWS_CS_SMPTE240M);
|
||||
EXPECT_EQ(
|
||||
FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVCOL_SPC_BT2020_NCL),
|
||||
SWS_CS_BT2020);
|
||||
EXPECT_EQ(
|
||||
FFmpegUtils::GetSwsColorspaceFromAVColorSpace(AVCOL_SPC_UNSPECIFIED),
|
||||
SWS_CS_DEFAULT);
|
||||
FB_SAMPLE_FMT_NONE);
|
||||
}
|
||||
|
||||
TEST(CommonFFmpegUtils, ConvertJPEGSpaceToRegularSpace)
|
||||
{
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AV_PIX_FMT_YUVJ420P),
|
||||
AV_PIX_FMT_YUV420P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AV_PIX_FMT_YUVJ422P),
|
||||
AV_PIX_FMT_YUV422P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AV_PIX_FMT_YUVJ444P),
|
||||
AV_PIX_FMT_YUV444P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AV_PIX_FMT_YUVJ440P),
|
||||
AV_PIX_FMT_YUV440P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AV_PIX_FMT_YUVJ411P),
|
||||
AV_PIX_FMT_YUV411P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(AV_PIX_FMT_YUV420P),
|
||||
AV_PIX_FMT_YUV420P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(FB_PIX_FMT_YUVJ420P),
|
||||
FB_PIX_FMT_YUV420P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(FB_PIX_FMT_YUVJ422P),
|
||||
FB_PIX_FMT_YUV422P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(FB_PIX_FMT_YUVJ444P),
|
||||
FB_PIX_FMT_YUV444P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(FB_PIX_FMT_YUVJ440P),
|
||||
FB_PIX_FMT_YUV440P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(FB_PIX_FMT_YUVJ411P),
|
||||
FB_PIX_FMT_YUV411P);
|
||||
EXPECT_EQ(FFmpegUtils::ConvertJPEGSpaceToRegularSpace(FB_PIX_FMT_YUV420P),
|
||||
FB_PIX_FMT_YUV420P);
|
||||
}
|
||||
|
||||
TEST(CommonFFmpegUtils, GetCompatiblePixelFormatNative)
|
||||
@@ -122,33 +100,32 @@ TEST(CommonFFmpegUtils, GetFFmpegPixelFormat)
|
||||
{
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegPixelFormat(PixelFormat::U8,
|
||||
VideoParams::kRGBChannelCount),
|
||||
AV_PIX_FMT_RGB24);
|
||||
FB_PIX_FMT_RGB24);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegPixelFormat(PixelFormat::U16,
|
||||
VideoParams::kRGBChannelCount),
|
||||
AV_PIX_FMT_RGB48);
|
||||
FB_PIX_FMT_RGB48LE);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegPixelFormat(PixelFormat::F32,
|
||||
VideoParams::kRGBChannelCount),
|
||||
AV_PIX_FMT_RGBF32);
|
||||
FB_PIX_FMT_RGBF32LE);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegPixelFormat(PixelFormat::U8,
|
||||
VideoParams::kRGBAChannelCount),
|
||||
AV_PIX_FMT_RGBA);
|
||||
FB_PIX_FMT_RGBA);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegPixelFormat(PixelFormat::U16,
|
||||
VideoParams::kRGBAChannelCount),
|
||||
AV_PIX_FMT_RGBA64);
|
||||
FB_PIX_FMT_RGBA64LE);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegPixelFormat(PixelFormat::F32,
|
||||
VideoParams::kRGBAChannelCount),
|
||||
AV_PIX_FMT_RGBAF32);
|
||||
FB_PIX_FMT_RGBAF32LE);
|
||||
EXPECT_EQ(FFmpegUtils::GetFFmpegPixelFormat(PixelFormat::INVALID, 0),
|
||||
AV_PIX_FMT_NONE);
|
||||
FB_PIX_FMT_NONE);
|
||||
}
|
||||
|
||||
TEST(CommonFFmpegUtils, GetCompatiblePixelFormatAV)
|
||||
{
|
||||
AVPixelFormat fmt =
|
||||
FFmpegUtils::GetCompatiblePixelFormat(AV_PIX_FMT_YUV420P);
|
||||
EXPECT_NE(fmt, AV_PIX_FMT_NONE);
|
||||
int fmt = FFmpegUtils::GetCompatibleBridgePixelFormat(FB_PIX_FMT_YUV420P);
|
||||
EXPECT_NE(fmt, FB_PIX_FMT_NONE);
|
||||
|
||||
fmt = FFmpegUtils::GetCompatiblePixelFormat(AV_PIX_FMT_YUV420P,
|
||||
fmt = FFmpegUtils::GetCompatibleBridgePixelFormat(FB_PIX_FMT_YUV420P,
|
||||
PixelFormat::U8);
|
||||
EXPECT_EQ(fmt, AV_PIX_FMT_RGBA);
|
||||
EXPECT_EQ(fmt, FB_PIX_FMT_RGBA);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user