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

Commit 2301acc6 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Update comments 

Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
parent ecdca392

include/media/AudioTrack.h

+2 −10
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public: 
                                  // (currently ignored, but will make the primary field in future)



        size_t      size;         // input/output in bytes == frameCount * frameSize

                                  // on input it is unused

                                  // on output is the number of bytes actually filled

                                  // FIXME this is redundant with respect to frameCount,

                                  // and TRANSFER_OBTAIN mode is broken for 8-bit data
@@ -86,7 +87,7 @@ public: 
            void*       raw;

            short*      i16;      // signed 16-bit

            int8_t*     i8;       // unsigned 8-bit, offset by 0x80

        };

        };                        // input: unused, output: pointer to buffer

    };



    /* As a convenience, if a callback is supplied, a handler thread
@@ -528,15 +529,6 @@ private: 
                                     struct timespec *elapsed = NULL, size_t *nonContig = NULL);

public:



//EL_FIXME to be reconciled with new obtainBuffer() return codes and control block proxy

//            enum {

//            NO_MORE_BUFFERS = 0x80000001,   // same name in AudioFlinger.h, ok to be different value

//            TEAR_DOWN       = 0x80000002,

//            STOPPED = 1,

//            STREAM_END_WAIT,

//            STREAM_END

//        };



    /* Release a filled buffer of "audioBuffer->frameCount" frames for AudioFlinger to process. */

    // FIXME make private when obtainBuffer() for TRANSFER_OBTAIN is removed

            void        releaseBuffer(Buffer* audioBuffer);

include/media/stagefright/FileSource.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ namespace android { 
class FileSource : public DataSource {

public:

    FileSource(const char *filename);

    // FileSource takes ownership and will close the fd

    FileSource(int fd, int64_t offset, int64_t length);



    virtual status_t initCheck() const;

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -534,7 +534,8 @@ status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) { 
        mAudioTrack = new AudioTrack(

                AUDIO_STREAM_MUSIC, mSampleRate, AUDIO_FORMAT_PCM_16_BIT,

                audio_channel_out_mask_from_count(numChannels),

                0, AUDIO_OUTPUT_FLAG_NONE, &AudioCallback, this, 0);

                0 /*frameCount*/, AUDIO_OUTPUT_FLAG_NONE, &AudioCallback, this,

                0 /*notificationFrames*/);



        if ((err = mAudioTrack->initCheck()) != OK) {

            mAudioTrack.clear();

media/libmedia/AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ Mutex AudioSystem::gLock; 
sp<IAudioFlinger> AudioSystem::gAudioFlinger;

sp<AudioSystem::AudioFlingerClient> AudioSystem::gAudioFlingerClient;

audio_error_callback AudioSystem::gAudioErrorCallback = NULL;

// Cached values



// Cached values for output handles

DefaultKeyedVector<audio_io_handle_t, AudioSystem::OutputDescriptor *> AudioSystem::gOutputs(NULL);



// Cached values for recording queries, all protected by gLock

media/libmedia/IAudioFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public: 
        data.writeInt32(frameCount);

        track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT;

        data.writeInt32(lFlags);

        // haveSharedBuffer

        if (sharedBuffer != 0) {

            data.writeInt32(true);

            data.writeStrongBinder(sharedBuffer->asBinder());
@@ -424,6 +425,7 @@ public: 
        data.writeInt32(channelMask);

        data.writeInt32(latency);

        data.writeInt32((int32_t) flags);

        // hasOffloadInfo

        if (offloadInfo == NULL) {

            data.writeInt32(0);

        } else {