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

Commit b9401d90 authored by Gil Dobjanschi's avatar Gil Dobjanschi Committed by Android (Google) Code Review
Browse files

Merge "AudioTrack getTimelineDuration clarification."

parents ec5e0cd8 a0dfa2cd

media/java/android/media/videoeditor/AudioTrack.java

+3 −10
Original line number Diff line number Diff line
@@ -286,9 +286,7 @@ public class AudioTrack { 
    }



    /**

     * @return The timeline duration. If looping is enabled this value

     *         represents the duration of the looped audio track, otherwise it

     *         is the duration of the audio track (mDurationMs).

     * @return The timeline duration as defined by the begin and end boundaries

     */

    public long getTimelineDuration() {

        return mTimelineDurationMs;
@@ -312,14 +310,9 @@ public class AudioTrack { 


        mBeginBoundaryTimeMs = beginMs;

        mEndBoundaryTimeMs = endMs;

        if (mLoop) {

            // TODO: Compute mDurationMs (from the beginning of the loop until

            // the end of all the loops.

            mTimelineDurationMs = mEndBoundaryTimeMs - mBeginBoundaryTimeMs;

        } else {



        mTimelineDurationMs = mEndBoundaryTimeMs - mBeginBoundaryTimeMs;

    }

    }



    /**

     * @return The boundary begin time