various: moved more to core lib

This commit is contained in:
itsmattkc
2023-01-19 16:01:31 -08:00
parent dd9c52ab59
commit c1c6893713
92 changed files with 448 additions and 1558 deletions
+32 -32
View File
@@ -41,70 +41,70 @@ AVPixelFormat FFmpegUtils::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt
nullptr);
}
AudioParams::Format FFmpegUtils::GetNativeSampleFormat(const AVSampleFormat &smp_fmt)
SampleFormat FFmpegUtils::GetNativeSampleFormat(const AVSampleFormat &smp_fmt)
{
switch (smp_fmt) {
case AV_SAMPLE_FMT_U8:
return AudioParams::kFormatUnsigned8Packed;
return SampleFormat::U8;
case AV_SAMPLE_FMT_S16:
return AudioParams::kFormatSigned16Packed;
return SampleFormat::S16;
case AV_SAMPLE_FMT_S32:
return AudioParams::kFormatSigned32Packed;
return SampleFormat::S32;
case AV_SAMPLE_FMT_S64:
return AudioParams::kFormatSigned64Packed;
return SampleFormat::S64;
case AV_SAMPLE_FMT_FLT:
return AudioParams::kFormatFloat32Packed;
return SampleFormat::F32;
case AV_SAMPLE_FMT_DBL:
return AudioParams::kFormatFloat64Packed;
return SampleFormat::F64;
case AV_SAMPLE_FMT_U8P :
return AudioParams::kFormatUnsigned8Planar;
return SampleFormat::U8P;
case AV_SAMPLE_FMT_S16P:
return AudioParams::kFormatSigned16Planar;
return SampleFormat::S16P;
case AV_SAMPLE_FMT_S32P:
return AudioParams::kFormatSigned32Planar;
return SampleFormat::S32P;
case AV_SAMPLE_FMT_S64P:
return AudioParams::kFormatSigned64Planar;
return SampleFormat::S64P;
case AV_SAMPLE_FMT_FLTP:
return AudioParams::kFormatFloat32Planar;
return SampleFormat::F32P;
case AV_SAMPLE_FMT_DBLP:
return AudioParams::kFormatFloat64Planar;
return SampleFormat::F64P;
case AV_SAMPLE_FMT_NONE:
case AV_SAMPLE_FMT_NB:
break;
}
return AudioParams::kFormatInvalid;
return SampleFormat::INVALID;
}
AVSampleFormat FFmpegUtils::GetFFmpegSampleFormat(const AudioParams::Format &smp_fmt)
AVSampleFormat FFmpegUtils::GetFFmpegSampleFormat(const SampleFormat &smp_fmt)
{
switch (smp_fmt) {
case AudioParams::kFormatUnsigned8Packed:
case SampleFormat::U8:
return AV_SAMPLE_FMT_U8;
case AudioParams::kFormatSigned16Packed:
case SampleFormat::S16:
return AV_SAMPLE_FMT_S16;
case AudioParams::kFormatSigned32Packed:
case SampleFormat::S32:
return AV_SAMPLE_FMT_S32;
case AudioParams::kFormatSigned64Packed:
case SampleFormat::S64:
return AV_SAMPLE_FMT_S64;
case AudioParams::kFormatFloat32Packed:
case SampleFormat::F32:
return AV_SAMPLE_FMT_FLT;
case AudioParams::kFormatFloat64Packed:
case SampleFormat::F64:
return AV_SAMPLE_FMT_DBL;
case AudioParams::kFormatUnsigned8Planar:
case SampleFormat::U8P:
return AV_SAMPLE_FMT_U8P;
case AudioParams::kFormatSigned16Planar:
case SampleFormat::S16P:
return AV_SAMPLE_FMT_S16P;
case AudioParams::kFormatSigned32Planar:
case SampleFormat::S32P:
return AV_SAMPLE_FMT_S32P;
case AudioParams::kFormatSigned64Planar:
case SampleFormat::S64P:
return AV_SAMPLE_FMT_S64P;
case AudioParams::kFormatFloat32Planar:
case SampleFormat::F32P:
return AV_SAMPLE_FMT_FLTP;
case AudioParams::kFormatFloat64Planar:
case SampleFormat::F64P:
return AV_SAMPLE_FMT_DBLP;
case AudioParams::kFormatInvalid:
case AudioParams::kFormatCount:
case SampleFormat::INVALID:
case SampleFormat::COUNT:
break;
}
@@ -159,7 +159,7 @@ AVPixelFormat FFmpegUtils::GetFFmpegPixelFormat(const PixelFormat &pix_fmt, int
case PixelFormat::F16:
case PixelFormat::F32:
case PixelFormat::INVALID:
case PixelFormat::FORMAT_COUNT:
case PixelFormat::COUNT:
break;
}
} else if (channel_layout == VideoParams::kRGBAChannelCount) {
@@ -171,7 +171,7 @@ AVPixelFormat FFmpegUtils::GetFFmpegPixelFormat(const PixelFormat &pix_fmt, int
case PixelFormat::F16:
case PixelFormat::F32:
case PixelFormat::INVALID:
case PixelFormat::FORMAT_COUNT:
case PixelFormat::COUNT:
break;
}
}
@@ -189,7 +189,7 @@ PixelFormat FFmpegUtils::GetCompatiblePixelFormat(const PixelFormat &pix_fmt)
case PixelFormat::F32:
return PixelFormat::U16;
case PixelFormat::INVALID:
case PixelFormat::FORMAT_COUNT:
case PixelFormat::COUNT:
break;
}