diff options
| author | Jamie Gennis <jgennis@google.com> | 2010-10-29 15:19:29 -0700 |
|---|---|---|
| committer | Jamie Gennis <jgennis@google.com> | 2010-11-01 16:54:01 -0700 |
| commit | 0821a824a718a28fa5144309bf09ea40411c8ae0 (patch) | |
| tree | 68310df2088dd6413eaa2d6c07372733e5c010b8 /media/libstagefright/OMXCodec.cpp | |
| parent | 678d25019bd951a6af083bee0282e5b907713849 (diff) | |
| download | frameworks_av-0821a824a718a28fa5144309bf09ea40411c8ae0.zip frameworks_av-0821a824a718a28fa5144309bf09ea40411c8ae0.tar.gz frameworks_av-0821a824a718a28fa5144309bf09ea40411c8ae0.tar.bz2 | |
Stop using OMX_COLOR_FormatAndroidPrivateStart.
This removes the use (and definition) of the Android-private range of
OMX color formats from Stagefright. Instead we will just be
interpreting the video color format of an OMX port as an Android pixel
format if the port is in native buffer mode.
Change-Id: I3ea50703336a88249e7563bc7022dfedbeac506e
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index ce48d1c..9e1b436 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1710,16 +1710,11 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() { return err; } - // Check that the color format is in the correct range. - CHECK(OMX_COLOR_FormatAndroidPrivateStart <= def.format.video.eColorFormat); - CHECK(def.format.video.eColorFormat < OMX_COLOR_FormatAndroidPrivateEnd); - err = native_window_set_buffers_geometry( mNativeWindow.get(), def.format.video.nFrameWidth, def.format.video.nFrameHeight, - def.format.video.eColorFormat - - OMX_COLOR_FormatAndroidPrivateStart); + def.format.video.eColorFormat); if (err != 0) { LOGE("native_window_set_buffers_geometry failed: %s (%d)", |