summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libI420colorconvert/Android.mk (renamed from libyv12colorconvert/Android.mk)2
-rw-r--r--libI420colorconvert/ColorConvert.cpp (renamed from libyv12colorconvert/ColorConvert.cpp)12
-rw-r--r--omap4.mk2
3 files changed, 8 insertions, 8 deletions
diff --git a/libyv12colorconvert/Android.mk b/libI420colorconvert/Android.mk
index 6f781f4..ec54d31 100644
--- a/libyv12colorconvert/Android.mk
+++ b/libI420colorconvert/Android.mk
@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libyv12colorconvert
+LOCAL_MODULE := libI420colorconvert
include $(BUILD_HEAPTRACKED_SHARED_LIBRARY)
diff --git a/libyv12colorconvert/ColorConvert.cpp b/libI420colorconvert/ColorConvert.cpp
index 41dcbad..05194d2 100644
--- a/libyv12colorconvert/ColorConvert.cpp
+++ b/libI420colorconvert/ColorConvert.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "IYV12ColorConverter.h"
+#include "II420ColorConverter.h"
#include <OMX_IVCommon.h>
#include <string.h>
@@ -22,7 +22,7 @@ static int getDecoderOutputFormat() {
return OMX_TI_COLOR_FormatYUV420PackedSemiPlanar;
}
-static int convertDecoderOutputToYV12(
+static int convertDecoderOutputToI420(
void* srcBits, int srcWidth, int srcHeight, ARect srcRect, void* dstBits) {
const uint8_t *pSrc_y = (const uint8_t *)srcBits +
@@ -62,7 +62,7 @@ static int getEncoderInputFormat() {
return OMX_TI_COLOR_FormatYUV420PackedSemiPlanar;
}
-static int convertYV12ToEncoderInput(
+static int convertI420ToEncoderInput(
void* srcBits, int srcWidth, int srcHeight,
int dstWidth, int dstHeight, ARect dstRect,
void* dstBits) {
@@ -105,10 +105,10 @@ static int getEncoderInputBufferInfo(
return 0;
}
-extern "C" void getYV12ColorConverter(IYV12ColorConverter *converter) {
+extern "C" void getI420ColorConverter(II420ColorConverter *converter) {
converter->getDecoderOutputFormat = getDecoderOutputFormat;
- converter->convertDecoderOutputToYV12 = convertDecoderOutputToYV12;
+ converter->convertDecoderOutputToI420 = convertDecoderOutputToI420;
converter->getEncoderInputFormat = getEncoderInputFormat;
- converter->convertYV12ToEncoderInput = convertYV12ToEncoderInput;
+ converter->convertI420ToEncoderInput = convertI420ToEncoderInput;
converter->getEncoderInputBufferInfo = getEncoderInputBufferInfo;
}
diff --git a/omap4.mk b/omap4.mk
index 1d1a877..b51b084 100644
--- a/omap4.mk
+++ b/omap4.mk
@@ -23,7 +23,7 @@ PRODUCT_PACKAGES := \
libOMX.TI.DUCATI1.VIDEO.CAMERA \
libOMX.TI.DUCATI1.MISC.SAMPLE \
libstagefrighthw \
- libyv12colorconvert \
+ libI420colorconvert \
libtimemmgr \
libtiutils \
libcamera \