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

am c1cabdfb: Merge "Fix bad aspect ratios for recorded effects" into jb-dev

Browse Source 
* commit 'c1cabdfbbb5de2c286fc9a4fe995b7b630a74a0d':
  Fix bad aspect ratios for recorded effects
This commit is contained in:
Wu-cheng Li
2012-05-23 17:59:22 -07:00
committed by Android Git Automerger
parent 7c485c3804 c1cabdfbbb
commit a039119e68
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/mca/filterpacks/java/android/filterpacks/videosink/MediaEncoderFilter.java
View File

@@ -111,12 +111,12 @@ public class MediaEncoderFilter extends Filter {
/** Frame width to be encoded, defaults to 320. /** Frame width to be encoded, defaults to 320.
* Actual received frame size has to match this */ * Actual received frame size has to match this */
@GenerateFieldPort(name = "width", hasDefault = true) @GenerateFieldPort(name = "width", hasDefault = true)
private int mWidth = 320; private int mWidth = 0;
/** Frame height to to be encoded, defaults to 240. /** Frame height to to be encoded, defaults to 240.
* Actual received frame size has to match */ * Actual received frame size has to match */
@GenerateFieldPort(name = "height", hasDefault = true) @GenerateFieldPort(name = "height", hasDefault = true)
private int mHeight = 240; private int mHeight = 0;
/** Stream framerate to encode the frames at. /** Stream framerate to encode the frames at.
* By default, frames are encoded at 30 FPS*/ * By default, frames are encoded at 30 FPS*/
@@ -245,6 +245,11 @@ public class MediaEncoderFilter extends Filter {
if (mProfile != null) { if (mProfile != null) {
mMediaRecorder.setProfile(mProfile); mMediaRecorder.setProfile(mProfile);
mFps = mProfile.videoFrameRate; mFps = mProfile.videoFrameRate;
// If width and height are set larger than 0, then those
// overwrite the ones in the profile.
if (mWidth > 0 && mHeight > 0) {
mMediaRecorder.setVideoSize(mWidth, mHeight);
}
} else { } else {
mMediaRecorder.setOutputFormat(mOutputFormat); mMediaRecorder.setOutputFormat(mOutputFormat);
mMediaRecorder.setVideoEncoder(mVideoEncoder); mMediaRecorder.setVideoEncoder(mVideoEncoder);
@@ -298,7 +303,10 @@ public class MediaEncoderFilter extends Filter {
screenFormat.setBytesPerSample(4); screenFormat.setBytesPerSample(4);
int width, height; int width, height;
if (mProfile != null) { boolean widthHeightSpecified = mWidth > 0 && mHeight > 0;
// If width and height are specified, then use those instead
// of that in the profile.
if (mProfile != null && !widthHeightSpecified) {
width = mProfile.videoFrameWidth; width = mProfile.videoFrameWidth;
height = mProfile.videoFrameHeight; height = mProfile.videoFrameHeight;
} else { } else {
@@ -410,7 +418,6 @@ public class MediaEncoderFilter extends Filter {
// And swap buffers // And swap buffers
glEnv.swapBuffers(); glEnv.swapBuffers();
mNumFramesEncoded++; mNumFramesEncoded++;
if (mLogVerbose) Log.v(TAG, "numFramesEncoded = " + mNumFramesEncoded);
} }
private void stopRecording(FilterContext context) { private void stopRecording(FilterContext context) {