diff options
| author | Surajit Podder <spodder@codeaurora.org> | 2015-07-22 18:58:29 +0530 |
|---|---|---|
| committer | Satish Kamuju <skamuj@codeaurora.org> | 2015-10-06 17:35:24 +0530 |
| commit | bd019775a921ae9165e924e4d37bc838a7ef5781 (patch) | |
| tree | e0ca419e9f0d1d28a9caed2d00ebcb7021284c4e /include | |
| parent | 61f6cfa961d22a9a54d91366fefec135f091012d (diff) | |
| download | frameworks_av-bd019775a921ae9165e924e4d37bc838a7ef5781.zip frameworks_av-bd019775a921ae9165e924e4d37bc838a7ef5781.tar.gz frameworks_av-bd019775a921ae9165e924e4d37bc838a7ef5781.tar.bz2 | |
video: Port AOSP fixes
Includes following fixes:
f510d0c libstagefright: Disable multi slice mode for video encode
ca46843 audio: Fix for failure in CTS MediaRecorderTest cases
b4d0490 libstagefright: check the audio source when adding to MPEG4Writer
89c6c3f libstagefright: Allocate cached camera buffers for sw encoders
f2c387b libstagefright: Choose target specific media_codecs.xml
f3e7122 libstagefright: Implement fallback mechanism to SW decoder
Change-Id: I90398b2fead1f4e163935bf1db342e24275f7933
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodecSource.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 9eaec9b..aaaf2d1 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -376,7 +376,7 @@ protected: status_t configureBitrate( int32_t bitrate, OMX_VIDEO_CONTROLRATETYPE bitrateMode); - status_t setupErrorCorrectionParameters(); + virtual status_t setupErrorCorrectionParameters(); status_t initNativeWindow(); @@ -437,6 +437,8 @@ protected: return OK; } + sp<IOMXObserver> createObserver(); + DISALLOW_EVIL_CONSTRUCTORS(ACodec); }; diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h index 71f58a9..d41d87b 100644 --- a/include/media/stagefright/MediaCodecSource.h +++ b/include/media/stagefright/MediaCodecSource.h @@ -28,7 +28,7 @@ class AMessage; struct AReplyToken; class IGraphicBufferProducer; class IGraphicBufferConsumer; -class MediaCodec; +struct MediaCodec; class MetaData; struct MediaCodecSource : public MediaSource, |