Merge "Fix javadoc which was broken with renames" into rvc-dev am: a7dae49707 (d34b92c1) · Commits · e / os / android_frameworks_base

apex/media/framework/java/android/media/MediaParser.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -104,12 +104,12 @@ import java.util.Map;
		* private int bytesWrittenCount = 0;
		*
		* @Override
		* public void onSeekMap(int i, @NonNull MediaFormat mediaFormat) {
		* public void onSeekMapFound(int i, @NonNull MediaFormat mediaFormat) {
		* // Do nothing.
		* }
		*
		* @Override
		* public void onTrackData(int i, @NonNull TrackData trackData) {
		* public void onTrackDataFound(int i, @NonNull TrackData trackData) {
		* MediaFormat mediaFormat = trackData.mediaFormat;
		* if (videoTrackIndex == -1 &&
		* mediaFormat
		@@ -120,7 +120,7 @@ import java.util.Map;
		* }
		*
		* @Override
		* public void onSampleData(int trackIndex, @NonNull InputReader inputReader)
		* public void onSampleDataFound(int trackIndex, @NonNull InputReader inputReader)
		* throws IOException {
		* int numberOfBytesToRead = (int) inputReader.getLength();
		* if (videoTrackIndex != trackIndex) {
		@@ -387,9 +387,9 @@ public final class MediaParser {
		* @param flags Flags associated with the sample. See {@link MediaCodec
		* MediaCodec.BUFFER_FLAG_*}.
		* @param size The size of the sample data, in bytes.
		* @param offset The number of bytes that have been consumed by {@code onSampleData(int,
		* MediaParser.InputReader)} for the specified track, since the last byte belonging to
		* the sample whose metadata is being passed.
		* @param offset The number of bytes that have been consumed by {@code
		* onSampleDataFound(int, MediaParser.InputReader)} for the specified track, since the
		* last byte belonging to the sample whose metadata is being passed.
		* @param cryptoData Encryption data required to decrypt the sample. May be null for
		* unencrypted samples.
		*/