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

Commit 54e6649e authored by Andreas Huber's avatar Andreas Huber
Browse files

Squashed commit of the following: 

commit eaeaa2672d4e0a82891493b2bde8bdd0c0e79a1b
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 23 10:26:48 2010 -0800

    Remove lowest bandwidth stream if using the legacy player.

    Change-Id: I2f885e26344996de9152f8fda9fd6bdef89bf953

commit 7d652972615b2750fd8f1c21b9fab0e136df2b82
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 23 10:14:36 2010 -0800

    Don't clear the packet source's format for legacy discontinuities.

    Change-Id: I9bd5a21b9bd28043ad38bd0658ccc8eda3c1079a

commit 2b18a45aac17cbfe1aa089d0f6510957d438dd64
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 23 10:13:55 2010 -0800

    Use NuPlayer for HTTP live streaming based on runtime property.

    adb shell setprop media.httplive.enable-nuplayer true

    Change-Id: I22738df3403985dc8e6992b1ab5da5747309f773

commit 50d899fb7b9ea52c3994b0a58e993998d926aeed
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 16:25:22 2010 -0800

    Make ACodec a lot less verbose.

    Change-Id: I94c7e499b61032321ffaf999f5ad2c913cde6a48

commit b19e1740cb4d02990a56844654b5d019987c6405
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 16:22:22 2010 -0800

    Wait until we have fresh codec-specific-data before instantiating the decoders

    after a discontinuity involving a format change.

    Change-Id: I7bcf9b5ae3319f08bf8978a117e8ee5220902e37

commit 06428c006906c9099e430aface3b439ff1d36ecc
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 15:20:38 2010 -0800

    Disable random seeks in the streaming tool for now.

    Change-Id: Ie86fde422dcfc4b2c7a01be51a193fda9c88cd71

commit e19db68f3bea8a61c191f60f6940f30e3a0d5f1b
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 15:20:27 2010 -0800

    Tweak HTTP live parameters.

    Change-Id: If4b71e12485facc523a8a43d8213d0feb190daab

commit 1e9942791538c2256b579d96c6c04264b0d8b087
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 14:48:23 2010 -0800

    Enable http live streaming through NuPlayer for http URLs containing the string m3u8

    Change-Id: I1691fe12ae8f1507fe3673313959cd50bc324624

commit 4c33f96a6e499ee0efe0e70b687094430cb7c1c0
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 14:40:27 2010 -0800

    Support for HTTP live streaming in NuPlayer.

    Change-Id: Iacba1c3ebaeb8d3b972185deaf4cff18c8009c54

commit ddf705ce553708bc5b13d89a878484cf839bd674
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 13:42:47 2010 -0800

    StreamingSource now a subclass of abstract NuPlayer::Source

    Change-Id: Ia6c7c639628910b9d1f37decc55da48b07a70de3

commit 9e04a8406b1882a8e3fdeb7b4d52db5ae70b970a
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 22 13:33:52 2010 -0800

    Refactor media data sourcing to NuPlayer::Source.

    Change-Id: I1db9fb08c4e527bf7b19c29978cf342c2b0a0bc9

