Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1749761 - Fix signed->unsigned conversion in the FLAC demuxer. r=media-playback-reviewers,alwu

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D135505
This commit is contained in:
Paul Adenot 2022-02-08 16:36:40 +00:00
parent 831b3b9a2c
commit 3257826abf
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dom/media/flac/FlacDemuxer.cpp
View File

@ -58,7 +58,7 @@ class FrameHeader {
int sr_code = br.ReadBits(4);
// Channels and decorrelation.
int ch_mode = br.ReadBits(4);
uint32_t ch_mode = br.ReadBits(4);
if (ch_mode < FLAC_MAX_CHANNELS) {
mInfo.mChannels = ch_mode + 1;
} else if (ch_mode < FLAC_MAX_CHANNELS + FLAC_CHMODE_MID_SIDE) {
@ -85,8 +85,8 @@ class FrameHeader {
}
// Sample or frame count.
int64_t frame_or_sample_num = br.ReadUTF8();
if (frame_or_sample_num < 0) {
uint64_t frame_or_sample_num = br.ReadUTF8();
if (frame_or_sample_num == UINT64_MAX) {
// Sample/frame number invalid.
return false;
}
@ -109,7 +109,7 @@ class FrameHeader {
// A frame is made of Blocksize sample.
mIndex = mVariableBlockSize ? frame_or_sample_num
: frame_or_sample_num * mBlocksize;
mFrameOrSampleNum = frame_or_sample_num;
mFrameOrSampleNum = static_cast<uint64_t>(frame_or_sample_num);
// Sample rate.
if (sr_code < 12) {
@ -167,17 +167,17 @@ class FrameHeader {
uint32_t mSize = 0;
bool mValid = false;
static const int FlacSampleRateTable[16];
static const int32_t FlacBlocksizeTable[16];
static const uint32_t FlacSampleRateTable[16];
static const uint32_t FlacBlocksizeTable[16];
static const uint8_t FlacSampleSizeTable[8];
static const uint8_t CRC8Table[256];
};
const int FrameHeader::FlacSampleRateTable[16] = {
const uint32_t FrameHeader::FlacSampleRateTable[16] = {
0, 88200, 176400, 192000, 8000, 16000, 22050, 24000,
32000, 44100, 48000, 96000, 0, 0, 0, 0};
const int32_t FrameHeader::FlacBlocksizeTable[16] = {
const uint32_t FrameHeader::FlacBlocksizeTable[16] = {
0, 192, 576 << 0, 576 << 1, 576 << 2, 576 << 3,
0, 0, 256 << 0, 256 << 1, 256 << 2, 256 << 3,
256 << 4, 256 << 5, 256 << 6, 256 << 7};
@ -259,8 +259,8 @@ class Frame {
Reset();
nsTArray<char> buffer;
int64_t originalOffset = aResource.Tell();
int64_t offset = originalOffset;
uint64_t originalOffset = static_cast<uint64_t>(aResource.Tell());
uint64_t offset = originalOffset;
uint32_t innerOffset = 0;
do {
@ -277,7 +277,7 @@ class Frame {
FindNext(reinterpret_cast<uint8_t*>(buffer.Elements()), bufSize);
if (foundOffset >= 0) {
SetOffset(aResource, foundOffset + offset);
SetOffset(aResource, static_cast<uint64_t>(foundOffset) + offset);
return true;
}
@ -300,11 +300,11 @@ class Frame {
return false;
}
int64_t Offset() const { return mOffset; }
uint64_t Offset() const { return mOffset; }
const AudioInfo& Info() const { return Header().Info(); }
void SetEndOffset(int64_t aOffset) { mSize = aOffset - mOffset; }
void SetEndOffset(uint64_t aOffset) { mSize = aOffset - mOffset; }
void SetEndTime(int64_t aIndex) {
if (aIndex > Header().mIndex) {
@ -358,13 +358,13 @@ class Frame {
void Reset() { *this = Frame(); }
private:
void SetOffset(MediaResourceIndex& aResource, int64_t aOffset) {
void SetOffset(MediaResourceIndex& aResource, uint64_t aOffset) {
mOffset = aOffset;
aResource.Seek(SEEK_SET, mOffset);
}
// The offset to the start of the header.
int64_t mOffset = 0;
uint64_t mOffset = 0;
uint32_t mSize = 0;
uint32_t mDuration = 0;
bool mEOS = false;
@ -400,7 +400,7 @@ class FrameParser {
if (mFrame.IsValid()) {
if (mNextFrame.EOS()) {
mFrame.SetEndOffset(aResource.Tell());
mFrame.SetEndOffset(static_cast<uint64_t>(aResource.Tell()));
// If the blocksize is fixed, the frame's starting sample number will be
// the frame number times the blocksize. However, the last block may
// have been incorrectly set as shorter than the stream blocksize.
@ -484,7 +484,7 @@ class FrameParser {
if (size <= 0) {
return false;
}
UniquePtr<char[]> buffer(new char[size]);
UniquePtr<char[]> buffer(new char[static_cast<size_t>(size)]);
uint32_t read = 0;
if (NS_FAILED(aResource.ReadAt(aStart, buffer.get(), size, &read)) ||
read != size) {
@ -726,7 +726,7 @@ TimeUnit FlacTrackDemuxer::FastSeek(const TimeUnit& aTime) {
static const int GAP_THRESHOLD = 5;
int64_t first = mParser->FirstFrame().Offset();
int64_t last = mSource.GetLength();
Maybe<int64_t> lastFoundOffset;
Maybe<uint64_t> lastFoundOffset;
uint32_t iterations = 0;
TimeUnit timeSeekedTo;
@ -740,7 +740,7 @@ TimeUnit FlacTrackDemuxer::FastSeek(const TimeUnit& aTime) {
}
timeSeekedTo = frame.Time();
LOGV("FastSeek: interation:%u found:%f @ %" PRId64, iterations,
LOGV("FastSeek: interation:%u found:%f @ %" PRIu64, iterations,
timeSeekedTo.ToSeconds(), frame.Offset());
if (lastFoundOffset && lastFoundOffset.ref() == frame.Offset()) {
@ -910,7 +910,7 @@ already_AddRefed<MediaRawData> FlacTrackDemuxer::GetNextFrame(
LOG("GetNextFrame() Begin(time=%f offset=%" PRId64 " size=%u)",
aFrame.Time().ToSeconds(), aFrame.Offset(), aFrame.Size());
const int64_t offset = aFrame.Offset();
const uint64_t offset = aFrame.Offset();
const uint32_t size = aFrame.Size();
RefPtr<MediaRawData> frame = new MediaRawData();
@ -940,13 +940,13 @@ already_AddRefed<MediaRawData> FlacTrackDemuxer::GetNextFrame(
return frame.forget();
}
int32_t FlacTrackDemuxer::Read(uint8_t* aBuffer, int64_t aOffset,
int32_t aSize) {
uint32_t FlacTrackDemuxer::Read(uint8_t* aBuffer, int64_t aOffset,
int32_t aSize) {
uint32_t read = 0;
const nsresult rv = mSource.ReadAt(aOffset, reinterpret_cast<char*>(aBuffer),
static_cast<uint32_t>(aSize), &read);
NS_ENSURE_SUCCESS(rv, 0);
return static_cast<int32_t>(read);
return read;
}
double FlacTrackDemuxer::AverageFrameLength() const {
@ -995,7 +995,9 @@ TimeUnit FlacTrackDemuxer::TimeAtEnd() {
// Update our current progress stats.
mParsedFramesDuration =
previousTime + previousDuration - mParser->FirstFrame().Time();
mTotalFrameLen = streamLen - mParser->FirstFrame().Offset();
mTotalFrameLen =
static_cast<uint64_t>(streamLen) - mParser->FirstFrame().Offset();
return mParsedFramesDuration;
}

2
dom/media/flac/FlacDemuxer.h
View File

@ -86,7 +86,7 @@ class FlacTrackDemuxer : public MediaTrackDemuxer,
// Reads aSize bytes into aBuffer from the source starting at aOffset.
// Returns the actual size read.
int32_t Read(uint8_t* aBuffer, int64_t aOffset, int32_t aSize);
uint32_t Read(uint8_t* aBuffer, int64_t aOffset, int32_t aSize);
// Returns the average frame length derived from the previously parsed frames.
double AverageFrameLength() const;