omx-component: set max buffer count in case of protected video

BZ: 186222

max buffer count is set in case of adaptive playback. Protected
video also needs to override the function.

Change-Id: Ie532c66c5b77ca307bee5f434fe9474cf524948b
Signed-off-by: Tianmi Chen <tianmi.chen@intel.com>

10 files changed, 46 insertions, 0 deletions

diff --git a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp
index 7ca2a53..4df4aa6 100644
--- a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp
@@ -734,4 +734,12 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::ConstructFrameInfo(
     return OMX_ErrorNone;
 }
 
+OMX_ERRORTYPE OMXVideoDecoderAVCSecure::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p) {
+    OMX_ERRORTYPE ret;
+    CHECK_TYPE_HEADER(p);
+    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
+
+    p->nBufferCountActual = OUTPORT_NATIVE_BUFFER_COUNT;
+    return OMXVideoDecoderBase::SetMaxOutputBufferCount(p);
+}
 DECLARE_OMX_COMPONENT("OMX.Intel.hw_vd.h264.secure", "video_decoder.avc", OMXVideoDecoderAVCSecure);
diff --git a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h
index 5c92cc7..9f4de21 100644
--- a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h
+++ b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h
@@ -177,6 +177,7 @@ protected:
    virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
+   virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAvc);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAVCProfileLevel);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, NativeBufferMode);
diff --git a/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp
index de920b8..c882bd1 100644
--- a/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.cpp
@@ -527,4 +527,12 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::ConstructFrameInfo(
     return OMX_ErrorNone;
 }
 
+OMX_ERRORTYPE OMXVideoDecoderAVCSecure::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p) {
+    OMX_ERRORTYPE ret;
+    CHECK_TYPE_HEADER(p);
+    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
+
+    p->nBufferCountActual = OUTPORT_NATIVE_BUFFER_COUNT;
+    return OMXVideoDecoderBase::SetMaxOutputBufferCount(p);
+}
 DECLARE_OMX_COMPONENT("OMX.Intel.hw_vd.h264.secure", "video_decoder.avc", OMXVideoDecoderAVCSecure);
diff --git a/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.h
index 77c2748..3c8ceaf 100644
--- a/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.h
+++ b/videocodec/securevideo/cherrytrail/OMXVideoDecoderAVCSecure.h
@@ -71,6 +71,7 @@ protected:
    virtual OMX_COLOR_FORMATTYPE GetOutputColorFormat(int width, int height);
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
+   virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAvc);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAVCProfileLevel);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, NativeBufferMode);
diff --git a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp
index dda7026..093945b 100644
--- a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.cpp
@@ -444,4 +444,12 @@ bool OMXVideoDecoderAVCSecure::EnableIEDSession(bool enable)
     return ret == 0;
 }
 
+OMX_ERRORTYPE OMXVideoDecoderAVCSecure::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p) {
+    OMX_ERRORTYPE ret;
+    CHECK_TYPE_HEADER(p);
+    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
+
+    p->nBufferCountActual = OUTPORT_NATIVE_BUFFER_COUNT;
+    return OMXVideoDecoderBase::SetMaxOutputBufferCount(p);
+}
 DECLARE_OMX_COMPONENT("OMX.Intel.VideoDecoder.AVC.secure", "video_decoder.avc", OMXVideoDecoderAVCSecure);
diff --git a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.h
index 733f959..5c16a70 100644
--- a/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.h
+++ b/videocodec/securevideo/ctp/OMXVideoDecoderAVCSecure.h
@@ -43,6 +43,7 @@ protected:
    virtual OMX_ERRORTYPE PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE *buffer, buffer_retain_t *retain, VideoDecodeBuffer *p);
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
+   virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAvc);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAVCProfileLevel);
 
diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
index cf477c4..af5dbcd 100755
--- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
@@ -487,4 +487,13 @@ void OMXVideoDecoderAVCSecure::KeepAliveTimerCallback() {
     }
 }
 
+OMX_ERRORTYPE OMXVideoDecoderAVCSecure::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p) {
+    OMX_ERRORTYPE ret;
+    CHECK_TYPE_HEADER(p);
+    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
+
+    p->nBufferCountActual = OUTPORT_NATIVE_BUFFER_COUNT;
+    return OMXVideoDecoderBase::SetMaxOutputBufferCount(p);
+}
+
 DECLARE_OMX_COMPONENT("OMX.Intel.VideoDecoder.AVC.secure", "video_decoder.avc", OMXVideoDecoderAVCSecure);
diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h
index f9eaa8c..6281c23 100755
--- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h
+++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h
@@ -43,6 +43,7 @@ protected:
    virtual OMX_ERRORTYPE PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE *buffer, buffer_retain_t *retain, VideoDecodeBuffer *p);
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
+   virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAvc);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAVCProfileLevel);
 
diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
index cf477c4..5154508 100644
--- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
@@ -487,4 +487,12 @@ void OMXVideoDecoderAVCSecure::KeepAliveTimerCallback() {
     }
 }
 
+OMX_ERRORTYPE OMXVideoDecoderAVCSecure::SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p) {
+    OMX_ERRORTYPE ret;
+    CHECK_TYPE_HEADER(p);
+    CHECK_PORT_INDEX(p, OUTPORT_INDEX);
+
+    p->nBufferCountActual = OUTPORT_NATIVE_BUFFER_COUNT;
+    return OMXVideoDecoderBase::SetMaxOutputBufferCount(p);
+}
 DECLARE_OMX_COMPONENT("OMX.Intel.VideoDecoder.AVC.secure", "video_decoder.avc", OMXVideoDecoderAVCSecure);
diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.h
index f9eaa8c..6281c23 100644
--- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.h
+++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.h
@@ -43,6 +43,7 @@ protected:
    virtual OMX_ERRORTYPE PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE *buffer, buffer_retain_t *retain, VideoDecodeBuffer *p);
 
    virtual OMX_ERRORTYPE BuildHandlerList(void);
+   virtual OMX_ERRORTYPE SetMaxOutputBufferCount(OMX_PARAM_PORTDEFINITIONTYPE *p);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAvc);
    DECLARE_HANDLER(OMXVideoDecoderAVCSecure, ParamVideoAVCProfileLevel);