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

Commit 5a7875e8 authored by Santhosh Behara's avatar Santhosh Behara Committed by Linux Build Service Account
Browse files

httplive: refactor for HLS customization 

List of changes that are squashed:-

Extend NuPlayer setDataSource for streaming.
Change-Id: Ic87c3744bf905eb8742863951b809e38d0a60339

httplive: Add default implementation in HLS for custom changes
Change-Id: I5e2bc7a42e0d4a16d5b5ea5f2ec3d78a7d019ad3

Stagefright: Extensions for HEVC in ATSParser
Change-Id: I05d623fbf5a4e2b260f68c5e591ac0f123ef2f37

Change access modifiers and add overridable methods in HLS stack.

Change-Id: Iae8e77246cc6643735af18617717fba713d0038c
parent 953fc3ad

media/libavextensions/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ LOCAL_C_INCLUDES:= \ 
        $(TOP)/frameworks/native/include/media/hardware \

        $(TOP)/frameworks/native/include/media/openmax \

        $(TOP)/external/flac/include \

        $(TOP)/hardware/qcom/media/mm-core/inc

        $(TOP)/hardware/qcom/media/mm-core/inc \

        $(TOP)/frameworks/av/media/libstagefright \

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



LOCAL_CFLAGS += -Wno-multichar -Werror

media/libavextensions/mediaplayerservice/AVNuExtensions.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct AVNuUtils { 
    virtual void printFileName(int fd);

    virtual bool dropCorruptFrame();

    virtual void addFlagsInMeta(const sp<ABuffer> &buffer, int32_t flags, bool isAudio);

    virtual void checkFormatChange(bool *formatChange, const sp<ABuffer> &accessUnit);



    // ----- NO TRESSPASSING BEYOND THIS LINE ------

    DECLARE_LOADABLE_SINGLETON(AVNuUtils);

media/libavextensions/mediaplayerservice/AVNuUtils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ void AVNuUtils::addFlagsInMeta(const sp<ABuffer> & /*buffer*/, 
        int32_t /*flags*/, bool /*isAudio*/) {

}



void AVNuUtils::checkFormatChange(bool * /*formatChange*/,

        const sp<ABuffer> & /*accessUnit*/) {

}



// ----- NO TRESSPASSING BEYOND THIS LINE ------

AVNuUtils::AVNuUtils() {}

media/libavextensions/stagefright/AVExtensions.h

+6 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <media/IOMX.h>

#include <camera/android/hardware/ICamera.h>

#include <media/mediarecorder.h>



#include "ESQueue.h"



namespace android {
@@ -64,7 +64,8 @@ struct AVFactory { 
    virtual MediaExtractor* updateExtractor(

            MediaExtractor* ext, const sp<DataSource> &source,

            const char *mime, const sp<AMessage> &meta);



    virtual ElementaryStreamQueue* createESQueue(

            ElementaryStreamQueue::Mode mode, uint32_t flags = 0);

    virtual CameraSource *CreateCameraSourceFromCamera(

            const sp<hardware::ICamera> &camera,

            const sp<ICameraRecordingProxy> &proxy,
@@ -149,6 +150,9 @@ struct AVUtils { 
                int nPFrames, int nBFrames, const sp<IOMX> OMXhandle,

                IOMX::node_id nodeID);



    // Used by ATSParser

    virtual bool IsHevcIDR(const sp<ABuffer> &accessUnit);



    // ----- NO TRESSPASSING BEYOND THIS LINE ------

    DECLARE_LOADABLE_SINGLETON(AVUtils);

};

media/libavextensions/stagefright/AVFactory.cpp

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ MPEG4Writer* AVFactory::CreateMPEG4Writer(int fd) { 
    return new MPEG4Writer(fd);

}



ElementaryStreamQueue* AVFactory::createESQueue(

         ElementaryStreamQueue::Mode , uint32_t ) {

    return NULL;

}



// ----- NO TRESSPASSING BEYOND THIS LINE ------

AVFactory::AVFactory() {

}