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

Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev

Browse Source 
am: 99442d3427

Change-Id: I4fc864ea29049ea4585dd71ee8a921b35ae7e147
This commit is contained in:
Hangyu Kuang
2017-04-04 00:42:31 +00:00
committed by android-build-merger
parent fb095d897f 99442d3427
commit 958a284426
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -22999,6 +22999,7 @@ package android.media {
method public void setProfile(android.media.CamcorderProfile);
method public void setVideoEncoder(int) throws java.lang.IllegalStateException;
method public void setVideoEncodingBitRate(int);
method public void setVideoEncodingProfileLevel(int, int);
method public void setVideoFrameRate(int) throws java.lang.IllegalStateException;
method public void setVideoSize(int, int) throws java.lang.IllegalStateException;
method public void setVideoSource(int) throws java.lang.IllegalStateException;

1
api/system-current.txt
View File

@@ -24792,6 +24792,7 @@ package android.media {
method public void setProfile(android.media.CamcorderProfile);
method public void setVideoEncoder(int) throws java.lang.IllegalStateException;
method public void setVideoEncodingBitRate(int);
method public void setVideoEncodingProfileLevel(int, int);
method public void setVideoFrameRate(int) throws java.lang.IllegalStateException;
method public void setVideoSize(int, int) throws java.lang.IllegalStateException;
method public void setVideoSource(int) throws java.lang.IllegalStateException;

1
api/test-current.txt
View File

@@ -23112,6 +23112,7 @@ package android.media {
method public void setProfile(android.media.CamcorderProfile);
method public void setVideoEncoder(int) throws java.lang.IllegalStateException;
method public void setVideoEncodingBitRate(int);
method public void setVideoEncodingProfileLevel(int, int);
method public void setVideoFrameRate(int) throws java.lang.IllegalStateException;
method public void setVideoSize(int, int) throws java.lang.IllegalStateException;
method public void setVideoSource(int) throws java.lang.IllegalStateException;

18
media/java/android/media/MediaRecorder.java
View File

@@ -746,14 +746,19 @@ public class MediaRecorder
}
/**
* Sets the video encoding profile for recording. Call this method before prepare().
* Prepare() may perform additional checks on the parameter to make sure whether the
* specified profile and level are applicable, and sometimes the passed profile or
* level will be discarded due to codec capablity or to ensure the video recording
* can proceed smoothly based on the capabilities of the platform.
* @hide
* Sets the desired video encoding profile and level for recording. The profile and level
* must be valid for the video encoder set by {@link #setVideoEncoder}. This method can
* called before or after {@link #setVideoEncoder} but it must be called before {@link #prepare}.
* {@code prepare()} may perform additional checks on the parameter to make sure that the specified
* profile and level are applicable, and sometimes the passed profile or level will be
* discarded due to codec capablity or to ensure the video recording can proceed smoothly
* based on the capabilities of the platform. <br>Application can also use the
* {@link MediaCodecInfo.CodecCapabilities#profileLevels} to query applicable combination of profile
* and level for the corresponding format. Note that the requested profile/level may not be supported by
* the codec that is actually being used by this MediaRecorder instance.
* @param profile declared in {@link MediaCodecInfo.CodecProfileLevel}.
* @param level declared in {@link MediaCodecInfo.CodecProfileLevel}.
* @throws IllegalArgumentException when an invalid profile or level value is used.
*/
public void setVideoEncodingProfileLevel(int profile, int level) {
if (profile <= 0) {
@@ -1281,3 +1286,4 @@ public class MediaRecorder
@Override
protected void finalize() { native_finalize(); }
}