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

Commit 6bcffcd2 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily... 

am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread

Merge commit '8c192fe9' into gingerbread-plus-aosp

* commit '8c192fe9':
  Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
parents 3a899b85 8c192fe9

media/libstagefright/rtsp/APacketSource.cpp

+15 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#include "ASessionDescription.h"



#include <ctype.h>



#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AMessage.h>
@@ -37,6 +39,10 @@ static bool GetAttribute(const char *s, const char *key, AString *value) { 
    size_t keyLen = strlen(key);



    for (;;) {

        while (isspace(*s)) {

            ++s;

        }



        const char *colonPos = strchr(s, ';');



        size_t len =
@@ -253,7 +259,11 @@ APacketSource::APacketSource( 
        mFormat->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC);



        int32_t width, height;

        sessionDesc->getDimensions(index, PT, &width, &height);

        if (!sessionDesc->getDimensions(index, PT, &width, &height)) {

            // TODO: extract dimensions from sequence parameter set.

            mInitCheck = ERROR_UNSUPPORTED;

            return;

        }



        mFormat->setInt32(kKeyWidth, width);

        mFormat->setInt32(kKeyHeight, height);
@@ -271,7 +281,10 @@ APacketSource::APacketSource( 
        mFormat->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_H263);



        int32_t width, height;

        sessionDesc->getDimensions(index, PT, &width, &height);

        if (!sessionDesc->getDimensions(index, PT, &width, &height)) {

            mInitCheck = ERROR_UNSUPPORTED;

            return;

        }



        mFormat->setInt32(kKeyWidth, width);

        mFormat->setInt32(kKeyHeight, height);

media/libstagefright/rtsp/ARTSPConnection.cpp

+23 −6
Original line number Diff line number Diff line
@@ -136,6 +136,20 @@ bool ARTSPConnection::ParseURL( 
    return true;

}



static void MakeSocketBlocking(int s, bool blocking) {

    // Make socket non-blocking.

    int flags = fcntl(s, F_GETFL, 0);

    CHECK_NE(flags, -1);



    if (blocking) {

        flags &= ~O_NONBLOCK;

    } else {

        flags |= O_NONBLOCK;

    }



    CHECK_NE(fcntl(s, F_SETFL, flags), -1);

}



void ARTSPConnection::onConnect(const sp<AMessage> &msg) {

    ++mConnectionID;
@@ -150,10 +164,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { 


    mSocket = socket(AF_INET, SOCK_STREAM, 0);



    // Make socket non-blocking.

    int flags = fcntl(mSocket, F_GETFL, 0);

    CHECK_NE(flags, -1);

    CHECK_NE(fcntl(mSocket, F_SETFL, flags | O_NONBLOCK), -1);

    MakeSocketBlocking(mSocket, false);



    AString url;

    CHECK(msg->findString("url", &url));
@@ -347,7 +358,13 @@ void ARTSPConnection::onReceiveResponse() { 
    CHECK_GE(res, 0);



    if (res == 1) {

        if (!receiveRTSPReponse()) {

        MakeSocketBlocking(mSocket, true);



        bool success = receiveRTSPReponse();



        MakeSocketBlocking(mSocket, false);



        if (!success) {

            // Something horrible, irreparable has happened.

            flushPendingRequests();

            return;

media/libstagefright/rtsp/ASessionDescription.cpp

+9 −2
Original line number Diff line number Diff line
@@ -203,13 +203,18 @@ void ASessionDescription::getFormatType( 
    }

}



void ASessionDescription::getDimensions(

bool ASessionDescription::getDimensions(

        size_t index, unsigned long PT,

        int32_t *width, int32_t *height) const {

    *width = 0;

    *height = 0;



    char key[20];

    sprintf(key, "a=framesize:%lu", PT);

    AString value;

    CHECK(findAttribute(index, key, &value));

    if (!findAttribute(index, key, &value)) {

        return false;

    }



    const char *s = value.c_str();

    char *end;
@@ -221,6 +226,8 @@ void ASessionDescription::getDimensions( 
    *height = strtoul(s, &end, 10);

    CHECK_GT(end, s);

    CHECK_EQ(*end, '\0');



    return true;

}



bool ASessionDescription::getDurationUs(int64_t *durationUs) const {

media/libstagefright/rtsp/ASessionDescription.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct ASessionDescription : public RefBase { 
            size_t index, unsigned long *PT,

            AString *desc, AString *params) const;



    void getDimensions(

    bool getDimensions(

            size_t index, unsigned long PT,

            int32_t *width, int32_t *height) const;

media/libstagefright/rtsp/MyHandler.h

+10 −0
Original line number Diff line number Diff line
@@ -309,6 +309,16 @@ struct MyHandler : public AHandler { 
                size_t trackIndex;

                CHECK(msg->findSize("track-index", &trackIndex));



                int32_t eos;

                if (msg->findInt32("eos", &eos)) {

                    LOG(INFO) << "received BYE on track index " << trackIndex;

#if 0

                    TrackInfo *track = &mTracks.editItemAt(trackIndex);

                    track->mPacketSource->signalEOS(ERROR_END_OF_STREAM);

#endif

                    return;

                }



                sp<RefBase> obj;

                CHECK(msg->findObject("access-unit", &obj));