diff options
author | Surajit Podder <spodder@codeaurora.org> | 2015-07-21 15:29:39 +0530 |
---|---|---|
committer | Satish Kamuju <skamuj@codeaurora.org> | 2015-10-06 17:36:01 +0530 |
commit | 9953765019ae2243e98e8e74eee327c9893b93d1 (patch) | |
tree | a0d21f06540cbdac85dcb6348a27b9eddf3cb68d /media | |
parent | bd019775a921ae9165e924e4d37bc838a7ef5781 (diff) | |
download | frameworks_av-9953765019ae2243e98e8e74eee327c9893b93d1.zip frameworks_av-9953765019ae2243e98e8e74eee327c9893b93d1.tar.gz frameworks_av-9953765019ae2243e98e8e74eee327c9893b93d1.tar.bz2 |
video: Modify classes to support camcorder pause/resume
* Modify MediaRecorder, CameraSource, AudioSource to
be extendable.
* Add hooks to instantiate extended implementations to
implement pause/resume.
Change-Id: I847263fc69e4f613c5ea60fb6809c7da176d3a8d
Diffstat (limited to 'media')
-rw-r--r-- | media/libavextensions/common/AVExtensionsCommon.h | 2 | ||||
-rw-r--r-- | media/libavextensions/common/ExtensionsLoader.hpp | 2 | ||||
-rw-r--r-- | media/libavextensions/media/AVMediaExtensions.h | 3 | ||||
-rw-r--r-- | media/libavextensions/media/AVMediaUtils.cpp | 5 | ||||
-rw-r--r-- | media/libavextensions/stagefright/AVExtensions.h | 25 | ||||
-rw-r--r-- | media/libavextensions/stagefright/AVFactory.cpp | 28 | ||||
-rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 15 | ||||
-rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.h | 6 | ||||
-rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 6 | ||||
-rw-r--r-- | media/libstagefright/MediaCodecSource.cpp | 5 |
10 files changed, 81 insertions, 16 deletions
diff --git a/media/libavextensions/common/AVExtensionsCommon.h b/media/libavextensions/common/AVExtensionsCommon.h index 52a247a..c39872e 100644 --- a/media/libavextensions/common/AVExtensionsCommon.h +++ b/media/libavextensions/common/AVExtensionsCommon.h @@ -31,8 +31,6 @@ namespace android { -static const char * CUSTOMIZATION_LIB_NAME = "libavenhancements.so"; - typedef void *(*createFunction_t)(void); template <typename T> diff --git a/media/libavextensions/common/ExtensionsLoader.hpp b/media/libavextensions/common/ExtensionsLoader.hpp index b23b868..e03979c 100644 --- a/media/libavextensions/common/ExtensionsLoader.hpp +++ b/media/libavextensions/common/ExtensionsLoader.hpp @@ -31,6 +31,8 @@ namespace android { +static const char * CUSTOMIZATION_LIB_NAME = "libavenhancements.so"; + /* * Create strongly-typed objects of type T * If the customization library exists and does contain a "named" constructor, diff --git a/media/libavextensions/media/AVMediaExtensions.h b/media/libavextensions/media/AVMediaExtensions.h index 4dc3d95..ea5245c 100644 --- a/media/libavextensions/media/AVMediaExtensions.h +++ b/media/libavextensions/media/AVMediaExtensions.h @@ -36,6 +36,7 @@ namespace android { +class MediaRecorder; /* * Common delegate to the classes in libstagefright */ @@ -57,6 +58,8 @@ struct AVMediaUtils { virtual size_t AudioTrackGetOffloadFrameCount(size_t frameCount) { return frameCount; } + + virtual sp<MediaRecorder> createMediaRecorder(const String16& opPackageName); // ----- NO TRESSPASSING BEYOND THIS LINE ------ DECLARE_LOADABLE_SINGLETON(AVMediaUtils); }; diff --git a/media/libavextensions/media/AVMediaUtils.cpp b/media/libavextensions/media/AVMediaUtils.cpp index 7c21414..0f9e9eb 100644 --- a/media/libavextensions/media/AVMediaUtils.cpp +++ b/media/libavextensions/media/AVMediaUtils.cpp @@ -40,6 +40,7 @@ #include <media/stagefright/ACodec.h> #include <media/AudioTrack.h> +#include <media/mediarecorder.h> #include "common/ExtensionsLoader.hpp" #include "media/AVMediaExtensions.h" @@ -53,6 +54,10 @@ AVMediaUtils::AVMediaUtils() { AVMediaUtils::~AVMediaUtils() { } +sp<MediaRecorder> AVMediaUtils::createMediaRecorder(const String16& opPackageName) { + return new MediaRecorder(opPackageName); +} + //static AVMediaUtils *AVMediaUtils::sInst = ExtensionsLoader<AVMediaUtils>::createInstance("createExtendedMediaUtils"); diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h index 4d73f59..e75499f 100644 --- a/media/libavextensions/stagefright/AVExtensions.h +++ b/media/libavextensions/stagefright/AVExtensions.h @@ -46,10 +46,18 @@ struct ACodec; struct ALooper; struct IMediaHTTPConnection; struct MediaCodec; +struct MediaSource; struct MediaHTTP; struct NuCachedSource2; class CameraParameters; class MediaBuffer; +struct AudioSource; +class CameraSource; +class ICamera; +class ICameraRecordingProxy; +class String16; +class IGraphicBufferProducer; +struct Size; /* * Factory to create objects of base-classes in libstagefright @@ -69,6 +77,23 @@ struct AVFactory { virtual MediaHTTP* createMediaHTTP( const sp<IMediaHTTPConnection> &conn); + virtual AudioSource* createAudioSource( + audio_source_t inputSource, + const String16 &opPackageName, + uint32_t sampleRate, + uint32_t channels, + uint32_t outSampleRate = 0); + + virtual CameraSource *CreateFromCamera( + const sp<ICamera> &camera, + const sp<ICameraRecordingProxy> &proxy, + int32_t cameraId, + const String16& clientName, + uid_t clientUid, + Size videoSize, + int32_t frameRate, + const sp<IGraphicBufferProducer>& surface, + bool storeMetaDataInVideoBuffers = true); // ----- NO TRESSPASSING BEYOND THIS LINE ------ DECLARE_LOADABLE_SINGLETON(AVFactory); }; diff --git a/media/libavextensions/stagefright/AVFactory.cpp b/media/libavextensions/stagefright/AVFactory.cpp index fe00f45..19977e9 100644 --- a/media/libavextensions/stagefright/AVFactory.cpp +++ b/media/libavextensions/stagefright/AVFactory.cpp @@ -41,6 +41,9 @@ #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaExtractor.h> #include <media/stagefright/MediaHTTP.h> +#include <media/stagefright/AudioSource.h> +#include <media/stagefright/CameraSource.h> +#include <camera/CameraParameters.h> #include "common/ExtensionsLoader.hpp" #include "stagefright/AVExtensions.h" @@ -75,6 +78,31 @@ MediaHTTP* AVFactory::createMediaHTTP( return new MediaHTTP(conn); } +AudioSource* AVFactory::createAudioSource( + audio_source_t inputSource, + const String16 &opPackageName, + uint32_t sampleRate, + uint32_t channels, + uint32_t outSampleRate) { + return new AudioSource(inputSource, opPackageName, sampleRate, + channels, outSampleRate); +} + +CameraSource* AVFactory::CreateFromCamera( + const sp<ICamera> &camera, + const sp<ICameraRecordingProxy> &proxy, + int32_t cameraId, + const String16& clientName, + uid_t clientUid, + Size videoSize, + int32_t frameRate, + const sp<IGraphicBufferProducer>& surface, + bool storeMetaDataInVideoBuffers) { + return CameraSource::CreateFromCamera(camera, proxy, cameraId, + clientName, clientUid, videoSize, frameRate, surface, + storeMetaDataInVideoBuffers); +} + // ----- NO TRESSPASSING BEYOND THIS LINE ------ AVFactory::AVFactory() { } diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 4f3e2ea..136e6cf 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -939,13 +939,12 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() { } } - sp<AudioSource> audioSource = - new AudioSource( - mAudioSource, - mOpPackageName, - sourceSampleRate, - mAudioChannels, - mSampleRate); + sp<AudioSource> audioSource = AVFactory::get()->createAudioSource( + mAudioSource, + mOpPackageName, + sourceSampleRate, + mAudioChannels, + mSampleRate); status_t err = audioSource->initCheck(); @@ -1472,7 +1471,7 @@ status_t StagefrightRecorder::setupCameraSource( mTimeBetweenCaptureUs); *cameraSource = mCameraSourceTimeLapse; } else { - *cameraSource = CameraSource::CreateFromCamera( + *cameraSource = AVFactory::get()->CreateFromCamera( mCamera, mCameraProxy, mCameraId, mClientName, mClientUid, videoSize, mFrameRate, mPreviewSurface); diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index 6b9bc92..d2ff62d 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -140,7 +140,7 @@ protected: status_t setupRawAudioRecording(); status_t setupRTPRecording(); status_t setupMPEG2TSRecording(); - sp<MediaSource> createAudioSource(); + virtual sp<MediaSource> createAudioSource(); virtual status_t checkVideoEncoderCapabilities(); status_t checkAudioEncoderCapabilities(); // Generic MediaSource set-up. Returns the appropriate @@ -149,13 +149,13 @@ protected: status_t setupMediaSource(sp<MediaSource> *mediaSource); status_t setupCameraSource(sp<CameraSource> *cameraSource); status_t setupAudioEncoder(const sp<MediaWriter>& writer); - status_t setupVideoEncoder(sp<MediaSource> cameraSource, sp<MediaSource> *source); + virtual status_t setupVideoEncoder(sp<MediaSource> cameraSource, sp<MediaSource> *source); virtual void setupCustomVideoEncoderParams(sp<MediaSource> /*cameraSource*/, sp<AMessage> &/*format*/) {} virtual bool setCustomVideoEncoderMime(const video_encoder videoEncoder, sp<AMessage> format); // Encoding parameter handling utilities - status_t setParameter(const String8 &key, const String8 &value); + virtual status_t setParameter(const String8 &key, const String8 &value); status_t setParamAudioEncodingBitRate(int32_t bitRate); status_t setParamAudioNumberOfChannels(int32_t channles); status_t setParamAudioSamplingRate(int32_t sampleRate); diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index dd80b42..94f40b4 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -697,8 +697,6 @@ status_t MPEG4Writer::start(MetaData *param) { mIsRealTimeRecording = isRealTimeRecording; } - mStartTimestampUs = -1; - if (mStarted) { if (mPaused) { mPaused = false; @@ -707,6 +705,8 @@ status_t MPEG4Writer::start(MetaData *param) { return OK; } + mStartTimestampUs = -1; + if (!param || !param->findInt32(kKeyTimeScale, &mTimeScale)) { mTimeScale = 1000; @@ -2331,6 +2331,7 @@ status_t MPEG4Writer::Track::threadEntry() { previousPausedDurationUs = mStartTimestampUs; } +#if 0 if (mResumed) { int64_t durExcludingEarlierPausesUs = timestampUs - previousPausedDurationUs; if (WARN_UNLESS(durExcludingEarlierPausesUs >= 0ll, "for %s track", trackName)) { @@ -2347,6 +2348,7 @@ status_t MPEG4Writer::Track::threadEntry() { previousPausedDurationUs += pausedDurationUs - lastDurationUs; mResumed = false; } +#endif timestampUs -= previousPausedDurationUs; if (WARN_UNLESS(timestampUs >= 0ll, "for %s track", trackName)) { diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp index ac25683..dbd9cb0 100644 --- a/media/libstagefright/MediaCodecSource.cpp +++ b/media/libstagefright/MediaCodecSource.cpp @@ -645,6 +645,9 @@ status_t MediaCodecSource::onStart(MetaData *params) { resume(); } else { CHECK(mPuller != NULL); + if (mIsVideo) { + mEncoder->requestIDRFrame(); + } mPuller->resume(); } return OK; @@ -864,7 +867,7 @@ void MediaCodecSource::onMessageReceived(const sp<AMessage> &msg) { } case kWhatPause: { - if (mFlags && FLAG_USE_SURFACE_INPUT) { + if (mFlags & FLAG_USE_SURFACE_INPUT) { suspend(); } else { CHECK(mPuller != NULL); |