summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPraveen Chavan <pchavan@codeaurora.org>2014-05-29 02:38:43 -0700
committerSteve Kondik <steve@cyngn.com>2015-11-05 02:39:49 -0800
commit6b4318a6242c6d65ff2b5b88eebcb7e99a8f78ee (patch)
tree60c20ce0a800078960c09bbcac5988d1ae90e521 /include
parenta1f4fae05db0af7c1ab17d9566e6786f4bdcf7ff (diff)
downloadframeworks_av-6b4318a6242c6d65ff2b5b88eebcb7e99a8f78ee.zip
frameworks_av-6b4318a6242c6d65ff2b5b88eebcb7e99a8f78ee.tar.gz
frameworks_av-6b4318a6242c6d65ff2b5b88eebcb7e99a8f78ee.tar.bz2
MediaProfiles: Enhance profiles for extended usecases
Add more supported video resolutions for camcorder and timelapse recording. Augment encoder profiles with HFR parameters. Change-Id: I887d6259db0a97b3a705813dc754b4b0faff47fc
Diffstat (limited to 'include')
-rwxr-xr-x[-rw-r--r--]include/media/MediaProfiles.h16
-rwxr-xr-x[-rw-r--r--]include/media/mediarecorder.h3
2 files changed, 17 insertions, 2 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h
index 5a81574..c67bae9 100644..100755
--- a/include/media/MediaProfiles.h
+++ b/include/media/MediaProfiles.h
@@ -1,4 +1,6 @@
/*
+ ** Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ ** Not a Contribution.
**
** Copyright 2010, The Android Open Source Project.
**
@@ -136,6 +138,9 @@ public:
* enc.vid.bps.max - max bit rate in bits per second
* enc.vid.fps.min - min frame rate in frames per second
* enc.vid.fps.max - max frame rate in frames per second
+ * enc.vid.hfr.width.max - max hfr video frame width
+ * enc.vid.hfr.height.max - max hfr video frame height
+ * enc.vid.hfr.mode.max - max hfr mode
*/
int getVideoEncoderParamByName(const char *name, video_encoder codec) const;
@@ -274,12 +279,16 @@ private:
int minBitRate, int maxBitRate,
int minFrameWidth, int maxFrameWidth,
int minFrameHeight, int maxFrameHeight,
- int minFrameRate, int maxFrameRate)
+ int minFrameRate, int maxFrameRate,
+ int maxHFRFrameWidth, int maxHFRFrameHeight,
+ int maxHFRMode)
: mCodec(codec),
mMinBitRate(minBitRate), mMaxBitRate(maxBitRate),
mMinFrameWidth(minFrameWidth), mMaxFrameWidth(maxFrameWidth),
mMinFrameHeight(minFrameHeight), mMaxFrameHeight(maxFrameHeight),
- mMinFrameRate(minFrameRate), mMaxFrameRate(maxFrameRate) {}
+ mMinFrameRate(minFrameRate), mMaxFrameRate(maxFrameRate),
+ mMaxHFRFrameWidth(maxHFRFrameWidth), mMaxHFRFrameHeight(maxHFRFrameHeight),
+ mMaxHFRMode(maxHFRMode) {}
~VideoEncoderCap() {}
@@ -288,6 +297,8 @@ private:
int mMinFrameWidth, mMaxFrameWidth;
int mMinFrameHeight, mMaxFrameHeight;
int mMinFrameRate, mMaxFrameRate;
+ int mMaxHFRFrameWidth, mMaxHFRFrameHeight;
+ int mMaxHFRMode;
};
struct AudioEncoderCap {
@@ -402,6 +413,7 @@ private:
static VideoEncoderCap* createDefaultH263VideoEncoderCap();
static VideoEncoderCap* createDefaultM4vVideoEncoderCap();
static AudioEncoderCap* createDefaultAmrNBEncoderCap();
+ static AudioEncoderCap* createDefaultAacEncoderCap();
static AudioEncoderCap* createDefaultLpcmEncoderCap();
static int findTagForName(const NameToTagMap *map, size_t nMappings, const char *name);
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h
index 6ace36d..93b5d67 100644..100755
--- a/include/media/mediarecorder.h
+++ b/include/media/mediarecorder.h
@@ -1,4 +1,7 @@
/*
+ ** Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ ** Not a Contribution.
+ **
** Copyright (C) 2008 The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");