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

Commit 59067134 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes I155f9f77,Ibb1aa07a,If460a6ef,Ifabff1c2 am: 87f08974 am: f8e4180a 

am: 36c68885

Change-Id: Ie32c25b4887461dece19e28b0115784a5afc456e
parents 2f321453 36c68885

cmds/stagefright/stagefright.cpp

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void dumpSource(const sp<IMediaSource> &source, const String8 &filename) 
                       1,

                       mbuf->range_length(),

                       out),

                (ssize_t)mbuf->range_length());

                mbuf->range_length());



        mbuf->release();

        mbuf = NULL;

include/private/media/AudioTrackShared.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ private: 
                // client write-only, server read-only

                uint16_t    mSendLevel;      // Fixed point U4.12 so 0x1000 means 1.0



                uint16_t    mPad2;           // unused

                uint16_t    mPad2 __attribute__((__unused__)); // unused



                // server write-only, client read

                ExtendedTimestampQueue::Shared mExtendedTimestampQueue;

include/private/media/VideoFrame.h

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ namespace android { 
class VideoFrame

{

public:

    VideoFrame(): mWidth(0), mHeight(0), mDisplayWidth(0), mDisplayHeight(0), mSize(0), mData(0),

            mRotationAngle(0) {}

    VideoFrame(): mWidth(0), mHeight(0), mDisplayWidth(0), mDisplayHeight(0), mSize(0),

            mRotationAngle(0), mData(0) {}



    VideoFrame(const VideoFrame& copy) {

        mWidth = copy.mWidth;

include/radio/Radio.h

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ private: 


            Mutex                   mLock;

            sp<IRadio>              mIRadio;

            const radio_handle_t    mHandle;

            sp<RadioCallback>       mCallback;

};

include/soundtrigger/SoundTrigger.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ private: 


            Mutex                               mLock;

            sp<ISoundTrigger>                   mISoundTrigger;

            const sound_trigger_module_handle_t mModule;

            sp<SoundTriggerCallback>            mCallback;

};