Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1823953, 1826382, 1828912, 1833654, 1837160, 1839389, 1839391, 1840399, 1840402, 1840869, 603918: apply code formatting via Lando

Browse Source 
# ignore-this-changeset
This commit is contained in:
Otto Länd 2023-08-08 12:20:14 +00:00
parent eb600c915b
commit 0c3f62de60
6 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/AudioSampleFormat.h
View File

@ -70,7 +70,9 @@ class AudioSampleTypeToFormat<short> {
* http://blog.bjornroche.com/2009/12/linearity-and-dynamic-range-in-int.html
*/
inline float AudioSampleToFloat(float aValue) { return aValue; }
inline float AudioSampleToFloat(int16_t aValue) { return static_cast<float>(aValue) / 32768.0f; }
inline float AudioSampleToFloat(int16_t aValue) {
return static_cast<float>(aValue) / 32768.0f;
}
inline float AudioSampleToFloat(int32_t aValue) {
return static_cast<float>(aValue) / (float)(1U << 31);
}

53
dom/media/MediaFormatReader.cpp
View File

@ -56,7 +56,7 @@ mozilla::LazyLogModule gMediaDemuxerLog("MediaDemuxer");
namespace mozilla {
using MediaDataDecoderID = void *;
using MediaDataDecoderID = void*;
/**
* This class tracks shutdown promises to ensure all decoders are shut down
@ -1135,7 +1135,8 @@ RefPtr<SetCDMPromise> MediaFormatReader::SetCDMProxy(CDMProxy* aProxy) {
// 3) A null cdm proxy is set
// the promise can be resolved directly.
mSetCDMForTracks.clear();
return SetCDMPromise::CreateAndResolve(/* aResolveValue = */ true, __func__);
return SetCDMPromise::CreateAndResolve(/* aResolveValue = */ true,
__func__);
}
RefPtr<SetCDMPromise> p = mSetCDMPromise.Ensure(__func__);
@ -3304,29 +3305,35 @@ void MediaFormatReader::GetDebugInfo(dom::MediaFormatReaderDebugInfo& aInfo) {
aInfo.mAudioState.mHasPromise = mAudio.HasPromise();
aInfo.mAudioState.mWaitingPromise = !mAudio.mWaitingPromise.IsEmpty();
aInfo.mAudioState.mHasDemuxRequest = mAudio.mDemuxRequest.Exists();
aInfo.mAudioState.mDemuxQueueSize = AssertedCast<int>(mAudio.mQueuedSamples.Length());
aInfo.mAudioState.mDemuxQueueSize =
AssertedCast<int>(mAudio.mQueuedSamples.Length());
aInfo.mAudioState.mHasDecoder = mAudio.mDecodeRequest.Exists();
aInfo.mAudioState.mTimeTreshold =
mAudio.mTimeThreshold ? mAudio.mTimeThreshold.ref().Time().ToSeconds()
: -1.0;
aInfo.mAudioState.mTimeTresholdHasSeeked =
mAudio.mTimeThreshold ? mAudio.mTimeThreshold.ref().mHasSeeked : false;
aInfo.mAudioState.mNumSamplesInput = AssertedCast<int64_t>(mAudio.mNumSamplesInput);
aInfo.mAudioState.mNumSamplesOutput = AssertedCast<int64_t>(mAudio.mNumSamplesOutput);
aInfo.mAudioState.mQueueSize = AssertedCast<int32_t>(size_t(mAudio.mSizeOfQueue));
aInfo.mAudioState.mNumSamplesInput =
AssertedCast<int64_t>(mAudio.mNumSamplesInput);
aInfo.mAudioState.mNumSamplesOutput =
AssertedCast<int64_t>(mAudio.mNumSamplesOutput);
aInfo.mAudioState.mQueueSize =
AssertedCast<int32_t>(size_t(mAudio.mSizeOfQueue));
aInfo.mAudioState.mPending = AssertedCast<int>(mAudio.mOutput.Length());
aInfo.mAudioState.mWaitingForData = mAudio.mWaitingForData;
aInfo.mAudioState.mDemuxEOS = mAudio.mDemuxEOS;
aInfo.mAudioState.mDrainState = int32_t(mAudio.mDrainState);
aInfo.mAudioState.mWaitingForKey = mAudio.mWaitingForKey;
aInfo.mAudioState.mLastStreamSourceID = AssertedCast<int64_t>(mAudio.mLastStreamSourceID);
aInfo.mAudioState.mLastStreamSourceID =
AssertedCast<int64_t>(mAudio.mLastStreamSourceID);
}
CopyUTF8toUTF16(audioDecoderName, aInfo.mAudioDecoderName);
CopyUTF8toUTF16(audioType, aInfo.mAudioType);
aInfo.mAudioChannels = AssertedCast<int32_t>(audioInfo.mChannels);
aInfo.mAudioRate = audioInfo.mRate;
aInfo.mAudioFramesDecoded = AssertedCast<int64_t>(mAudio.mNumSamplesOutputTotal);
aInfo.mAudioFramesDecoded =
AssertedCast<int64_t>(mAudio.mNumSamplesOutputTotal);
VideoInfo videoInfo;
if (HasVideo()) {
@ -3338,22 +3345,27 @@ void MediaFormatReader::GetDebugInfo(dom::MediaFormatReaderDebugInfo& aInfo) {
aInfo.mVideoState.mHasPromise = mVideo.HasPromise();
aInfo.mVideoState.mWaitingPromise = !mVideo.mWaitingPromise.IsEmpty();
aInfo.mVideoState.mHasDemuxRequest = mVideo.mDemuxRequest.Exists();
aInfo.mVideoState.mDemuxQueueSize = AssertedCast<int32_t>(mVideo.mQueuedSamples.Length());
aInfo.mVideoState.mDemuxQueueSize =
AssertedCast<int32_t>(mVideo.mQueuedSamples.Length());
aInfo.mVideoState.mHasDecoder = mVideo.mDecodeRequest.Exists();
aInfo.mVideoState.mTimeTreshold =
mVideo.mTimeThreshold ? mVideo.mTimeThreshold.ref().Time().ToSeconds()
: -1.0;
aInfo.mVideoState.mTimeTresholdHasSeeked =
mVideo.mTimeThreshold ? mVideo.mTimeThreshold.ref().mHasSeeked : false;
aInfo.mVideoState.mNumSamplesInput = AssertedCast<int64_t>(mVideo.mNumSamplesInput);
aInfo.mVideoState.mNumSamplesOutput = AssertedCast<int64_t>(mVideo.mNumSamplesOutput);
aInfo.mVideoState.mQueueSize = AssertedCast<int32_t>(size_t(mVideo.mSizeOfQueue));
aInfo.mVideoState.mNumSamplesInput =
AssertedCast<int64_t>(mVideo.mNumSamplesInput);
aInfo.mVideoState.mNumSamplesOutput =
AssertedCast<int64_t>(mVideo.mNumSamplesOutput);
aInfo.mVideoState.mQueueSize =
AssertedCast<int32_t>(size_t(mVideo.mSizeOfQueue));
aInfo.mVideoState.mPending = AssertedCast<int32_t>(mVideo.mOutput.Length());
aInfo.mVideoState.mWaitingForData = mVideo.mWaitingForData;
aInfo.mVideoState.mDemuxEOS = mVideo.mDemuxEOS;
aInfo.mVideoState.mDrainState = int32_t(mVideo.mDrainState);
aInfo.mVideoState.mWaitingForKey = mVideo.mWaitingForKey;
aInfo.mVideoState.mLastStreamSourceID = AssertedCast<int64_t>(mVideo.mLastStreamSourceID);
aInfo.mVideoState.mLastStreamSourceID =
AssertedCast<int64_t>(mVideo.mLastStreamSourceID);
}
CopyUTF8toUTF16(videoDecoderName, aInfo.mVideoDecoderName);
@ -3364,14 +3376,19 @@ void MediaFormatReader::GetDebugInfo(dom::MediaFormatReaderDebugInfo& aInfo) {
videoInfo.mDisplay.height < 0 ? 0 : videoInfo.mDisplay.height;
aInfo.mVideoRate = mVideo.mMeanRate.Mean();
aInfo.mVideoHardwareAccelerated = VideoIsHardwareAccelerated();
aInfo.mVideoNumSamplesOutputTotal = AssertedCast<int64_t>(mVideo.mNumSamplesOutputTotal);
aInfo.mVideoNumSamplesSkippedTotal = AssertedCast<int64_t>(mVideo.mNumSamplesSkippedTotal);
aInfo.mVideoNumSamplesOutputTotal =
AssertedCast<int64_t>(mVideo.mNumSamplesOutputTotal);
aInfo.mVideoNumSamplesSkippedTotal =
AssertedCast<int64_t>(mVideo.mNumSamplesSkippedTotal);
// Looking at dropped frames
FrameStatisticsData stats = mFrameStats->GetFrameStatisticsData();
aInfo.mFrameStats.mDroppedDecodedFrames = AssertedCast<int64_t>(stats.mDroppedDecodedFrames);
aInfo.mFrameStats.mDroppedSinkFrames = AssertedCast<int64_t>(stats.mDroppedSinkFrames);
aInfo.mFrameStats.mDroppedCompositorFrames = AssertedCast<int64_t>(stats.mDroppedCompositorFrames);
aInfo.mFrameStats.mDroppedDecodedFrames =
AssertedCast<int64_t>(stats.mDroppedDecodedFrames);
aInfo.mFrameStats.mDroppedSinkFrames =
AssertedCast<int64_t>(stats.mDroppedSinkFrames);
aInfo.mFrameStats.mDroppedCompositorFrames =
AssertedCast<int64_t>(stats.mDroppedCompositorFrames);
}
void MediaFormatReader::SetVideoNullDecode(bool aIsNullDecode) {

19
dom/media/MediaFormatReader.h
View File

@ -56,7 +56,7 @@ struct MetadataHolder {
UniquePtr<MetadataTags> mTags;
};
using MediaDecoderOwnerID = void *;
using MediaDecoderOwnerID = void*;
struct MOZ_STACK_CLASS MediaFormatReaderInit {
MediaResource* mResource = nullptr;
@ -508,7 +508,7 @@ class MediaFormatReader final
return false;
}
if (mError.ref() ==
NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_RDD_OR_GPU_ERR) {
NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_RDD_OR_GPU_ERR) {
// Allow RDD crashes to be non-fatal, but give up
// if we have too many, or if warnings should be treated as errors.
return mNumOfConsecutiveRDDOrGPUCrashes >
@ -516,7 +516,7 @@ class MediaFormatReader final
StaticPrefs::media_playback_warnings_as_errors();
}
if (mError.ref() ==
NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_UTILITY_ERR) {
NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_UTILITY_ERR) {
bool tooManyConsecutiveCrashes =
mNumOfConsecutiveUtilityCrashes > mMaxConsecutiveUtilityCrashes;
// TODO: Telemetry?
@ -524,7 +524,7 @@ class MediaFormatReader final
StaticPrefs::media_playback_warnings_as_errors();
}
if (mError.ref() ==
NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_MF_CDM_ERR) {
NS_ERROR_DOM_MEDIA_REMOTE_DECODER_CRASHED_MF_CDM_ERR) {
return false;
}
// All other error types are fatal
@ -738,13 +738,15 @@ class MediaFormatReader final
void OnDemuxFailed(TrackType aTrack, const MediaResult& aError);
void DoDemuxVideo();
void OnVideoDemuxCompleted(const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnVideoDemuxCompleted(
const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnVideoDemuxFailed(const MediaResult& aError) {
OnDemuxFailed(TrackType::kVideoTrack, aError);
}
void DoDemuxAudio();
void OnAudioDemuxCompleted(const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnAudioDemuxCompleted(
const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnAudioDemuxFailed(const MediaResult& aError) {
OnDemuxFailed(TrackType::kAudioTrack, aError);
}
@ -822,8 +824,9 @@ class MediaFormatReader final
MediaEventListener mOnTrackWaitingForKeyListener;
void OnFirstDemuxCompleted(TrackInfo::TrackType aType,
const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnFirstDemuxCompleted(
TrackInfo::TrackType aType,
const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnFirstDemuxFailed(TrackInfo::TrackType aType,
const MediaResult& aError);

6
dom/media/mediasource/TrackBuffersManager.h
View File

@ -275,14 +275,16 @@ class TrackBuffersManager final
void OnDemuxFailed(TrackType aTrack, const MediaResult& aError)
MOZ_REQUIRES(mTaskQueueCapability);
void DoDemuxVideo() MOZ_REQUIRES(mTaskQueueCapability);
void OnVideoDemuxCompleted(const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnVideoDemuxCompleted(
const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnVideoDemuxFailed(const MediaResult& aError) {
mVideoTracks.mDemuxRequest.Complete();
mTaskQueueCapability->AssertOnCurrentThread();
OnDemuxFailed(TrackType::kVideoTrack, aError);
}
void DoDemuxAudio() MOZ_REQUIRES(mTaskQueueCapability);
void OnAudioDemuxCompleted(const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnAudioDemuxCompleted(
const RefPtr<MediaTrackDemuxer::SamplesHolder>& aSamples);
void OnAudioDemuxFailed(const MediaResult& aError) {
mAudioTracks.mDemuxRequest.Complete();
mTaskQueueCapability->AssertOnCurrentThread();

3
dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
View File

@ -233,7 +233,8 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60)
AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc,
AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60)
AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60)
AV_FUNC_OPTION_SILENT(avcodec_get_name,
AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60)
AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string, AV_FUNC_AVUTIL_58 |
AV_FUNC_AVUTIL_59 |
AV_FUNC_AVUTIL_60)

3
dom/media/wave/WaveDemuxer.cpp
View File

@ -514,7 +514,8 @@ uint64_t WAVTrackDemuxer::ChunkIndexFromTime(
if (!mSamplesPerChunk || !mSamplesPerSecond) {
return 0;
}
double chunkDurationS = mSamplesPerChunk / static_cast<double>(mSamplesPerSecond);
double chunkDurationS =
mSamplesPerChunk / static_cast<double>(mSamplesPerSecond);
int64_t chunkIndex = std::floor(aTime.ToSeconds() / chunkDurationS);
return chunkIndex;
}