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

Commit 071b2c72 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

TIF: Add getDescription() method to TvTrackInfo. 

This is useful when language is not enough for describing the track.
E.g. main audio track(eng) vs audio commentary(eng)

Bug: 19302103
Change-Id: Iebffb943d2c0b5f7a7a12820ff3475b66e0130e8
parent 7f602b75

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -17204,6 +17204,7 @@ package android.media.tv { 
    method public int describeContents();

    method public final int getAudioChannelCount();

    method public final int getAudioSampleRate();

    method public final java.lang.String getDescription();

    method public final android.os.Bundle getExtra();

    method public final java.lang.String getId();

    method public final java.lang.String getLanguage();
@@ -17223,6 +17224,7 @@ package android.media.tv { 
    method public android.media.tv.TvTrackInfo build();

    method public final android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int);

    method public final android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int);

    method public final android.media.tv.TvTrackInfo.Builder setDescription(java.lang.String);

    method public final android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle);

    method public final android.media.tv.TvTrackInfo.Builder setLanguage(java.lang.String);

    method public final android.media.tv.TvTrackInfo.Builder setVideoFrameRate(float);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -18434,6 +18434,7 @@ package android.media.tv { 
    method public int describeContents();

    method public final int getAudioChannelCount();

    method public final int getAudioSampleRate();

    method public final java.lang.String getDescription();

    method public final android.os.Bundle getExtra();

    method public final java.lang.String getId();

    method public final java.lang.String getLanguage();
@@ -18453,6 +18454,7 @@ package android.media.tv { 
    method public android.media.tv.TvTrackInfo build();

    method public final android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int);

    method public final android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int);

    method public final android.media.tv.TvTrackInfo.Builder setDescription(java.lang.String);

    method public final android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle);

    method public final android.media.tv.TvTrackInfo.Builder setLanguage(java.lang.String);

    method public final android.media.tv.TvTrackInfo.Builder setVideoFrameRate(float);

media/java/android/media/tv/TvTrackInfo.java

+28 −6
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ public final class TvTrackInfo implements Parcelable { 
    private final int mType;

    private final String mId;

    private final String mLanguage;

    private final String mDescription;

    private final int mAudioChannelCount;

    private final int mAudioSampleRate;

    private final int mVideoWidth;
@@ -49,12 +50,13 @@ public final class TvTrackInfo implements Parcelable { 
    private final float mVideoFrameRate;

    private final Bundle mExtra;



    private TvTrackInfo(int type, String id, String language, int audioChannelCount,

            int audioSampleRate, int videoWidth, int videoHeight, float videoFrameRate,

            Bundle extra) {

    private TvTrackInfo(int type, String id, String language, String description,

            int audioChannelCount, int audioSampleRate, int videoWidth, int videoHeight,

            float videoFrameRate, Bundle extra) {

        mType = type;

        mId = id;

        mLanguage = language;

        mDescription = description;

        mAudioChannelCount = audioChannelCount;

        mAudioSampleRate = audioSampleRate;

        mVideoWidth = videoWidth;
@@ -67,6 +69,7 @@ public final class TvTrackInfo implements Parcelable { 
        mType = in.readInt();

        mId = in.readString();

        mLanguage = in.readString();

        mDescription = in.readString();

        mAudioChannelCount = in.readInt();

        mAudioSampleRate = in.readInt();

        mVideoWidth = in.readInt();
@@ -98,6 +101,13 @@ public final class TvTrackInfo implements Parcelable { 
        return mLanguage;

    }



    /**

     * Returns a user readable description for the current track.

     */

    public final String getDescription() {

        return mDescription;

    }



    /**

     * Returns the audio channel count. Valid only for {@link #TYPE_AUDIO} tracks.

     */
@@ -174,6 +184,7 @@ public final class TvTrackInfo implements Parcelable { 
        dest.writeInt(mType);

        dest.writeString(mId);

        dest.writeString(mLanguage);

        dest.writeString(mDescription);

        dest.writeInt(mAudioChannelCount);

        dest.writeInt(mAudioSampleRate);

        dest.writeInt(mVideoWidth);
@@ -202,6 +213,7 @@ public final class TvTrackInfo implements Parcelable { 
        private final String mId;

        private final int mType;

        private String mLanguage;

        private String mDescription;

        private int mAudioChannelCount;

        private int mAudioSampleRate;

        private int mVideoWidth;
@@ -240,6 +252,16 @@ public final class TvTrackInfo implements Parcelable { 
            return this;

        }



        /**

         * Sets a user readable description for the current track.

         *

         * @param description The user readable description.

         */

        public final Builder setDescription(String description) {

            mDescription = description;

            return this;

        }



        /**

         * Sets the audio channel count. Valid only for {@link #TYPE_AUDIO} tracks.

         *
@@ -325,8 +347,8 @@ public final class TvTrackInfo implements Parcelable { 
         * @return The new {@link TvTrackInfo} instance

         */

        public TvTrackInfo build() {

            return new TvTrackInfo(mType, mId, mLanguage, mAudioChannelCount, mAudioSampleRate,

                    mVideoWidth, mVideoHeight, mVideoFrameRate, mExtra);

            return new TvTrackInfo(mType, mId, mLanguage, mDescription, mAudioChannelCount,

                    mAudioSampleRate, mVideoWidth, mVideoHeight, mVideoFrameRate, mExtra);

        }

    }

}