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

Fixed mac build for H.265 parser. 

Another feature that the mac build does not support.  It incorrectly
uses a copy-constructor when creating new values in a std::map.  This
is incorrect and should use an in-place constructor with C++11.

Change-Id: I1e822747e97eb4ae01596d63ea05058cc383cb49
This commit is contained in:
Jacob Trimble 2016-03-29 15:39:53 -07:00
parent cdcfc4c44b
commit e7926e7ccb
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packager/media/filters/h265_parser.cc
View File

@ -10,6 +10,7 @@
#include <math.h> #include <math.h>
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/base/stl_util.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/filters/nalu_reader.h"
#define TRUE_OR_RETURN(a) \ #define TRUE_OR_RETURN(a) \
@ -86,7 +87,10 @@ H265SliceHeader::H265SliceHeader() {}
H265SliceHeader::~H265SliceHeader() {} H265SliceHeader::~H265SliceHeader() {}
H265Parser::H265Parser() {} H265Parser::H265Parser() {}
H265Parser::~H265Parser() {} H265Parser::~H265Parser() {
STLDeleteValues(&active_spses_);
STLDeleteValues(&active_ppses_);
}
H265Parser::Result H265Parser::ParseSliceHeader(const Nalu& nalu, H265Parser::Result H265Parser::ParseSliceHeader(const Nalu& nalu,
H265SliceHeader* slice_header) { H265SliceHeader* slice_header) {
@ -406,10 +410,10 @@ H265Parser::Result H265Parser::ParsePps(const Nalu& nalu, int* pps_id) {
// Ignore remaining extension data. // Ignore remaining extension data.
// This will replace any existing PPS instance. The scoped_ptr will delete // This will replace any existing PPS instance.
// the memory when it is overwritten.
*pps_id = pps->pic_parameter_set_id; *pps_id = pps->pic_parameter_set_id;
active_ppses_[*pps_id] = pps.Pass(); delete active_ppses_[*pps_id];
active_ppses_[*pps_id] = pps.release();
return kOk; return kOk;
} }
@ -517,20 +521,20 @@ H265Parser::Result H265Parser::ParseSps(const Nalu& nalu, int* sps_id) {
// Ignore remaining extension data. // Ignore remaining extension data.
// This will replace any existing SPS instance. The scoped_ptr will delete // This will replace any existing SPS instance.
// the memory when it is overwritten.
*sps_id = sps->seq_parameter_set_id; *sps_id = sps->seq_parameter_set_id;
active_spses_[*sps_id] = sps.Pass(); delete active_spses_[*sps_id];
active_spses_[*sps_id] = sps.release();
return kOk; return kOk;
} }
const H265Pps* H265Parser::GetPps(int pps_id) { const H265Pps* H265Parser::GetPps(int pps_id) {
return active_ppses_[pps_id].get(); return active_ppses_[pps_id];
} }
const H265Sps* H265Parser::GetSps(int sps_id) { const H265Sps* H265Parser::GetSps(int sps_id) {
return active_spses_[sps_id].get(); return active_spses_[sps_id];
} }
H265Parser::Result H265Parser::ParseReferencePictureSet( H265Parser::Result H265Parser::ParseReferencePictureSet(

4
packager/media/filters/h265_parser.h
View File

@ -305,8 +305,8 @@ class H265Parser {
Result SkipScalingListData(H26xBitReader* br); Result SkipScalingListData(H26xBitReader* br);
typedef std::map<int, scoped_ptr<H265Sps>> SpsById; typedef std::map<int, H265Sps*> SpsById;
typedef std::map<int, scoped_ptr<H265Pps>> PpsById; typedef std::map<int, H265Pps*> PpsById;
SpsById active_spses_; SpsById active_spses_;
PpsById active_ppses_; PpsById active_ppses_;