зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1889978: apply code formatting via Lando
# ignore-this-changeset
This commit is contained in:
Родитель
5d0aab8f6e
Коммит
0f7e245f2c
|
@ -399,8 +399,7 @@ MediaResult FFmpegAudioDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample,
|
|||
AVPacket* packet;
|
||||
#if LIBAVCODEC_VERSION_MAJOR >= 61
|
||||
packet = mLib->av_packet_alloc();
|
||||
auto freePacket =
|
||||
MakeScopeExit([&] { mLib->av_packet_free(&packet); });
|
||||
auto freePacket = MakeScopeExit([&] { mLib->av_packet_free(&packet); });
|
||||
#else
|
||||
AVPacket packet_mem;
|
||||
packet = &packet_mem;
|
||||
|
|
|
@ -169,7 +169,7 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
|
|||
AV_FUNC(avcodec_register_all, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
|
||||
AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
|
||||
AV_FUNC(av_init_packet, (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58 |
|
||||
AV_FUNC_59 | AV_FUNC_60))
|
||||
AV_FUNC_59 | AV_FUNC_60))
|
||||
AV_FUNC(av_parser_init, AV_FUNC_AVCODEC_ALL)
|
||||
AV_FUNC(av_parser_close, AV_FUNC_AVCODEC_ALL)
|
||||
AV_FUNC(av_parser_parse2, AV_FUNC_AVCODEC_ALL)
|
||||
|
@ -277,9 +277,9 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
|
|||
AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
|
||||
AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 |
|
||||
AV_FUNC_60 | AV_FUNC_61)
|
||||
AV_FUNC_OPTION_SILENT(
|
||||
av_get_pix_fmt_string,
|
||||
AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
|
||||
AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string,
|
||||
AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
|
||||
AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
|
||||
#endif
|
||||
|
||||
AV_FUNC_OPTION(av_tx_init, AV_FUNC_AVUTIL_ALL)
|
||||
|
|
|
@ -52,7 +52,7 @@ inline bool IsVideoCodec(AVCodecID aCodecID) {
|
|||
}
|
||||
|
||||
// Access the correct location for the channel count, based on ffmpeg version.
|
||||
template<typename T>
|
||||
template <typename T>
|
||||
inline int& ChannelCount(T* aObject) {
|
||||
#if LIBAVCODEC_VERSION_MAJOR <= 59
|
||||
return aObject->channels;
|
||||
|
@ -62,7 +62,7 @@ inline int& ChannelCount(T* aObject) {
|
|||
}
|
||||
|
||||
// Access the correct location for the duration, based on ffmpeg version.
|
||||
template<typename T>
|
||||
template <typename T>
|
||||
inline int64_t& Duration(T* aObject) {
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 61
|
||||
return aObject->pkt_duration;
|
||||
|
@ -72,7 +72,7 @@ inline int64_t& Duration(T* aObject) {
|
|||
}
|
||||
|
||||
// Access the correct location for the duration, based on ffmpeg version.
|
||||
template<typename T>
|
||||
template <typename T>
|
||||
inline const int64_t& Duration(const T* aObject) {
|
||||
#if LIBAVCODEC_VERSION_MAJOR < 61
|
||||
return aObject->pkt_duration;
|
||||
|
|
|
@ -874,7 +874,7 @@ int FFmpegVideoDecoder<LIBAV_VER>::GetVideoBuffer(
|
|||
aFrame->extended_data = aFrame->data;
|
||||
# if LIBAVCODEC_VERSION_MAJOR < 61
|
||||
aFrame->reordered_opaque = aCodecContext->reordered_opaque;
|
||||
#endif
|
||||
# endif
|
||||
MOZ_ASSERT(aFrame->data[0] && aFrame->data[1] && aFrame->data[2]);
|
||||
|
||||
// This will hold a reference to image, and the reference would be dropped
|
||||
|
@ -1046,9 +1046,7 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
|
|||
|
||||
#if LIBAVCODEC_VERSION_MAJOR >= 61
|
||||
packet = mLib->av_packet_alloc();
|
||||
auto raii = MakeScopeExit([&]() {
|
||||
mLib->av_packet_free(&packet);
|
||||
});
|
||||
auto raii = MakeScopeExit([&]() { mLib->av_packet_free(&packet); });
|
||||
#else
|
||||
AVPacket packet_mem;
|
||||
packet = &packet_mem;
|
||||
|
@ -1181,8 +1179,8 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
|
|||
} else
|
||||
# endif
|
||||
{
|
||||
rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame),
|
||||
Duration(mFrame), aResults);
|
||||
rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame), Duration(mFrame),
|
||||
aResults);
|
||||
}
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
|
|
Загрузка…
Ссылка в новой задаче