Change-Id: I9610a097481dda58f22142eacda3ac2dba0b63f9
parent d486375c

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ private: 
MyStreamSource::MyStreamSource(int fd)

    : mFd(fd),

      mFileSize(0),

      mNextSeekTimeUs(ALooper::GetNowUs() + 5000000ll) {

      mNextSeekTimeUs(-1) {  // ALooper::GetNowUs() + 5000000ll) {

    CHECK_GE(fd, 0);



    mFileSize = lseek64(fd, 0, SEEK_END);

media/libmediaplayerservice/MediaPlayerService.cpp

+15 −0
Original line number Diff line number Diff line
@@ -732,6 +732,21 @@ player_type getPlayerType(const char* url) 
        return TEST_PLAYER;

    }



    char value[PROPERTY_VALUE_MAX];

    if (property_get("media.httplive.enable-nuplayer", value, NULL)

            && (!strcasecmp(value, "true") || !strcmp(value, "1"))) {

        if (!strncasecmp("http://", url, 7)) {

            size_t len = strlen(url);

            if (len >= 5 && !strcasecmp(".m3u8", &url[len - 5])) {

                return NU_PLAYER;

            }



            if (strstr(url,"m3u8")) {

                return NU_PLAYER;

            }

        }

    }



    // use MidiFile for MIDI extensions

    int lenURL = strlen(url);

    for (int i = 0; i < NELEM(FILE_EXTS); ++i) {

media/libmediaplayerservice/nuplayer/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -2,17 +2,20 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=                       \

        HTTPLiveSource.cpp              \

        NuPlayer.cpp                    \

        NuPlayerDecoder.cpp             \

        NuPlayerDriver.cpp              \

        NuPlayerRenderer.cpp            \

        NuPlayerStreamListener.cpp      \

        DecoderWrapper.cpp              \

        StreamingSource.cpp             \



LOCAL_C_INCLUDES := \

        $(TOP)/frameworks/base/include/media/stagefright/openmax        \

	$(TOP)/frameworks/base/media/libstagefright/include             \

        $(TOP)/frameworks/base/media/libstagefright/mpeg2ts             \

        $(TOP)/frameworks/base/media/libstagefright/httplive            \



LOCAL_MODULE:= libstagefright_nuplayer

media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp

0 → 100644
+132 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



//#define LOG_NDEBUG 0

#define LOG_TAG "HTTPLiveSource"

#include <utils/Log.h>



#include "HTTPLiveSource.h"



#include "ATSParser.h"

#include "AnotherPacketSource.h"

#include "LiveDataSource.h"

#include "LiveSession.h"



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

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

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

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>



namespace android {



NuPlayer::HTTPLiveSource::HTTPLiveSource(const char *url)

    : mURL(url),

      mEOS(false),

      mOffset(0) {

}



NuPlayer::HTTPLiveSource::~HTTPLiveSource() {

    mLiveSession->disconnect();

    mLiveLooper->stop();

}



void NuPlayer::HTTPLiveSource::start() {

    mLiveLooper = new ALooper;

    mLiveLooper->setName("http live");

    mLiveLooper->start();



    mLiveSession = new LiveSession;

    mLiveLooper->registerHandler(mLiveSession);



    mLiveSession->connect(mURL.c_str());



    mTSParser = new ATSParser;

}



sp<MetaData> NuPlayer::HTTPLiveSource::getFormat(bool audio) {

    ATSParser::SourceType type =

        audio ? ATSParser::MPEG2ADTS_AUDIO : ATSParser::AVC_VIDEO;



    sp<AnotherPacketSource> source =

        static_cast<AnotherPacketSource *>(mTSParser->getSource(type).get());



    if (source == NULL) {

        return NULL;

    }



    return source->getFormat();

}



bool NuPlayer::HTTPLiveSource::feedMoreTSData() {

    if (mEOS) {

        return false;

    }



    sp<LiveDataSource> source =

        static_cast<LiveDataSource *>(mLiveSession->getDataSource().get());



    for (int32_t i = 0; i < 10; ++i) {

        char buffer[188];

        ssize_t n = source->readAtNonBlocking(mOffset, buffer, sizeof(buffer));



        if (n == -EWOULDBLOCK) {

            break;

        } else if (n < 0) {

            LOGI("input data EOS reached.");

            mTSParser->signalEOS(ERROR_END_OF_STREAM);

            mEOS = true;

            break;

        } else {

            if (buffer[0] == 0x00) {

                // XXX legacy

                mTSParser->signalDiscontinuity(

                        buffer[1] == 0x00

                            ? ATSParser::DISCONTINUITY_SEEK

                            : ATSParser::DISCONTINUITY_FORMATCHANGE);

            } else {

                mTSParser->feedTSPacket(buffer, sizeof(buffer));

            }



            mOffset += n;

        }

    }



    return true;

}



status_t NuPlayer::HTTPLiveSource::dequeueAccessUnit(

        bool audio, sp<ABuffer> *accessUnit) {

    ATSParser::SourceType type =

        audio ? ATSParser::MPEG2ADTS_AUDIO : ATSParser::AVC_VIDEO;



    sp<AnotherPacketSource> source =

        static_cast<AnotherPacketSource *>(mTSParser->getSource(type).get());



    if (source == NULL) {

        return -EWOULDBLOCK;

    }



    status_t finalResult;

    if (!source->hasBufferAvailable(&finalResult)) {

        return finalResult == OK ? -EWOULDBLOCK : finalResult;

    }



    return source->dequeueAccessUnit(accessUnit);

}



}  // namespace android

media/libmediaplayerservice/nuplayer/HTTPLiveSource.h

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef HTTP_LIVE_SOURCE_H_



#define HTTP_LIVE_SOURCE_H_



#include "NuPlayer.h"

#include "NuPlayerSource.h"



namespace android {



struct ATSParser;

struct LiveSession;



struct NuPlayer::HTTPLiveSource : public NuPlayer::Source {

    HTTPLiveSource(const char *url);



    void start();



    // Returns true iff more data was available, false on EOS.

    bool feedMoreTSData();



    sp<MetaData> getFormat(bool audio);

    status_t dequeueAccessUnit(bool audio, sp<ABuffer> *accessUnit);



protected:

    virtual ~HTTPLiveSource();



private:

    AString mURL;

    bool mEOS;

    off64_t mOffset;

    sp<ALooper> mLiveLooper;

    sp<LiveSession> mLiveSession;

    sp<ATSParser> mTSParser;



    DISALLOW_EVIL_CONSTRUCTORS(HTTPLiveSource);

};



}  // namespace android



#endif  // HTTP_LIVE_SOURCE_H_