summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-17 10:21:00 -0800
committerGlenn Kasten <gkasten@google.com>2014-03-26 14:49:23 -0700
commit2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350 (patch)
tree6dde0cdf76066b31d3e0c0c96ea8e36990266fce /include
parentecdca392ed40e89a6ef14b86446e952c35497ac4 (diff)
downloadframeworks_av-2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350.zip
frameworks_av-2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350.tar.gz
frameworks_av-2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350.tar.bz2
Update comments
Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioTrack.h12
-rw-r--r--include/media/stagefright/FileSource.h1
2 files changed, 3 insertions, 10 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index d3168ba..e162b36 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -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);
diff --git a/include/media/stagefright/FileSource.h b/include/media/stagefright/FileSource.h
index d994cb3..9838ed2 100644
--- a/include/media/stagefright/FileSource.h
+++ b/include/media/stagefright/FileSource.h
@@ -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;