Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae':
  Minor corrections to the javadoc overview to reflect late API changes.
This commit is contained in:
Scott Main
2012-06-28 12:04:04 -07:00
committed by Android Git Automerger
parent 9e75d57d05 f443c5ea2c
commit 00a82605a1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/MediaCodec.java
View File

@@ -33,7 +33,7 @@ import java.util.Map;
* codec.start(); * codec.start();
* ByteBuffer[] inputBuffers = codec.getInputBuffers(); * ByteBuffer[] inputBuffers = codec.getInputBuffers();
* ByteBuffer[] outputBuffers = codec.getOutputBuffers(); * ByteBuffer[] outputBuffers = codec.getOutputBuffers();
* Map<String, Object> format = codec.getOutputFormat(); * MediaFormat format = codec.getOutputFormat();
* for (;;) { * for (;;) {
* int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs); * int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs);
* if (inputBufferIndex &gt;= 0) { * if (inputBufferIndex &gt;= 0) {

4
media/java/android/media/MediaExtractor.java
View File

@@ -36,8 +36,8 @@ import java.util.Map;
* extractor.setDataSource(...); * extractor.setDataSource(...);
* int numTracks = extractor.getTrackCount(); * int numTracks = extractor.getTrackCount();
* for (int i = 0; i &lt; numTracks; ++i) { * for (int i = 0; i &lt; numTracks; ++i) {
* Map%lt;String, Object&gt; format = extractor.getTrackFormat(i); * MediaFormat format = extractor.getTrackFormat(i);
* String mime = (String)format.get("mime"); * String mime = format.getString(MediaFormat.KEY_MIME);
* if (weAreInterestedInThisTrack) { * if (weAreInterestedInThisTrack) {
* extractor.selectTrack(i); * extractor.selectTrack(i);
* } * }