Merge "Added VideoEditor reference to protected AudioTrack constructor" (ff61e8be) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ public class AudioTrack {
		/**
		* Constructor
		*
		* @param editor The video editor reference
		* @param audioTrackId The audio track id
		* @param filename The audio filename
		* @param startTimeMs the start time in milliseconds (relative to the
		@@ -251,8 +252,9 @@ public class AudioTrack {
		*
		* @throws IOException if file is not found
		*/
		AudioTrack(String audioTrackId, String filename, long startTimeMs, long beginMs, long endMs,
		boolean loop, int volume, boolean muted, String audioWaveformFilename) throws IOException {
		AudioTrack(VideoEditor editor, String audioTrackId, String filename, long startTimeMs,
		long beginMs, long endMs, boolean loop, int volume, boolean muted,
		String audioWaveformFilename) throws IOException {
		mUniqueId = audioTrackId;
		mFilename = filename;
		mStartTimeMs = startTimeMs;

+1 −1

Original line number	Diff line number	Diff line
		@@ -1017,7 +1017,7 @@ public class VideoEditorTestImpl implements VideoEditor {
		final boolean loop = Boolean.parseBoolean(parser.getAttributeValue("", ATTR_LOOP));
		final String waveformFilename = parser.getAttributeValue("", ATTR_AUDIO_WAVEFORM_FILENAME);
		try {
		final AudioTrack audioTrack = new AudioTrack(audioTrackId, filename, startTimeMs,
		final AudioTrack audioTrack = new AudioTrack(this, audioTrackId, filename, startTimeMs,
		beginMs, endMs, loop, volume, muted, waveformFilename);

		return audioTrack;