Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f1f6a48 authored by Andreas Huber's avatar Andreas Huber
Browse files

Support "raw" packetization in RTPSender. 

Change-Id: I14d59573ee0f57eccc104fea0fb46377476d213d
parent bd8319b2

media/libstagefright/wifi-display/rtp/RTPAssembler.cpp

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ void RTPReceiver::Assembler::postAccessUnit( 
    notify->setInt32("followsDiscontinuity", followsDiscontinuity);

    notify->post();

}



////////////////////////////////////////////////////////////////////////////////



RTPReceiver::TSAssembler::TSAssembler(const sp<AMessage> &notify)

media/libstagefright/wifi-display/rtp/RTPBase.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct RTPBase { 
        PACKETIZATION_TRANSPORT_STREAM,

        PACKETIZATION_H264,

        PACKETIZATION_AAC,

        PACKETIZATION_NONE,

    };



    enum TransportMode {

media/libstagefright/wifi-display/rtp/RTPSender.cpp

+44 −0
Original line number Diff line number Diff line
@@ -187,6 +187,10 @@ status_t RTPSender::queueBuffer( 
    status_t err;



    switch (mode) {

        case PACKETIZATION_NONE:

            err = queueRawPacket(buffer, packetType);

            break;



        case PACKETIZATION_TRANSPORT_STREAM:

            err = queueTSPackets(buffer, packetType);

            break;
@@ -202,6 +206,46 @@ status_t RTPSender::queueBuffer( 
    return err;

}



status_t RTPSender::queueRawPacket(

        const sp<ABuffer> &packet, uint8_t packetType) {

    CHECK_LE(packet->size(), kMaxUDPPacketSize - 12);



    int64_t timeUs;

    CHECK(packet->meta()->findInt64("timeUs", &timeUs));



    sp<ABuffer> udpPacket = new ABuffer(12 + packet->size());



    udpPacket->setInt32Data(mRTPSeqNo);



    uint8_t *rtp = udpPacket->data();

    rtp[0] = 0x80;

    rtp[1] = packetType;



    rtp[2] = (mRTPSeqNo >> 8) & 0xff;

    rtp[3] = mRTPSeqNo & 0xff;

    ++mRTPSeqNo;



    uint32_t rtpTime = (timeUs * 9) / 100ll;



    rtp[4] = rtpTime >> 24;

    rtp[5] = (rtpTime >> 16) & 0xff;

    rtp[6] = (rtpTime >> 8) & 0xff;

    rtp[7] = rtpTime & 0xff;



    rtp[8] = kSourceID >> 24;

    rtp[9] = (kSourceID >> 16) & 0xff;

    rtp[10] = (kSourceID >> 8) & 0xff;

    rtp[11] = kSourceID & 0xff;



    memcpy(&rtp[12], packet->data(), packet->size());



    return sendRTPPacket(

            udpPacket,

            true /* storeInHistory */,

            true /* timeValid */,

            timeUs);

}



status_t RTPSender::queueTSPackets(

        const sp<ABuffer> &tsPackets, uint8_t packetType) {

    CHECK_EQ(0, tsPackets->size() % 188);

media/libstagefright/wifi-display/rtp/RTPSender.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ private: 


    static uint64_t GetNowNTP();



    status_t queueRawPacket(const sp<ABuffer> &tsPackets, uint8_t packetType);

    status_t queueTSPackets(const sp<ABuffer> &tsPackets, uint8_t packetType);

    status_t queueAVCBuffer(const sp<ABuffer> &accessUnit, uint8_t packetType);