Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use list of raw pointers rather than scoped_ptr 

- Containers with scoped_ptrs break mac builds.

Change-Id: Id4b9aa735511bf27c83aa8465f64a627fb7fa1d2
This commit is contained in:
Rintaro Kuroiwa 2016-04-07 11:33:23 -07:00
parent cfd782ff40
commit 8ea5df820e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packager/media/formats/mp2t/pes_packet_generator.cc
View File

@ -23,11 +23,11 @@ const uint8_t kVideoStreamId = 0xe0;
const uint8_t kAudioStreamId = 0xc0; const uint8_t kAudioStreamId = 0xc0;
} // namespace } // namespace
PesPacketGenerator::PesPacketGenerator() {} PesPacketGenerator::PesPacketGenerator() : pes_packets_deleter_(&pes_packets_) {}
PesPacketGenerator::~PesPacketGenerator() {} PesPacketGenerator::~PesPacketGenerator() {}
bool PesPacketGenerator::Initialize(const StreamInfo& stream_info) { bool PesPacketGenerator::Initialize(const StreamInfo& stream_info) {
pes_packets_.clear(); STLDeleteElements(&pes_packets_);
stream_type_ = stream_info.stream_type(); stream_type_ = stream_info.stream_type();
if (stream_type_ == kStreamVideo) { if (stream_type_ == kStreamVideo) {
@ -76,7 +76,7 @@ bool PesPacketGenerator::PushSample(scoped_refptr<MediaSample> sample) {
return false; return false;
} }
current_processing_pes_->set_stream_id(kVideoStreamId); current_processing_pes_->set_stream_id(kVideoStreamId);
pes_packets_.push_back(current_processing_pes_.Pass()); pes_packets_.push_back(current_processing_pes_.release());
return true; return true;
} }
DCHECK_EQ(stream_type_, kStreamAudio); DCHECK_EQ(stream_type_, kStreamAudio);
@ -91,7 +91,7 @@ bool PesPacketGenerator::PushSample(scoped_refptr<MediaSample> sample) {
// packets. // packets.
current_processing_pes_->mutable_data()->swap(aac_frame); current_processing_pes_->mutable_data()->swap(aac_frame);
current_processing_pes_->set_stream_id(kAudioStreamId); current_processing_pes_->set_stream_id(kAudioStreamId);
pes_packets_.push_back(current_processing_pes_.Pass()); pes_packets_.push_back(current_processing_pes_.release());
return true; return true;
} }
@ -101,9 +101,9 @@ size_t PesPacketGenerator::NumberOfReadyPesPackets() {
scoped_ptr<PesPacket> PesPacketGenerator::GetNextPesPacket() { scoped_ptr<PesPacket> PesPacketGenerator::GetNextPesPacket() {
DCHECK(!pes_packets_.empty()); DCHECK(!pes_packets_.empty());
scoped_ptr<PesPacket> pes = pes_packets_.front().Pass(); PesPacket* pes = pes_packets_.front();
pes_packets_.pop_front(); pes_packets_.pop_front();
return pes.Pass(); return scoped_ptr<PesPacket>(pes);
} }
bool PesPacketGenerator::Flush() { bool PesPacketGenerator::Flush() {

4
packager/media/formats/mp2t/pes_packet_generator.h
View File

@ -10,6 +10,7 @@
#include <list> #include <list>
#include "packager/base/memory/scoped_ptr.h" #include "packager/base/memory/scoped_ptr.h"
#include "packager/base/stl_util.h"
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/stream_info.h" #include "packager/media/base/stream_info.h"
@ -77,7 +78,8 @@ class PesPacketGenerator {
// This can be used to create a PES from multiple audio samples. // This can be used to create a PES from multiple audio samples.
scoped_ptr<PesPacket> current_processing_pes_; scoped_ptr<PesPacket> current_processing_pes_;
std::list<scoped_ptr<PesPacket>> pes_packets_; std::list<PesPacket*> pes_packets_;
STLElementDeleter<decltype(pes_packets_)> pes_packets_deleter_;
DISALLOW_COPY_AND_ASSIGN(PesPacketGenerator); DISALLOW_COPY_AND_ASSIGN(PesPacketGenerator);
}; };