Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f507cf9 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 6026a514: Move JPEGSource.{cpp,h} into libstagefright. 

Merge commit '6026a514248f0c603d0e8c4a3f542abab3fa1509' into eclair-plus-aosp

* commit '6026a514248f0c603d0e8c4a3f542abab3fa1509':
  Move JPEGSource.{cpp,h} into libstagefright.
parents 6f8ea192 777893a9

cmds/stagefright/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=       \

        JPEGSource.cpp  \

	stagefright.cpp



LOCAL_SHARED_LIBRARIES := \

cmds/stagefright/stagefright.cpp

+1 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <media/IMediaPlayerService.h>

#include <media/stagefright/CachingDataSource.h>

#include <media/stagefright/HTTPDataSource.h>

#include <media/stagefright/JPEGSource.h>

#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaPlayerImpl.h>
@@ -35,8 +36,6 @@ 
#include <media/stagefright/OMXClient.h>

#include <media/stagefright/OMXCodec.h>



#include "JPEGSource.h"



using namespace android;



static long gNumRepetitions;

cmds/stagefright/JPEGSource.h→include/media/stagefright/JPEGSource.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ class DataSource; 
class MediaBufferGroup;



struct JPEGSource : public MediaSource {

    // Assumes ownership of "source".

    JPEGSource(const sp<DataSource> &source);



    virtual status_t start(MetaData *params = NULL);

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ LOCAL_SRC_FILES:= \ 
        FileSource.cpp            \

        HTTPDataSource.cpp        \

        HTTPStream.cpp            \

        JPEGSource.cpp            \

        MP3Extractor.cpp          \

        MPEG4Extractor.cpp        \

        MPEG4Writer.cpp           \

cmds/stagefright/JPEGSource.cpp→media/libstagefright/JPEGSource.cpp

+1 −2
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ 
#define LOG_TAG "JPEGSource"

#include <utils/Log.h>



#include "JPEGSource.h"



#include <media/stagefright/DataSource.h>

#include <media/stagefright/JPEGSource.h>

#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaDefs.h>