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

Commit 1349f47f authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Log MediaExtractor entry point to MediaMetrics 

Bug: 170386720
Test: atest libctsmediav2extractor_jni
Test: atest CtsMediaTestCases
Change-Id: I648e27b1b483a646df77e2a88ec5ac8af01a0bb9
Merged-In: I648e27b1b483a646df77e2a88ec5ac8af01a0bb9
parent 89715382

cmds/stagefright/SimplePlayer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ void SimplePlayer::onMessageReceived(const sp<AMessage> &msg) { 
status_t SimplePlayer::onPrepare() {

status_t SimplePlayer::onPrepare() {

    CHECK_EQ(mState, UNPREPARED);

    CHECK_EQ(mState, UNPREPARED);





    mExtractor = new NuMediaExtractor;

    mExtractor = new NuMediaExtractor(NuMediaExtractor::EntryPoint::OTHER);





    status_t err = mExtractor->setDataSource(

    status_t err = mExtractor->setDataSource(

            NULL /* httpService */, mPath.c_str());

            NULL /* httpService */, mPath.c_str());

cmds/stagefright/codec.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ static int decode( 




    static int64_t kTimeout = 500ll;

    static int64_t kTimeout = 500ll;





    sp<NuMediaExtractor> extractor = new NuMediaExtractor;

    sp<NuMediaExtractor> extractor = new NuMediaExtractor(NuMediaExtractor::EntryPoint::OTHER);

    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

        fprintf(stderr, "unable to instantiate extractor.\n");

        fprintf(stderr, "unable to instantiate extractor.\n");

        return 1;

        return 1;

cmds/stagefright/mediafilter.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -319,7 +319,8 @@ static int decode( 




    static int64_t kTimeout = 500ll;

    static int64_t kTimeout = 500ll;





    sp<NuMediaExtractor> extractor = new NuMediaExtractor;

    sp<NuMediaExtractor> extractor = new NuMediaExtractor(NuMediaExtractor::EntryPoint::OTHER);



    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

        fprintf(stderr, "unable to instantiate extractor.\n");

        fprintf(stderr, "unable to instantiate extractor.\n");

        return 1;

        return 1;

cmds/stagefright/muxer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ static int muxing( 
        int trimEndTimeMs,

        int trimEndTimeMs,

        int rotationDegrees,

        int rotationDegrees,

        MediaMuxer::OutputFormat container = MediaMuxer::OUTPUT_FORMAT_MPEG_4) {

        MediaMuxer::OutputFormat container = MediaMuxer::OUTPUT_FORMAT_MPEG_4) {

    sp<NuMediaExtractor> extractor = new NuMediaExtractor;

    sp<NuMediaExtractor> extractor = new NuMediaExtractor(NuMediaExtractor::EntryPoint::OTHER);

    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

    if (extractor->setDataSource(NULL /* httpService */, path) != OK) {

        fprintf(stderr, "unable to instantiate extractor. %s\n", path);

        fprintf(stderr, "unable to instantiate extractor. %s\n", path);

        return 1;

        return 1;

media/libmedia/IMediaExtractor.cpp

+19 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,8 @@ enum { 
    FLAGS,

    FLAGS,

    SETMEDIACAS,

    SETMEDIACAS,

    NAME,

    NAME,

    GETMETRICS

    GETMETRICS,

    SETENTRYPOINT

};

};





class BpMediaExtractor : public BpInterface<IMediaExtractor> {

class BpMediaExtractor : public BpInterface<IMediaExtractor> {
@@ -142,6 +143,13 @@ public: 
        }

        }

        return nm;

        return nm;

    }

    }



    virtual status_t setEntryPoint(EntryPoint entryPoint) {

        Parcel data, reply;

        data.writeInterfaceToken(BpMediaExtractor::getInterfaceDescriptor());

        data.writeInt32(static_cast<int32_t>(entryPoint));

        return remote()->transact(SETENTRYPOINT, data, &reply);

    }

};

};





IMPLEMENT_META_INTERFACE(MediaExtractor, "android.media.IMediaExtractor");

IMPLEMENT_META_INTERFACE(MediaExtractor, "android.media.IMediaExtractor");
@@ -232,6 +240,16 @@ status_t BnMediaExtractor::onTransact( 
            reply->writeString8(nm);

            reply->writeString8(nm);

            return NO_ERROR;

            return NO_ERROR;

        }

        }

        case SETENTRYPOINT: {

            ALOGV("setEntryPoint");

            CHECK_INTERFACE(IMediaExtractor, data, reply);

            int32_t entryPoint;

            status_t err = data.readInt32(&entryPoint);

            if (err == OK) {

                setEntryPoint(EntryPoint(entryPoint));

            }

            return err;

        }

        default:

        default:

            return BBinder::onTransact(code, data, reply, flags);

            return BBinder::onTransact(code, data, reply, flags);

    }

    }