diff options
| author | Colin Cross <ccross@android.com> | 2012-03-24 15:12:07 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-03-24 23:34:43 -0700 |
| commit | 26a417f68526fee861bb527f1a4e3ed548979f93 (patch) | |
| tree | 89962980c55919ae8066eaab4c0db16a7d6699d3 /cmds/stagefright/stagefright.cpp | |
| parent | 8f7f7ad54c698cb57a2a369cf1ae5b917853917b (diff) | |
| download | frameworks_av-26a417f68526fee861bb527f1a4e3ed548979f93.zip frameworks_av-26a417f68526fee861bb527f1a4e3ed548979f93.tar.gz frameworks_av-26a417f68526fee861bb527f1a4e3ed548979f93.tar.bz2 | |
stagefright: remove dependency on skia
skia is only used to write a jpeg file, link directly to libjpeg
instead.
Change-Id: Iea8f4a2347c38328776541d2b74bcbdea3f62041
Diffstat (limited to 'cmds/stagefright/stagefright.cpp')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index dab2e0f..d70c862 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -24,6 +24,7 @@ #include <string.h> #include <unistd.h> +#include "jpeg.h" #include "SineSource.h" #include <binder/IServiceManager.h> @@ -49,8 +50,6 @@ #include <media/stagefright/MPEG4Writer.h> #include <private/media/VideoFrame.h> -#include <SkBitmap.h> -#include <SkImageEncoder.h> #include <fcntl.h> @@ -787,16 +786,9 @@ int main(int argc, char **argv) { VideoFrame *frame = (VideoFrame *)mem->pointer(); - SkBitmap bitmap; - bitmap.setConfig( - SkBitmap::kRGB_565_Config, frame->mWidth, frame->mHeight); - - bitmap.setPixels((uint8_t *)frame + sizeof(VideoFrame)); - - CHECK(SkImageEncoder::EncodeFile( - "/sdcard/out.jpg", bitmap, - SkImageEncoder::kJPEG_Type, - SkImageEncoder::kDefaultQuality)); + CHECK_EQ(writeJpegFile("/sdcard/out.jpg", + (uint8_t *)frame + sizeof(VideoFrame), + frame->mWidth, frame->mHeight), 0); } { |