正在显示
3 个修改的文件
包含
5 行增加
和
4 行删除
@@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
31 | #ifdef SRS_OSX | 31 | #ifdef SRS_OSX |
32 | #include <sys/sysctl.h> | 32 | #include <sys/sysctl.h> |
33 | #endif | 33 | #endif |
34 | +#include <stdlib.h> | ||
34 | using namespace std; | 35 | using namespace std; |
35 | 36 | ||
36 | #include <srs_kernel_log.hpp> | 37 | #include <srs_kernel_log.hpp> |
@@ -507,7 +507,7 @@ int SrsTsPacket::decode(SrsStream* stream, SrsTsMessage** ppmsg) | @@ -507,7 +507,7 @@ int SrsTsPacket::decode(SrsStream* stream, SrsTsMessage** ppmsg) | ||
507 | int8_t ccv = stream->read_1bytes(); | 507 | int8_t ccv = stream->read_1bytes(); |
508 | transport_scrambling_control = (SrsTsScrambled)((ccv >> 6) & 0x03); | 508 | transport_scrambling_control = (SrsTsScrambled)((ccv >> 6) & 0x03); |
509 | adaption_field_control = (SrsTsAdaptationFieldType)((ccv >> 4) & 0x03); | 509 | adaption_field_control = (SrsTsAdaptationFieldType)((ccv >> 4) & 0x03); |
510 | - continuity_counter = (SrsTsPid)(ccv & 0x0F); | 510 | + continuity_counter = ccv & 0x0F; |
511 | 511 | ||
512 | // TODO: FIXME: create pids map when got new pid. | 512 | // TODO: FIXME: create pids map when got new pid. |
513 | 513 | ||
@@ -2196,7 +2196,7 @@ int SrsTsPayloadPATProgram::encode(SrsStream* stream) | @@ -2196,7 +2196,7 @@ int SrsTsPayloadPATProgram::encode(SrsStream* stream) | ||
2196 | 2196 | ||
2197 | SrsTsPayloadPAT::SrsTsPayloadPAT(SrsTsPacket* p) : SrsTsPayloadPSI(p) | 2197 | SrsTsPayloadPAT::SrsTsPayloadPAT(SrsTsPacket* p) : SrsTsPayloadPSI(p) |
2198 | { | 2198 | { |
2199 | - const1_value = 3; | 2199 | + const3_value = 3; |
2200 | } | 2200 | } |
2201 | 2201 | ||
2202 | SrsTsPayloadPAT::~SrsTsPayloadPAT() | 2202 | SrsTsPayloadPAT::~SrsTsPayloadPAT() |
@@ -2228,7 +2228,7 @@ int SrsTsPayloadPAT::psi_decode(SrsStream* stream) | @@ -2228,7 +2228,7 @@ int SrsTsPayloadPAT::psi_decode(SrsStream* stream) | ||
2228 | // 1B | 2228 | // 1B |
2229 | int8_t cniv = stream->read_1bytes(); | 2229 | int8_t cniv = stream->read_1bytes(); |
2230 | 2230 | ||
2231 | - const1_value = (cniv >> 6) & 0x03; | 2231 | + const3_value = (cniv >> 6) & 0x03; |
2232 | version_number = (cniv >> 1) & 0x1F; | 2232 | version_number = (cniv >> 1) & 0x1F; |
2233 | current_next_indicator = cniv & 0x01; | 2233 | current_next_indicator = cniv & 0x01; |
2234 | 2234 |
@@ -1340,7 +1340,7 @@ public: | @@ -1340,7 +1340,7 @@ public: | ||
1340 | /** | 1340 | /** |
1341 | * reverved value, must be '1' | 1341 | * reverved value, must be '1' |
1342 | */ | 1342 | */ |
1343 | - int8_t const1_value; //2bits | 1343 | + int8_t const3_value; //2bits |
1344 | /** | 1344 | /** |
1345 | * This 5-bit field is the version number of the whole Program Association Table. The version number | 1345 | * This 5-bit field is the version number of the whole Program Association Table. The version number |
1346 | * shall be incremented by 1 modulo 32 whenever the definition of the Program Association Table changes. When the | 1346 | * shall be incremented by 1 modulo 32 whenever the definition of the Program Association Table changes. When the |
-
请 注册 或 登录 后发表评论