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

Commit b187de1a authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Line length 100 

Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
parent 64cbdee0

include/media/AudioTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ protected: 


    float                   mVolume[2];

    float                   mSendLevel;

    mutable uint32_t        mSampleRate;            // mutable because getSampleRate() can update it.

    mutable uint32_t        mSampleRate;            // mutable because getSampleRate() can update it

    size_t                  mFrameCount;            // corresponds to current IAudioTrack, value is

                                                    // reported back by AudioFlinger to the client

    size_t                  mReqFrameCount;         // frame count to request the first or next time

include/media/IMediaPlayerService.h

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ public: 


    virtual sp<IMediaRecorder> createMediaRecorder() = 0;

    virtual sp<IMediaMetadataRetriever> createMetadataRetriever() = 0;

    virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client, int audioSessionId = 0) = 0;

    virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client, int audioSessionId = 0)

            = 0;



    virtual status_t         decode(

            const sp<IMediaHTTPService> &httpService,

include/media/nbaio/NBAIO.h

+4 −2
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ public: 
    virtual status_t getTimestamp(AudioTimestamp& timestamp) { return INVALID_OPERATION; }



protected:

    NBAIO_Sink(const NBAIO_Format& format = Format_Invalid) : NBAIO_Port(format), mFramesWritten(0) { }

    NBAIO_Sink(const NBAIO_Format& format = Format_Invalid) : NBAIO_Port(format), mFramesWritten(0)

            { }

    virtual ~NBAIO_Sink() { }



    // Implementations are free to ignore these if they don't need them
@@ -322,7 +323,8 @@ public: 
    virtual void    onTimestamp(const AudioTimestamp& timestamp) { }



protected:

    NBAIO_Source(const NBAIO_Format& format = Format_Invalid) : NBAIO_Port(format), mFramesRead(0) { }

    NBAIO_Source(const NBAIO_Format& format = Format_Invalid) : NBAIO_Port(format), mFramesRead(0)

            { }

    virtual ~NBAIO_Source() { }



    // Implementations are free to ignore these if they don't need them

include/ndk/NdkMediaCodec.h

+2 −1
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ media_status_t AMediaCodec_queueSecureInputBuffer(AMediaCodec*, 
/**

 * Get the index of the next available buffer of processed data.

 */

ssize_t AMediaCodec_dequeueOutputBuffer(AMediaCodec*, AMediaCodecBufferInfo *info, int64_t timeoutUs);

ssize_t AMediaCodec_dequeueOutputBuffer(AMediaCodec*, AMediaCodecBufferInfo *info,

        int64_t timeoutUs);

AMediaFormat* AMediaCodec_getOutputFormat(AMediaCodec*);



/**

include/ndk/NdkMediaExtractor.h

+4 −2
Original line number Diff line number Diff line
@@ -55,12 +55,14 @@ media_status_t AMediaExtractor_delete(AMediaExtractor*); 
/**

 *  Set the file descriptor from which the extractor will read.

 */

media_status_t AMediaExtractor_setDataSourceFd(AMediaExtractor*, int fd, off64_t offset, off64_t length);

media_status_t AMediaExtractor_setDataSourceFd(AMediaExtractor*, int fd, off64_t offset,

        off64_t length);



/**

 * Set the URI from which the extractor will read.

 */

media_status_t AMediaExtractor_setDataSource(AMediaExtractor*, const char *location); // TODO support headers

media_status_t AMediaExtractor_setDataSource(AMediaExtractor*, const char *location);

        // TODO support headers



/**

 * Return the number of tracks in the previously specified media file