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

Commit 6dbe0d0c authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Rename extractor symbols to log session id 

Test: atest CtsMediaHostTestCases
Bug: 167036690
Change-Id: Idfa64caade07760a0193bb9036115f8b6cf71049
Merged-In: Idfa64caade07760a0193bb9036115f8b6cf71049
parent e265cf94

media/libmedia/IMediaExtractor.cpp

+19 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ enum { 
    SETMEDIACAS,

    NAME,

    GETMETRICS,

    SETENTRYPOINT

    SETENTRYPOINT,

    SETLOGSESSIONID

};



class BpMediaExtractor : public BpInterface<IMediaExtractor> {
@@ -150,6 +151,13 @@ public: 
        data.writeInt32(static_cast<int32_t>(entryPoint));

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

    }



    virtual status_t setLogSessionId(const String8& logSessionId) {

        Parcel data, reply;

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

        data.writeString8(logSessionId);

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

    }

};



IMPLEMENT_META_INTERFACE(MediaExtractor, "android.media.IMediaExtractor");
@@ -250,6 +258,16 @@ status_t BnMediaExtractor::onTransact( 
            }

            return err;

        }

        case SETLOGSESSIONID: {

            ALOGV("setLogSessionId");

            CHECK_INTERFACE(IMediaExtractor, data, reply);

            String8 logSessionId;

            status_t status = data.readString8(&logSessionId);

            if (status == OK) {

              setLogSessionId(logSessionId);

            }

            return status;

        }

        default:

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

    }

media/libmedia/include/android/IMediaExtractor.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ public: 
    };



    virtual status_t setEntryPoint(EntryPoint entryPoint) = 0;



    virtual status_t setLogSessionId(const String8& logSessionId) = 0;

};

media/libstagefright/NuMediaExtractor.cpp

+11 −0
Original line number Diff line number Diff line
@@ -885,4 +885,15 @@ status_t NuMediaExtractor::getAudioPresentations( 
    return ERROR_UNSUPPORTED;

}



status_t NuMediaExtractor::setLogSessionId(const String8& logSessionId) {

    if (mImpl == nullptr) {

        return ERROR_UNSUPPORTED;

    }

    status_t status = mImpl->setLogSessionId(logSessionId);

    if (status != OK) {

        ALOGW("Failed to set log session id: %d.", status);

    }

    return status;

}



}  // namespace android

media/libstagefright/RemoteMediaExtractor.cpp

+9 −0
Original line number Diff line number Diff line
@@ -39,7 +39,11 @@ static const char *kKeyExtractor = "extractor"; 
static const char *kExtractorFormat = "android.media.mediaextractor.fmt";

static const char *kExtractorMime = "android.media.mediaextractor.mime";

static const char *kExtractorTracks = "android.media.mediaextractor.ntrk";



// The following are not available in frameworks/base/media/java/android/media/MediaExtractor.java

// because they are not applicable or useful to that API.

static const char *kExtractorEntryPoint = "android.media.mediaextractor.entry";

static const char *kExtractorLogSessionId = "android.media.mediaextractor.logSessionId";



static const char *kEntryPointSdk = "sdk";

static const char *kEntryPointWithJvm = "ndk-with-jvm";
@@ -174,6 +178,11 @@ status_t RemoteMediaExtractor::setEntryPoint(EntryPoint entryPoint) { 
    return OK;

}



status_t RemoteMediaExtractor::setLogSessionId(const String8& logSessionId) {

    mMetricsItem->setCString(kExtractorLogSessionId, logSessionId.c_str());

    return OK;

}



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



// static

media/libstagefright/include/media/stagefright/NuMediaExtractor.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct NuMediaExtractor : public RefBase { 


    status_t getAudioPresentations(size_t trackIdx, AudioPresentationCollection *presentations);



    status_t setPlaybackId(const String8& playbackId);

    status_t setLogSessionId(const String8& logSessionId);



    const char* getName() const;