android-2.1_r1 snapshot (4655f856) · Commits · e / os / android_frameworks_native-old

camera/libcameraservice/CameraService.cpp

+16 −4

Original line number	Diff line number	Diff line
		@@ -669,9 +669,15 @@ status_t CameraService::Client::startRecording()
		LOGD("startRecording (pid %d)", getCallingPid());

		if (mMediaPlayerBeep.get() != NULL) {
		// do not play record jingle if stream volume is 0
		// (typically because ringer mode is silent).
		int index;
		AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index);
		if (index != 0) {
		mMediaPlayerBeep->seekTo(0);
		mMediaPlayerBeep->start();
		}
		}

		mHardware->enableMsgType(CAMERA_MSG_VIDEO_FRAME);

		@@ -888,9 +894,15 @@ void CameraService::Client::handleShutter(
		{
		// Play shutter sound.
		if (mMediaPlayerClick.get() != NULL) {
		// do not play shutter sound if stream volume is 0
		// (typically because ringer mode is silent).
		int index;
		AudioSystem::getStreamVolumeIndex(AudioSystem::ENFORCED_AUDIBLE, &index);
		if (index != 0) {
		mMediaPlayerClick->seekTo(0);
		mMediaPlayerClick->start();
		}
		}

		// Screen goes black after the buffer is unregistered.
		if (mSurface != 0 && !mUseOverlay) {

include/ui/Surface.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ private:

		~SurfaceControl();

		status_t validate(SharedClient const* cblk) const;
		status_t validate() const;
		void destroy();

		sp<SurfaceComposerClient> mClient;
		@@ -190,7 +190,7 @@ private:

		status_t getBufferLocked(int index, int usage);

		status_t validate(SharedClient const* cblk) const;
		status_t validate() const;

		inline const GraphicBufferMapper& getBufferMapper() const { return mBufferMapper; }
		inline GraphicBufferMapper& getBufferMapper() { return mBufferMapper; }

libs/audioflinger/AudioFlinger.cpp

+276 −180

File changed.

Preview size limit exceeded, changes collapsed.

libs/audioflinger/AudioFlinger.h

+29 −12

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ private:

		class ThreadBase : public Thread {
		public:
		ThreadBase (const sp<AudioFlinger>& audioFlinger);
		ThreadBase (const sp<AudioFlinger>& audioFlinger, int id);
		virtual ~ThreadBase();

		status_t dumpBase(int fd, const Vector<String16>& args);
		@@ -323,6 +323,7 @@ private:
		void sendConfigEvent(int event, int param = 0);
		void sendConfigEvent_l(int event, int param = 0);
		void processConfigEvents();
		int id() const { return mId;}

		mutable Mutex mLock;

		@@ -349,6 +350,8 @@ private:
		status_t mParamStatus;
		Vector<ConfigEvent *> mConfigEvents;
		bool mStandby;
		int mId;
		bool mExiting;
		};

		// --- PlaybackThread ---
		@@ -361,6 +364,12 @@ private:
		DUPLICATING
		};

		enum mixer_state {
		MIXER_IDLE,
		MIXER_TRACKS_ENABLED,
		MIXER_TRACKS_READY
		};

		// playback track
		class Track : public TrackBase {
		public:
		@@ -415,6 +424,10 @@ private:
		void setPaused() { mState = PAUSED; }
		void reset();

		bool isOutputTrack() const {
		return (mStreamType == AudioSystem::NUM_STREAM_TYPES);
		}

		// we don't really need a lock for these
		float mVolume[2];
		volatile bool mMute;
		@@ -467,7 +480,7 @@ private:

		}; // end of OutputTrack

		PlaybackThread (const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output);
		PlaybackThread (const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output, int id);
		virtual ~PlaybackThread();

		virtual status_t dump(int fd, const Vector<String16>& args);
		@@ -530,7 +543,8 @@ private:

		virtual int getTrackName_l() = 0;
		virtual void deleteTrackName_l(int name) = 0;
		virtual uint32_t getMaxBufferRecoveryInUsecs() = 0;
		virtual uint32_t activeSleepTimeUs() = 0;
		virtual uint32_t idleSleepTimeUs() = 0;

		private:

		@@ -562,12 +576,11 @@ private:
		int mNumWrites;
		int mNumDelayedWrites;
		bool mInWrite;
		int mMinBytesToWrite;
		};

		class MixerThread : public PlaybackThread {
		public:
		MixerThread (const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output);
		MixerThread (const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output, int id);
		virtual ~MixerThread();

		// Thread virtuals
		@@ -582,10 +595,11 @@ private:
		virtual status_t dumpInternals(int fd, const Vector<String16>& args);

		protected:
		size_t prepareTracks_l(const SortedVector< wp<Track> >& activeTracks, Vector< sp<Track> > *tracksToRemove);
		uint32_t prepareTracks_l(const SortedVector< wp<Track> >& activeTracks, Vector< sp<Track> > *tracksToRemove);
		virtual int getTrackName_l();
		virtual void deleteTrackName_l(int name);
		virtual uint32_t getMaxBufferRecoveryInUsecs();
		virtual uint32_t activeSleepTimeUs();
		virtual uint32_t idleSleepTimeUs();

		AudioMixer* mAudioMixer;
		};
		@@ -593,7 +607,7 @@ private:
		class DirectOutputThread : public PlaybackThread {
		public:

		DirectOutputThread (const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output);
		DirectOutputThread (const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output, int id);
		~DirectOutputThread();

		// Thread virtuals
		@@ -604,7 +618,8 @@ private:
		protected:
		virtual int getTrackName_l();
		virtual void deleteTrackName_l(int name);
		virtual uint32_t getMaxBufferRecoveryInUsecs();
		virtual uint32_t activeSleepTimeUs();
		virtual uint32_t idleSleepTimeUs();

		private:
		float mLeftVolume;
		@@ -613,7 +628,7 @@ private:

		class DuplicatingThread : public MixerThread {
		public:
		DuplicatingThread (const sp<AudioFlinger>& audioFlinger, MixerThread* mainThread);
		DuplicatingThread (const sp<AudioFlinger>& audioFlinger, MixerThread* mainThread, int id);
		~DuplicatingThread();

		// Thread virtuals
		@@ -629,7 +644,7 @@ private:
		MixerThread *checkMixerThread_l(int output) const;
		RecordThread *checkRecordThread_l(int input) const;
		float streamVolumeInternal(int stream) const { return mStreamTypes[stream].volume; }
		void audioConfigChanged_l(int event, const sp<ThreadBase>& thread, void *param2);
		void audioConfigChanged_l(int event, int ioHandle, void *param2);

		friend class AudioBuffer;

		@@ -697,7 +712,8 @@ private:
		RecordThread(const sp<AudioFlinger>& audioFlinger,
		AudioStreamIn *input,
		uint32_t sampleRate,
		uint32_t channels);
		uint32_t channels,
		int id);
		~RecordThread();

		virtual bool threadLoop();
		@@ -728,6 +744,7 @@ private:
		size_t mInputBytes;
		int mReqChannelCount;
		uint32_t mReqSampleRate;
		ssize_t mBytesRead;
		};

		class RecordHandle : public android::BnAudioRecord {

libs/binder/ProcessState.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		#include <sys/mman.h>
		#include <sys/stat.h>

		#define BINDER_VM_SIZE (110241024)
		#define BINDER_VM_SIZE ((110241024) - (4096 *2))

		static bool gSingleProcess = false;