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

Commit 00a82605 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late... 

am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev

* commit 'f443c5ea':
  Minor corrections to the javadoc overview to reflect late API changes.
parents 9e75d57d f443c5ea

media/java/android/media/MediaCodec.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.util.Map; 
 * codec.start();

 * ByteBuffer[] inputBuffers = codec.getInputBuffers();

 * ByteBuffer[] outputBuffers = codec.getOutputBuffers();

 * Map<String, Object> format = codec.getOutputFormat();

 * MediaFormat format = codec.getOutputFormat();

 * for (;;) {

 *   int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs);

 *   if (inputBufferIndex &gt;= 0) {

media/java/android/media/MediaExtractor.java

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ import java.util.Map; 
 * extractor.setDataSource(...);

 * int numTracks = extractor.getTrackCount();

 * for (int i = 0; i &lt; numTracks; ++i) {

 *   Map%lt;String, Object&gt; format = extractor.getTrackFormat(i);

 *   String mime = (String)format.get("mime");

 *   MediaFormat format = extractor.getTrackFormat(i);

 *   String mime = format.getString(MediaFormat.KEY_MIME);

 *   if (weAreInterestedInThisTrack) {

 *     extractor.selectTrack(i);

 *   }