Loading media/libstagefright/rtsp/AAVCAssembler.cpp +4 −3 Original line number Diff line number Diff line Loading @@ -618,13 +618,14 @@ void AAVCAssembler::submitAccessUnit() { int32_t AAVCAssembler::pickStartSeq(const Queue *queue, uint32_t first, int64_t play, int64_t jit) { CHECK(!queue->empty()); // pick the first sequence number has the start bit. sp<ABuffer> buffer = *(queue->begin()); int32_t firstSeqNo = buffer->int32Data(); // This only works for FU-A type & non-start sequence unsigned nalType = buffer->data()[0] & 0x1f; if (nalType != 28 || buffer->data()[1] & 0x80) { int32_t nalType = buffer->size() >= 1 ? buffer->data()[0] & 0x1f : -1; if (nalType != 28 || (buffer->size() >= 2 && buffer->data()[1] & 0x80)) { return firstSeqNo; } Loading @@ -634,7 +635,7 @@ int32_t AAVCAssembler::pickStartSeq(const Queue *queue, if (rtpTime + jit >= play) { break; } if ((data[1] & 0x80)) { if (it->size() >= 2 && (data[1] & 0x80)) { const int32_t seqNo = it->int32Data(); ALOGE("finding [HEAD] pkt. \t Seq# (%d ~ )[%d", firstSeqNo, seqNo); firstSeqNo = seqNo; Loading Loading
media/libstagefright/rtsp/AAVCAssembler.cpp +4 −3 Original line number Diff line number Diff line Loading @@ -618,13 +618,14 @@ void AAVCAssembler::submitAccessUnit() { int32_t AAVCAssembler::pickStartSeq(const Queue *queue, uint32_t first, int64_t play, int64_t jit) { CHECK(!queue->empty()); // pick the first sequence number has the start bit. sp<ABuffer> buffer = *(queue->begin()); int32_t firstSeqNo = buffer->int32Data(); // This only works for FU-A type & non-start sequence unsigned nalType = buffer->data()[0] & 0x1f; if (nalType != 28 || buffer->data()[1] & 0x80) { int32_t nalType = buffer->size() >= 1 ? buffer->data()[0] & 0x1f : -1; if (nalType != 28 || (buffer->size() >= 2 && buffer->data()[1] & 0x80)) { return firstSeqNo; } Loading @@ -634,7 +635,7 @@ int32_t AAVCAssembler::pickStartSeq(const Queue *queue, if (rtpTime + jit >= play) { break; } if ((data[1] & 0x80)) { if (it->size() >= 2 && (data[1] & 0x80)) { const int32_t seqNo = it->int32Data(); ALOGE("finding [HEAD] pkt. \t Seq# (%d ~ )[%d", firstSeqNo, seqNo); firstSeqNo = seqNo; Loading