зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1338023. Part 4 - let OggPacketQueue process OggPacketPtr instead of raw pointers to clarify memory ownership. r=gerald
MozReview-Commit-ID: Atw3Uf5rLRW --HG-- extra : rebase_source : 1985361b5bd90d95492751dba08e822aeb7ad0d1 extra : intermediate-source : 2f82cc9d6ca6d86b5d5ab6cddda935e08dd9d457 extra : source : 6315ec4bbb709bc885a153ae15c2c382412161f7
This commit is contained in:
JW Wang
Родитель
e4bc12e51a
Коммит
bb946739d4
|
|
@ -207,9 +207,9 @@ OggCodecState::ReleasePacket(ogg_packet* aPacket)
|
|||
}
|
||||
|
||||
void
|
||||
OggPacketQueue::Append(ogg_packet* aPacket)
|
||||
OggPacketQueue::Append(OggPacketPtr aPacket)
|
||||
{
|
||||
nsDeque::Push(aPacket);
|
||||
nsDeque::Push(aPacket.release());
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
@ -218,7 +218,7 @@ OggCodecState::IsPacketReady()
|
|||
return !mPackets.IsEmpty();
|
||||
}
|
||||
|
||||
ogg_packet*
|
||||
OggPacketPtr
|
||||
OggCodecState::PacketOut()
|
||||
{
|
||||
if (mPackets.IsEmpty()) {
|
||||
|
|
@ -247,35 +247,32 @@ OggCodecState::PushFront(OggPacketQueue&& aOther)
|
|||
already_AddRefed<MediaRawData>
|
||||
OggCodecState::PacketOutAsMediaRawData()
|
||||
{
|
||||
ogg_packet* packet = PacketOut();
|
||||
OggPacketPtr packet = PacketOut();
|
||||
if (!packet) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
NS_ASSERTION(
|
||||
!IsHeader(packet),
|
||||
!IsHeader(packet.get()),
|
||||
"PacketOutAsMediaRawData can only be called on non-header packets");
|
||||
RefPtr<MediaRawData> sample = new MediaRawData(packet->packet, packet->bytes);
|
||||
if (!sample->Data()) {
|
||||
// OOM.
|
||||
ReleasePacket(packet);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
int64_t end_tstamp = Time(packet->granulepos);
|
||||
NS_ASSERTION(end_tstamp >= 0, "timestamp invalid");
|
||||
|
||||
int64_t duration = PacketDuration(packet);
|
||||
int64_t duration = PacketDuration(packet.get());
|
||||
NS_ASSERTION(duration >= 0, "duration invalid");
|
||||
|
||||
sample->mTimecode = packet->granulepos;
|
||||
sample->mTime = end_tstamp - duration;
|
||||
sample->mDuration = duration;
|
||||
sample->mKeyframe = IsKeyframe(packet);
|
||||
sample->mKeyframe = IsKeyframe(packet.get());
|
||||
sample->mEOS = packet->e_o_s;
|
||||
|
||||
ReleasePacket(packet);
|
||||
|
||||
return sample.forget();
|
||||
}
|
||||
|
||||
|
|
@ -295,7 +292,7 @@ OggCodecState::PageIn(ogg_page* aPage)
|
|||
ogg_packet packet;
|
||||
r = ogg_stream_packetout(&mState, &packet);
|
||||
if (r == 1) {
|
||||
mPackets.Append(Clone(&packet).release());
|
||||
mPackets.Append(Clone(&packet));
|
||||
}
|
||||
} while (r != 0);
|
||||
if (ogg_stream_check(&mState)) {
|
||||
|
|
@ -319,7 +316,7 @@ OggCodecState::PacketOutUntilGranulepos(bool& aFoundGranulepos)
|
|||
OggPacketPtr clone = Clone(&packet);
|
||||
if (IsHeader(&packet)) {
|
||||
// Header packets go straight into the packet queue.
|
||||
mPackets.Append(clone.release());
|
||||
mPackets.Append(Move(clone));
|
||||
} else {
|
||||
// We buffer data packets until we encounter a granulepos. We'll
|
||||
// then use the granulepos to figure out the granulepos of the
|
||||
|
|
@ -404,7 +401,7 @@ TheoraState::Reset()
|
|||
bool
|
||||
TheoraState::DecodeHeader(ogg_packet* aPacket)
|
||||
{
|
||||
mHeaders.Append(aPacket);
|
||||
mHeaders.Append(OggPacketPtr(aPacket));
|
||||
mPacketCount++;
|
||||
int ret = th_decode_headerin(&mTheoraInfo,
|
||||
&mComment,
|
||||
|
|
@ -556,7 +553,7 @@ TheoraState::PageIn(ogg_page* aPage)
|
|||
NS_ASSERTION(!IsHeader(packet.get()), "Don't try to recover header packet gp");
|
||||
NS_ASSERTION(packet->granulepos != -1, "Packet must have gp by now");
|
||||
#endif
|
||||
mPackets.Append(packet.release());
|
||||
mPackets.Append(Move(packet));
|
||||
}
|
||||
mUnstamped.Clear();
|
||||
}
|
||||
|
|
@ -705,7 +702,7 @@ VorbisState::~VorbisState()
|
|||
bool
|
||||
VorbisState::DecodeHeader(ogg_packet* aPacket)
|
||||
{
|
||||
mHeaders.Append(aPacket);
|
||||
mHeaders.Append(OggPacketPtr(aPacket));
|
||||
mPacketCount++;
|
||||
int ret = vorbis_synthesis_headerin(&mVorbisInfo,
|
||||
&mComment,
|
||||
|
|
@ -871,7 +868,7 @@ VorbisState::PageIn(ogg_page* aPage)
|
|||
AssertHasRecordedPacketSamples(packet.get());
|
||||
NS_ASSERTION(!IsHeader(packet.get()), "Don't try to recover header packet gp");
|
||||
NS_ASSERTION(packet->granulepos != -1, "Packet must have gp by now");
|
||||
mPackets.Append(packet.release());
|
||||
mPackets.Append(Move(packet));
|
||||
}
|
||||
mUnstamped.Clear();
|
||||
}
|
||||
|
|
@ -1080,20 +1077,20 @@ OpusState::Init(void)
|
|||
bool
|
||||
OpusState::DecodeHeader(ogg_packet* aPacket)
|
||||
{
|
||||
nsAutoRef<ogg_packet> autoRelease(aPacket);
|
||||
OggPacketPtr packet(aPacket);
|
||||
switch(mPacketCount++) {
|
||||
// Parse the id header.
|
||||
case 0:
|
||||
mParser = new OpusParser;
|
||||
if (!mParser->DecodeHeader(aPacket->packet, aPacket->bytes)) {
|
||||
if (!mParser->DecodeHeader(packet->packet, packet->bytes)) {
|
||||
return false;
|
||||
}
|
||||
mHeaders.Append(autoRelease.disown());
|
||||
mHeaders.Append(Move(packet));
|
||||
break;
|
||||
|
||||
// Parse the metadata header.
|
||||
case 1:
|
||||
if (!mParser->DecodeTags(aPacket->packet, aPacket->bytes)) {
|
||||
if (!mParser->DecodeTags(packet->packet, packet->bytes)) {
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
|
@ -1103,7 +1100,7 @@ OpusState::DecodeHeader(ogg_packet* aPacket)
|
|||
default:
|
||||
mDoneReadingHeaders = true;
|
||||
// Put it back on the queue so we can decode it.
|
||||
mPackets.PushFront(autoRelease.disown());
|
||||
mPackets.PushFront(Move(packet));
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
|
|
@ -1178,7 +1175,7 @@ OpusState::PageIn(ogg_page* aPage)
|
|||
OggPacketPtr packet = Move(mUnstamped[i]);
|
||||
NS_ASSERTION(!IsHeader(packet.get()), "Don't try to play a header packet");
|
||||
NS_ASSERTION(packet->granulepos != -1, "Packet should have a granulepos");
|
||||
mPackets.Append(packet.release());
|
||||
mPackets.Append(Move(packet));
|
||||
}
|
||||
mUnstamped.Clear();
|
||||
return NS_OK;
|
||||
|
|
@ -1399,7 +1396,7 @@ FlacState::PageIn(ogg_page* aPage)
|
|||
OggPacketPtr packet = Move(mUnstamped[i]);
|
||||
NS_ASSERTION(!IsHeader(packet.get()), "Don't try to recover header packet gp");
|
||||
NS_ASSERTION(packet->granulepos != -1, "Packet must have gp by now");
|
||||
mPackets.Append(packet.release());
|
||||
mPackets.Append(Move(packet));
|
||||
}
|
||||
mUnstamped.Clear();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,22 +73,28 @@ public:
|
|||
OggPacketQueue() : nsDeque(new OggPacketDeallocator()) { }
|
||||
~OggPacketQueue() { Erase(); }
|
||||
bool IsEmpty() { return nsDeque::GetSize() == 0; }
|
||||
void Append(ogg_packet* aPacket);
|
||||
ogg_packet* PopFront()
|
||||
void Append(OggPacketPtr aPacket);
|
||||
OggPacketPtr PopFront()
|
||||
{
|
||||
return static_cast<ogg_packet*>(nsDeque::PopFront());
|
||||
return OggPacketPtr(static_cast<ogg_packet*>(nsDeque::PopFront()));
|
||||
}
|
||||
ogg_packet* PeekFront()
|
||||
{
|
||||
return static_cast<ogg_packet*>(nsDeque::PeekFront());
|
||||
}
|
||||
ogg_packet* Pop() { return static_cast<ogg_packet*>(nsDeque::Pop()); }
|
||||
OggPacketPtr Pop()
|
||||
{
|
||||
return OggPacketPtr(static_cast<ogg_packet*>(nsDeque::Pop()));
|
||||
}
|
||||
ogg_packet* operator[](size_t aIndex) const
|
||||
{
|
||||
return static_cast<ogg_packet*>(nsDeque::ObjectAt(aIndex));
|
||||
}
|
||||
size_t Length() const { return nsDeque::GetSize(); }
|
||||
void PushFront(ogg_packet* aPacket) { nsDeque::PushFront(aPacket); }
|
||||
void PushFront(OggPacketPtr aPacket)
|
||||
{
|
||||
nsDeque::PushFront(aPacket.release());
|
||||
}
|
||||
void Erase() { nsDeque::Erase(); }
|
||||
};
|
||||
|
||||
|
|
@ -197,7 +203,7 @@ public:
|
|||
// inserting one or more pages into the stream by calling PageIn(). The
|
||||
// caller is responsible for deleting returned packet's using
|
||||
// OggCodecState::ReleasePacket(). The packet will have a valid granulepos.
|
||||
ogg_packet* PacketOut();
|
||||
OggPacketPtr PacketOut();
|
||||
|
||||
// Returns the next raw packet in the stream, or nullptr if there are no more
|
||||
// packets buffered in the packet queue, without consuming it.
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ OggDemuxer::ReadHeaders(TrackInfo::TrackType aType,
|
|||
{
|
||||
while (!aState->DoneReadingHeaders()) {
|
||||
DemuxUntilPacketAvailable(aType, aState);
|
||||
ogg_packet* packet = aState->PacketOut();
|
||||
OggPacketPtr packet = aState->PacketOut();
|
||||
if (!packet) {
|
||||
OGG_DEBUG("Ran out of header packets early; deactivating stream %ld", aState->mSerial);
|
||||
aState->Deactivate();
|
||||
|
|
@ -314,7 +314,7 @@ OggDemuxer::ReadHeaders(TrackInfo::TrackType aType,
|
|||
|
||||
// Local OggCodecState needs to decode headers in order to process
|
||||
// packet granulepos -> time mappings, etc.
|
||||
if (!aState->DecodeHeader(packet)) {
|
||||
if (!aState->DecodeHeader(packet.release())) {
|
||||
OGG_DEBUG("Failed to decode ogg header packet; deactivating stream %ld", aState->mSerial);
|
||||
aState->Deactivate();
|
||||
return false;
|
||||
|
|
@ -837,7 +837,7 @@ OggDemuxer::GetNextPacket(TrackInfo::TrackType aType)
|
|||
|
||||
while (true) {
|
||||
if (packet) {
|
||||
OggCodecState::ReleasePacket(state->PacketOut());
|
||||
Unused << state->PacketOut();
|
||||
}
|
||||
DemuxUntilPacketAvailable(aType, state);
|
||||
|
||||
|
|
@ -1119,12 +1119,11 @@ OggDemuxer::SeekInternal(TrackInfo::TrackType aType, const TimeUnit& aTarget)
|
|||
if (foundKeyframe && startTstamp == adjustedTarget) {
|
||||
break;
|
||||
}
|
||||
ogg_packet* releaseMe = state->PacketOut();
|
||||
if (foundKeyframe) {
|
||||
tempPackets.Append(releaseMe);
|
||||
tempPackets.Append(state->PacketOut());
|
||||
} else {
|
||||
// Discard video packets before the first keyframe.
|
||||
OggCodecState::ReleasePacket(releaseMe);
|
||||
Unused << state->PacketOut();
|
||||
}
|
||||
}
|
||||
// Re-add all packet into the codec state in order.
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче