mirror of
https://github.com/openharmony/multimedia_video_processing_engine.git
synced 2026-07-01 06:41:58 -04:00
Merge branch 'master' of https://gitcode.com/gcw_1fESNs80/multimedia_video_processing_engine_lll
Signed-off-by: linjinying <linjinying@h-partners.com>
This commit is contained in:
@@ -112,7 +112,11 @@ public:
|
||||
* @return 返回错误码 VPEAlgoErrCode
|
||||
* @since 16
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
virtual VPEAlgoErrCode ComposeFOVImage(OHOS::Rect displayArea, sptr<SurfaceBuffer> oriBuffer,
|
||||
=======
|
||||
virtual VPEAlgoErrCode ComposeFOVImage()(OHOS::Rect displayArea, sptr<SurfaceBuffer> oriBuffer,
|
||||
>>>>>>> dc0ab2d59bfaf53af4f8f9a04d70c420c722297e
|
||||
sptr<SurfaceBuffer> lhdrBuffer, sptr<SurfaceBuffer> outBuffer, ContrastEnhancerInfo info) = 0;
|
||||
protected:
|
||||
ContrastEnhancerImage() = default;
|
||||
|
||||
Reference in New Issue
Block a user