Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes 2023,2036 into donut

Browse Source 
* changes:
  Update more references to openInputStream in support classes. Continuation of bug 1846343
  Modify AudioFlinger to use updated openInputStream factory method. Continuation of bug 1846343
This commit is contained in:
Android (Google) Code Review
2009-05-20 07:15:39 -07:00
parent f638201182 a5e2ef0af0
commit a59aba8cd8
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/audioflinger/A2dpAudioInterface.cpp
View File

@@ -71,8 +71,8 @@ AudioStreamOut* A2dpAudioInterface::openOutputStream(
} }
AudioStreamIn* A2dpAudioInterface::openInputStream( AudioStreamIn* A2dpAudioInterface::openInputStream(
int format, int channelCount, uint32_t sampleRate, status_t *status, int inputSource, int format, int channelCount, uint32_t sampleRate,
AudioSystem::audio_in_acoustics acoustics) status_t *status, AudioSystem::audio_in_acoustics acoustics)
{ {
if (status) if (status)
*status = -1; *status = -1;

12
libs/audioflinger/A2dpAudioInterface.h
View File

@@ -55,12 +55,24 @@ public:
status_t *status=0); status_t *status=0);
virtual AudioStreamIn* openInputStream( virtual AudioStreamIn* openInputStream(
int inputSource,
int format, int format,
int channelCount, int channelCount,
uint32_t sampleRate, uint32_t sampleRate,
status_t *status, status_t *status,
AudioSystem::audio_in_acoustics acoustics); AudioSystem::audio_in_acoustics acoustics);
// DEPRECATED - WILL BE REMOVED
virtual AudioStreamIn* openInputStream(
int format,
int channelCount,
uint32_t sampleRate,
status_t *status,
AudioSystem::audio_in_acoustics acoustics)
{
return openInputStream(-1, format, channelCount, sampleRate, status, acoustics);
}
protected: protected:
virtual status_t doRouting(); virtual status_t doRouting();
virtual status_t dump(int fd, const Vector<String16>& args); virtual status_t dump(int fd, const Vector<String16>& args);

10
libs/audioflinger/AudioDumpInterface.h
View File

@@ -78,9 +78,13 @@ public:
virtual status_t setParameter(const char* key, const char* value) virtual status_t setParameter(const char* key, const char* value)
{return mFinalInterface->setParameter(key, value);} {return mFinalInterface->setParameter(key, value);}
virtual AudioStreamIn* openInputStream( int format, int channelCount, uint32_t sampleRate, status_t *status, virtual AudioStreamIn* openInputStream(int inputSource, int format, int channelCount,
AudioSystem::audio_in_acoustics acoustics) uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics)
{return mFinalInterface->openInputStream( format, channelCount, sampleRate, status, acoustics);} { return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, acoustics); }
virtual AudioStreamIn* openInputStream(int format, int channelCount, uint32_t sampleRate,
status_t *status, AudioSystem::audio_in_acoustics acoustics)
{ return mFinalInterface->openInputStream(-1, format, channelCount, sampleRate, status, acoustics); }
virtual status_t dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); } virtual status_t dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); }

4
libs/audioflinger/AudioFlinger.cpp
View File

@@ -2407,7 +2407,9 @@ bool AudioFlinger::AudioRecordThread::threadLoop()
LOGV("AudioRecordThread: loop starting"); LOGV("AudioRecordThread: loop starting");
if (mRecordTrack != 0) { if (mRecordTrack != 0) {
input = mAudioHardware->openInputStream(mRecordTrack->format(), input = mAudioHardware->openInputStream(
mRecordTrack->type(),
mRecordTrack->format(),
mRecordTrack->channelCount(), mRecordTrack->channelCount(),
mRecordTrack->sampleRate(), mRecordTrack->sampleRate(),
&mStartStatus, &mStartStatus,