diff options
| author | James Dong <jdong@google.com> | 2012-04-30 14:38:12 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-05-01 10:30:58 -0700 |
| commit | 4f6eed0d1c7972a983c075bdcf03089569e13fe1 (patch) | |
| tree | 6eebbc397b99bf33e8c9991fada609d86d144caf /media/libstagefright/OMXCodec.cpp | |
| parent | 27431de020e535c31365884316f656bc60b4fe4f (diff) | |
| download | frameworks_av-4f6eed0d1c7972a983c075bdcf03089569e13fe1.zip frameworks_av-4f6eed0d1c7972a983c075bdcf03089569e13fe1.tar.gz frameworks_av-4f6eed0d1c7972a983c075bdcf03089569e13fe1.tar.bz2 | |
Impl for supporting two video scaling modes
o allows the video scaling mode to change at any time
o also remove the scaling mode logic in OMXCodec.cpp
o related-to-bug: 5454345
Change-Id: I6f1714eb0c2774591ce650d56c1e779b8afd085f
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 791e044..56016a8 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1683,13 +1683,6 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() { return err; } - err = native_window_set_scaling_mode(mNativeWindow.get(), - NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW); - - if (err != OK) { - return err; - } - err = native_window_set_buffers_geometry( mNativeWindow.get(), def.format.video.nFrameWidth, @@ -1913,14 +1906,6 @@ status_t OMXCodec::pushBlankBuffersToNativeWindow() { return err; } - err = native_window_set_scaling_mode(mNativeWindow.get(), - NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW); - if (err != NO_ERROR) { - ALOGE("error pushing blank frames: set_buffers_geometry failed: %s (%d)", - strerror(-err), -err); - goto error; - } - err = native_window_set_buffers_geometry(mNativeWindow.get(), 1, 1, HAL_PIXEL_FORMAT_RGBX_8888); if (err != NO_ERROR) { |