diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/media/MediaProfiles.h | 17 | ||||
| -rw-r--r-- | include/media/stagefright/AudioSource.h | 14 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodecList.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 24 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/QCOMXCodec.h | 2 |
7 files changed, 59 insertions, 12 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index 5f9eb01..e17bbbe 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -1,8 +1,8 @@ /* - * Copyright (C) 2007 The Android Open Source Project * Copyright (c) 2013, The Linux Foundation. All rights reserved. - * Not a Contribution, Apache license notifications and license are retained - * for attribution purposes only. + * Not a Contribution. + * + * Copyright (C) 2007 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 0df9fd4..9ea3449 100644..100755 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -33,12 +33,11 @@ enum camcorder_quality { CAMCORDER_QUALITY_480P = 4, CAMCORDER_QUALITY_720P = 5, CAMCORDER_QUALITY_1080P = 6, - CAMCORDER_QUALITY_QVGA = 11, - CAMCORDER_QUALITY_FWVGA = 7, - CAMCORDER_QUALITY_WVGA = 8, - CAMCORDER_QUALITY_VGA = 9, - CAMCORDER_QUALITY_WQVGA = 10, - + CAMCORDER_QUALITY_QVGA = 7, + CAMCORDER_QUALITY_FWVGA = 8, + CAMCORDER_QUALITY_WVGA = 9, + CAMCORDER_QUALITY_VGA = 10, + CAMCORDER_QUALITY_WQVGA = 11, CAMCORDER_QUALITY_LIST_END = 11, CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000, @@ -50,7 +49,11 @@ enum camcorder_quality { CAMCORDER_QUALITY_TIME_LAPSE_720P = 1005, CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006, CAMCORDER_QUALITY_TIME_LAPSE_QVGA = 1007, - CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1007, + CAMCORDER_QUALITY_TIME_LAPSE_FWVGA = 1008, + CAMCORDER_QUALITY_TIME_LAPSE_WVGA = 1009, + CAMCORDER_QUALITY_TIME_LAPSE_VGA = 1010, + CAMCORDER_QUALITY_TIME_LAPSE_WQVGA = 1011, + CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1011, }; /** diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index 4489254..33081cc 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project + * Copyright (c) 2013, The Linux Foundation. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -104,6 +105,19 @@ private: AudioSource(const AudioSource &); AudioSource &operator=(const AudioSource &); + +#ifdef QCOM_HARDWARE + //additions for tunnel source +public: + AudioSource( + audio_source_t inputSource, const sp<MetaData>& meta ); + +private: + audio_format_t mFormat; + String8 mMime; + int32_t mMaxBufferSize; + int64_t bufferDurationUs( ssize_t n ); +#endif }; } // namespace android diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h index dfb845b..8f2b624 100644 --- a/include/media/stagefright/MediaCodecList.h +++ b/include/media/stagefright/MediaCodecList.h @@ -99,6 +99,10 @@ private: status_t addTypeFromAttributes(const char **attrs); void addType(const char *name); +#ifdef QCOM_HARDWARE + friend class QCUtilityClass; +#endif + DISALLOW_EVIL_CONSTRUCTORS(MediaCodecList); }; diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index f63926c..db8d89e 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project + * Copyright (c) 2013, The Linux Foundation. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +32,6 @@ extern const char *MEDIA_MIMETYPE_VIDEO_RAW; extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB; extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB; -extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS; extern const char *MEDIA_MIMETYPE_AUDIO_MPEG; // layer III extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I; extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II; @@ -43,6 +43,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW; extern const char *MEDIA_MIMETYPE_AUDIO_RAW; extern const char *MEDIA_MIMETYPE_AUDIO_FLAC; extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS; +extern const char *MEDIA_MIMETYPE_AUDIO_DTS; extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4; extern const char *MEDIA_MIMETYPE_CONTAINER_WAV; @@ -57,6 +58,27 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_WVM; extern const char *MEDIA_MIMETYPE_TEXT_3GPP; extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP; +#ifdef QCOM_HARDWARE +extern const char *MEDIA_MIMETYPE_AUDIO_AC3; +extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS; +extern const char *MEDIA_MIMETYPE_AUDIO_DTS; +extern const char *MEDIA_MIMETYPE_AUDIO_DTS_LBR; +extern const char *MEDIA_MIMETYPE_AUDIO_EAC3; +extern const char *MEDIA_MIMETYPE_AUDIO_EVRC; +extern const char *MEDIA_MIMETYPE_AUDIO_WMA; + +extern const char *MEDIA_MIMETYPE_CONTAINER_3G2; +extern const char *MEDIA_MIMETYPE_CONTAINER_AAC; +extern const char *MEDIA_MIMETYPE_CONTAINER_ASF; +extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2; +extern const char *MEDIA_MIMETYPE_CONTAINER_QCP; + +extern const char *MEDIA_MIMETYPE_VIDEO_DIVX; +extern const char *MEDIA_MIMETYPE_VIDEO_DIVX311; +extern const char *MEDIA_MIMETYPE_VIDEO_DIVX4; +extern const char *MEDIA_MIMETYPE_VIDEO_WMV; +#endif + } // namespace android #endif // MEDIA_DEFS_H_ diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index bdd35a4..630f5af 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project - * Copyright (c) 2010 - 2012, The Linux Foundation. All rights reserved. + * Copyright (c) 2010 - 2013, The Linux Foundation. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -392,7 +392,9 @@ private: #ifdef QCOM_HARDWARE status_t setWMAFormat(const sp<MetaData> &inputFormat); void setAC3Format(int32_t numChannels, int32_t sampleRate); + bool mNumBFrames; #endif + }; struct CodecCapabilities { diff --git a/include/media/stagefright/QCOMXCodec.h b/include/media/stagefright/QCOMXCodec.h index ee6ea88..333487d 100644 --- a/include/media/stagefright/QCOMXCodec.h +++ b/include/media/stagefright/QCOMXCodec.h @@ -96,6 +96,8 @@ struct QCOMXCodec { static void checkIfInterlaced(const uint8_t *ptr, const sp<MetaData> &meta); + static bool useHWAACDecoder(const char *mime); + }; } |