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

Commit 36a551bc authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Rename MediaExtractor symbols to log session id 

Test: atest CtsMediaHostTestCases
Bug: 167036690
Change-Id: I2e71d460e6907400daeba21fd6a76fa0ea5e0922
parent 65896ea2

media/java/android/media/MediaExtractor.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -774,7 +774,7 @@ public final class MediaExtractor { 
     */

     */

    public void setLogSessionId(@NonNull LogSessionId logSessionId) {

    public void setLogSessionId(@NonNull LogSessionId logSessionId) {

        mLogSessionId = Objects.requireNonNull(logSessionId);

        mLogSessionId = Objects.requireNonNull(logSessionId);

        native_setPlaybackId(logSessionId.getStringId());

        native_setLogSessionId(logSessionId.getStringId());

    }

    }





    /**

    /**
@@ -802,7 +802,7 @@ public final class MediaExtractor { 
        return bundle;

        return bundle;

    }

    }





    private native void native_setPlaybackId(String playbackId);

    private native void native_setLogSessionId(String logSessionId);

    private native PersistableBundle native_getMetrics();

    private native PersistableBundle native_getMetrics();





    private static native final void native_init();

    private static native final void native_init();

media/jni/android_media_MediaExtractor.cpp

+11 −11
Original line number Original line Diff line number Diff line
@@ -295,8 +295,8 @@ status_t JMediaExtractor::getAudioPresentations(size_t trackIdx, 
    return mImpl->getAudioPresentations(trackIdx, presentations);

    return mImpl->getAudioPresentations(trackIdx, presentations);

}

}





status_t JMediaExtractor::setPlaybackId(const String8 &playbackId) {

status_t JMediaExtractor::setLogSessionId(const String8 &LogSessionId) {

    return mImpl->setPlaybackId(playbackId);

    return mImpl->setLogSessionId(LogSessionId);

}

}

}  // namespace android

}  // namespace android
@@ -924,21 +924,21 @@ android_media_MediaExtractor_native_getMetrics(JNIEnv * env, jobject thiz) 
}

}





static void

static void

android_media_MediaExtractor_native_setPlaybackId(

android_media_MediaExtractor_native_setLogSessionId(

        JNIEnv * env, jobject thiz, jstring playbackIdJString)

        JNIEnv * env, jobject thiz, jstring logSessionIdJString)

{

{

    ALOGV("android_media_MediaExtractor_native_setPlaybackId");

    ALOGV("android_media_MediaExtractor_native_setLogSessionId");





    sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz);

    sp<JMediaExtractor> extractor = getMediaExtractor(env, thiz);

    if (extractor == nullptr) {

    if (extractor == nullptr) {

        jniThrowException(env, "java/lang/IllegalStateException", nullptr);

        jniThrowException(env, "java/lang/IllegalStateException", nullptr);

    }

    }





    const char* playbackId = env->GetStringUTFChars(playbackIdJString, nullptr);

    const char* logSessionId = env->GetStringUTFChars(logSessionIdJString, nullptr);

    if (extractor->setPlaybackId(String8(playbackId)) != OK) {

    if (extractor->setLogSessionId(String8(logSessionId)) != OK) {

        ALOGE("setPlaybackId failed");

        ALOGE("setLogSessionId failed");

    }

    }

    env->ReleaseStringUTFChars(playbackIdJString, playbackId);

    env->ReleaseStringUTFChars(logSessionIdJString, logSessionId);

}

}





static const JNINativeMethod gMethods[] = {

static const JNINativeMethod gMethods[] = {
@@ -1010,8 +1010,8 @@ static const JNINativeMethod gMethods[] = { 
    {"native_getMetrics",          "()Landroid/os/PersistableBundle;",

    {"native_getMetrics",          "()Landroid/os/PersistableBundle;",

      (void *)android_media_MediaExtractor_native_getMetrics},

      (void *)android_media_MediaExtractor_native_getMetrics},





    { "native_setPlaybackId", "(Ljava/lang/String;)V",

    { "native_setLogSessionId", "(Ljava/lang/String;)V",

      (void *)android_media_MediaExtractor_native_setPlaybackId},

      (void *)android_media_MediaExtractor_native_setLogSessionId},





    { "native_getAudioPresentations", "(I)Ljava/util/List;",

    { "native_getAudioPresentations", "(I)Ljava/util/List;",

      (void *)android_media_MediaExtractor_getAudioPresentations },

      (void *)android_media_MediaExtractor_getAudioPresentations },

media/jni/android_media_MediaExtractor.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ struct JMediaExtractor : public RefBase { 
    status_t getAudioPresentations(size_t trackIdx,

    status_t getAudioPresentations(size_t trackIdx,

            AudioPresentationCollection *presentations) const;

            AudioPresentationCollection *presentations) const;





    status_t setPlaybackId(const String8& playbackId);

    status_t setLogSessionId(const String8& LogSessionId);





protected:

protected:

    virtual ~JMediaExtractor();

    virtual ~JMediaExtractor();