From d54fa82a944f1977fd7ba05e4a875e0d58437ec4 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sun, 23 Sep 2012 03:36:03 +0100 Subject: stagefright: OMXCodec: Re-enable OMX.TI.Video.encoder's quirks These have been around since early stagefright, and were dropped for JB. Unfortunately, they're still necessary with for this encoder to work. Change-Id: I8a251bf195a24b166db7464a90a822d6e69b644d libstagefright: Add support for the 720P OMAP3 encoders Bring back some more OMAP code that was removed by Google in JB, and a couple of omapzoom patches. This may stop being necessary if TI publishes JB-specific OMAP3 code, but as long as we're using the ICS domx, these need to be here Change-Id: Ia29f8c9f9ed769ba07b09c07260486f6502841d6 libstagefright: Unbreak OMAP4 encoders The "manual" construction of the h264 codec data is only needed on OMAP3. Execution of this code on OMAP4 breaks the mpeg4 header generation Change-Id: I3ae52f2e685e2d9097796685c98dffa93cfa6430 --- include/media/stagefright/OMXCodec.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index aad8844..bdd35a4 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -108,6 +108,9 @@ struct OMXCodec : public MediaSource, kRequiresGlobalFlush = 0x20000000, // 2^29 kRequiresWMAProComponent = 0x40000000, //2^30 #endif +#if defined(OMAP_ENHANCEMENT) + kAvoidMemcopyInputRecordingFrames = 0x20000000, +#endif }; struct CodecNameAndQuirks { @@ -368,6 +371,9 @@ private: void dumpPortStatus(OMX_U32 portIndex); status_t configureCodec(const sp &meta); +#if defined(OMAP_ENHANCEMENT) + void restorePatchedDataPointer(BufferInfo *info); +#endif status_t applyRotation(); status_t waitForBufferFilled_l(); -- cgit v1.1