diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp index d5ac6abed..2b0ad02ad 100644 --- a/trunk/src/app/srs_app_utility.cpp +++ b/trunk/src/app/srs_app_utility.cpp @@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef SRS_OSX #include #endif +#include using namespace std; #include diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 80e067f83..5766f3e5f 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -507,7 +507,7 @@ int SrsTsPacket::decode(SrsStream* stream, SrsTsMessage** ppmsg) int8_t ccv = stream->read_1bytes(); transport_scrambling_control = (SrsTsScrambled)((ccv >> 6) & 0x03); adaption_field_control = (SrsTsAdaptationFieldType)((ccv >> 4) & 0x03); - continuity_counter = (SrsTsPid)(ccv & 0x0F); + continuity_counter = ccv & 0x0F; // TODO: FIXME: create pids map when got new pid. @@ -2196,7 +2196,7 @@ int SrsTsPayloadPATProgram::encode(SrsStream* stream) SrsTsPayloadPAT::SrsTsPayloadPAT(SrsTsPacket* p) : SrsTsPayloadPSI(p) { - const1_value = 3; + const3_value = 3; } SrsTsPayloadPAT::~SrsTsPayloadPAT() @@ -2228,7 +2228,7 @@ int SrsTsPayloadPAT::psi_decode(SrsStream* stream) // 1B int8_t cniv = stream->read_1bytes(); - const1_value = (cniv >> 6) & 0x03; + const3_value = (cniv >> 6) & 0x03; version_number = (cniv >> 1) & 0x1F; current_next_indicator = cniv & 0x01; diff --git a/trunk/src/kernel/srs_kernel_ts.hpp b/trunk/src/kernel/srs_kernel_ts.hpp index 30a71d5c8..a37f8f328 100644 --- a/trunk/src/kernel/srs_kernel_ts.hpp +++ b/trunk/src/kernel/srs_kernel_ts.hpp @@ -1340,7 +1340,7 @@ public: /** * reverved value, must be '1' */ - int8_t const1_value; //2bits + int8_t const3_value; //2bits /** * This 5-bit field is the version number of the whole Program Association Table. The version number * shall be incremented by 1 modulo 32 whenever the definition of the Program Association Table changes. When the