From 1374eddc4455b26d1dffdca10fc70534b3f08c1d Mon Sep 17 00:00:00 2001 From: Dandawate Saket Date: Mon, 11 Jul 2011 19:12:57 -0700 Subject: Add support for TI H264 encoder Add support for TI H264 encoder and quirks for buffer allocation. Temporary switching to baseline profile till ctts patch is defaulted as per profile detection. Change-Id: I1d56184b9c5d5f00d6c63aef7e058f3d56b84cef Signed-off-by: Dandawate Saket Signed-off-by: Iliyan Malchev --- media/libstagefright/CameraSource.cpp | 4 ++++ media/libstagefright/MPEG4Writer.cpp | 7 +++++-- media/libstagefright/OMXCodec.cpp | 28 +++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) mode change 100644 => 100755 media/libstagefright/CameraSource.cpp mode change 100644 => 100755 media/libstagefright/MPEG4Writer.cpp mode change 100644 => 100755 media/libstagefright/OMXCodec.cpp diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp old mode 100644 new mode 100755 index c7e7ced..1bc2fb9 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -103,6 +103,10 @@ static int32_t getColorFormat(const char* colorFormat) { return OMX_COLOR_Format16bitRGB565; } + if (!strcmp(colorFormat, "OMX_TI_COLOR_FormatYUV420PackedSemiPlanar")) { + return OMX_TI_COLOR_FormatYUV420PackedSemiPlanar; + } + LOGE("Uknown color format (%s), please add it to " "CameraSource::getColorFormat", colorFormat); diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp old mode 100644 new mode 100755 index eaad2c3..8c9ff87 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -1715,7 +1715,10 @@ status_t MPEG4Writer::Track::parseAVCCodecSpecificData( return ERROR_MALFORMED; } } - +// FIXME: +// Add chromat_format_idc, bit depth values, etc for AVC/h264 high profile and above +// and remove #if 0 +#if 0 { // Check on the profiles // These profiles requires additional parameter set extensions @@ -1725,7 +1728,7 @@ status_t MPEG4Writer::Track::parseAVCCodecSpecificData( return BAD_VALUE; } } - +#endif return OK; } diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp old mode 100644 new mode 100755 index 06363ee..3b05752 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -218,18 +218,21 @@ static const CodecInfo kEncoderInfo[] = { { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBEncoder" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.encode" }, { MEDIA_MIMETYPE_AUDIO_AAC, "AACEncoder" }, + { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.DUCATI1.VIDEO.MPEG4E" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.encoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.encoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.encoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.encoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.SEC.MPEG4.Encoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Encoder" }, + { MEDIA_MIMETYPE_VIDEO_H263, "OMX.TI.DUCATI1.VIDEO.MPEG4E" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.7x30.video.encoder.h263" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.encoder.h263" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.TI.Video.encoder" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.Nvidia.h263.encoder" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.SEC.H263.Encoder" }, { MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Encoder" }, + { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.DUCATI1.VIDEO.H264E" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.7x30.video.encoder.avc" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.video.encoder.avc" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.encoder" }, @@ -393,7 +396,17 @@ uint32_t OMXCodec::getComponentQuirks( if (!strcmp(componentName, "OMX.TI.DUCATI1.VIDEO.DECODER")) { quirks |= kRequiresAllocateBufferOnInputPorts; quirks |= kRequiresAllocateBufferOnOutputPorts; - } else if (!strncmp(componentName, "OMX.TI.", 7)) { + } + + // FIXME: + // Remove the quirks after the work is done. + else if (!strcmp(componentName, "OMX.TI.DUCATI1.VIDEO.MPEG4E") || + !strcmp(componentName, "OMX.TI.DUCATI1.VIDEO.H264E")) { + + quirks |= kRequiresAllocateBufferOnInputPorts; + quirks |= kRequiresAllocateBufferOnOutputPorts; + } + else if (!strncmp(componentName, "OMX.TI.", 7)) { // Apparently I must not use OMX_UseBuffer on either input or // output ports on any of the TI components or quote: // "(I) may have unexpected problem (sic) which can be timing related @@ -887,6 +900,7 @@ static size_t getFrameSize( case OMX_COLOR_FormatYUV420Planar: case OMX_COLOR_FormatYUV420SemiPlanar: + case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar: return (width * height * 3) / 2; default: @@ -910,6 +924,7 @@ status_t OMXCodec::findTargetColorFormat( } } + // Check whether the target color format is supported. return isColorFormatSupported(*colorFormat, kPortIndexInput); } @@ -1032,6 +1047,11 @@ void OMXCodec::setVideoInputFormat( video_def->nFrameWidth = width; video_def->nFrameHeight = height; video_def->xFramerate = 0; // No need for output port + // FIXME: + // Revmoe this workaround after work is done. + if (!strncmp(mComponentName, "OMX.TI.DUCATI1", 14)) { + video_def->xFramerate = (frameRate << 16); + } video_def->nBitrate = bitRate; // Q16 format video_def->eCompressionFormat = compressionFormat; video_def->eColorFormat = OMX_COLOR_FormatUnused; @@ -1304,6 +1324,12 @@ status_t OMXCodec::setupAVCEncoderParameters(const sp& meta) { h264type.eProfile = static_cast(profileLevel.mProfile); h264type.eLevel = static_cast(profileLevel.mLevel); + // FIXME: + // Remove the workaround after the work in done. + if (!strncmp(mComponentName, "OMX.TI.DUCATI1", 14)) { + h264type.eProfile = OMX_VIDEO_AVCProfileBaseline; + } + if (h264type.eProfile == OMX_VIDEO_AVCProfileBaseline) { h264type.nSliceHeaderSpacing = 0; h264type.bUseHadamard = OMX_TRUE; -- cgit v1.1