From 8e41f6428a91af76b98de72dd758a0a3e0759164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 07:42:25 +0000 Subject: [PATCH 1/8] Signed-off-by: mamingshuai --- .../subsys-multimedia-camera-photo-guide.md | 49 +++++++++++++++++++ .../subsys-multimedia-video-overview.md | 4 +- .../subsys-multimedia-camera-photo-guide.md | 49 +++++++++++++++++++ .../subsys-multimedia-video-overview.md | 4 +- 4 files changed, 102 insertions(+), 4 deletions(-) diff --git a/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md b/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md index d35bed7457c..e6484ac65b6 100644 --- a/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md +++ b/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md @@ -57,6 +57,13 @@ Use the camera module APIs to capture frames \(photographing\).

Creates a Camera instance.

+

CameraKit

+ +

const CameraInfo *GetCameraInfo(std::string cameraId);

+ +

Creates a CameraInfo instance.

+ +

Camera

string GetCameraId()

@@ -141,6 +148,20 @@ Use the camera module APIs to capture frames \(photographing\).

Obtains the parameter value range based on a specified parameter key.

+

CameraAbility

+ +

std::list<int32_t> GetSupportedAfModes() const;

+ +

Get a list of supported autofocus modes.

+ + +

CameraAbility

+ +

std::list<int32_t> GetSupportedAeModes() const;

+ +

Gets a list of supported auto exposure modes.

+ +

CameraDevice

CameraDeviceCallback()

@@ -246,6 +267,34 @@ Use the camera module APIs to capture frames \(photographing\).

Removes a surface.

+

FrameConfig

+ +

void GetVendorParameter(uint8_t *value, uint32_t len);

+ +

Get vendor parameter.

+ + +

FrameConfig

+ +

void SetVendorParameter(uint8_t *value, uint32_t len);

+ +

Set vendor parameter.

+ + +

CameraInfo

+ +

int32_t GetCameraType() const;

+ +

Get camera type.

+ + +

CameraInfo

+ +

int32_t GetCameraFacingType() const;

+ +

Get camera facing type.

+ + diff --git a/en/device-dev/subsystems/subsys-multimedia-video-overview.md b/en/device-dev/subsystems/subsys-multimedia-video-overview.md index 98b5b4ad048..421695541a5 100644 --- a/en/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/en/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -51,7 +51,7 @@ Available audio and video encoding and decoding capabilities vary depending on d

Hi3516

- + @@ -60,7 +60,7 @@ Available audio and video encoding and decoding capabilities vary depending on d

Hi3518

- + diff --git a/zh-cn/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md b/zh-cn/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md index 0e1ebbfecfc..e0b36aed77c 100644 --- a/zh-cn/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md +++ b/zh-cn/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md @@ -57,6 +57,13 @@

创建camera实例

+

CameraKit

+ +

const CameraInfo *GetCameraInfo(std::string cameraId);

+ +

创建cameraInfo实例

+ +

Camera

string GetCameraId()

@@ -141,6 +148,20 @@

获取支持的参数范围

+

CameraAbility

+ +

std::list<int32_t> GetSupportedAfModes() const;

+ +

获取支持的自动对焦模式列表

+ + +

CameraAbility

+ +

std::list<int32_t> GetSupportedAeModes() const;

+ +

获取支持的自动曝光模式列表

+ +

CameraDevice

CameraDeviceCallback()

@@ -246,6 +267,34 @@

删除surface

+

FrameConfig

+ +

void GetVendorParameter(uint8_t *value, uint32_t len);

+ +

获取自定义参数

+ + +

FrameConfig

+ +

void SetVendorParameter(uint8_t *value, uint32_t len);

+ +

设置自定义参数

+ + +

CameraInfo

+ +

int32_t GetCameraType() const;

+ +

获取相机类型

+ + +

CameraInfo

+ +

int32_t GetCameraFacingType() const;

+ +

获取相机朝向

+ + diff --git a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md index af7a50e52aa..82bef868c1d 100755 --- a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -51,7 +51,7 @@ OpenHarmony音视频编解码能力取决于具体设备类型，以当前已支

Hi3516

- + @@ -60,7 +60,7 @@ OpenHarmony音视频编解码能力取决于具体设备类型，以当前已支

Hi3518

- + -- Gitee From 3652ebf265a90db0698f6220f1456152b7dfa967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 07:54:10 +0000 Subject: [PATCH 2/8] Signed-off-by: mamingshuai --- .../subsystems/subsys-multimedia-camera-photo-guide.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md b/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md index e6484ac65b6..d7b772d0cc9 100644 --- a/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md +++ b/en/device-dev/subsystems/subsys-multimedia-camera-photo-guide.md @@ -152,7 +152,7 @@ Use the camera module APIs to capture frames \(photographing\).

std::list<int32_t> GetSupportedAfModes() const;

-

Get a list of supported autofocus modes.

+

Gets a list of supported autofocus modes.

CameraAbility

@@ -271,28 +271,28 @@ Use the camera module APIs to capture frames \(photographing\).

void GetVendorParameter(uint8_t *value, uint32_t len);

-

Get vendor parameter.

+

Gets a vendor parameter.

FrameConfig

void SetVendorParameter(uint8_t *value, uint32_t len);

-

Set vendor parameter.

+

Sets a vendor parameter.

CameraInfo

int32_t GetCameraType() const;

-

Get camera type.

+

Gets a camera type.

CameraInfo

int32_t GetCameraFacingType() const;

-

Get camera facing type.

+

Gets a camera facing type.

-- Gitee From 8e03a73b2e035c9282f3f8474abae586e525706b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 08:15:13 +0000 Subject: [PATCH 3/8] update zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md. Signed-off-by: mamingshuai --- zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md index 82bef868c1d..47f719e2b3b 100755 --- a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -60,7 +60,7 @@ OpenHarmony音视频编解码能力取决于具体设备类型，以当前已支

Hi3518

-
  • 音频解码：支持MPEG-4 AAC Profile (AAC LC)格式解码、MPEG-4格式解码，支持单/双声道，支持MPEG-4(.mp4，.m4a)、MPEG-3(.mp3)容器格式。
  • 视频解码：-
+
  • 音频解码：支持MPEG-4 AAC Profile (AAC LC)、MPEG Audio Layer 3 (MP3)格式解码，支持单/双声道，支持MPEG-4(.mp4，.m4a)、MP3(.mp3)容器格式。
  • 视频解码：-
  • 音频编码：支持音频AAC_LC编码，支持单/双声道，支持MPEG-4(.mp4)容器格式。
  • 视频编码：支持视频H.264/H.265编码，支持MPEG-4(.mp4)容器格式。
-- Gitee From e3e46322ec8be1d246a63d496464cb859ccc920a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 08:18:51 +0000 Subject: [PATCH 4/8] update en/device-dev/subsystems/subsys-multimedia-video-overview.md. Signed-off-by: mamingshuai --- en/device-dev/subsystems/subsys-multimedia-video-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/device-dev/subsystems/subsys-multimedia-video-overview.md b/en/device-dev/subsystems/subsys-multimedia-video-overview.md index 421695541a5..690e4d6377c 100644 --- a/en/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/en/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -60,7 +60,7 @@ Available audio and video encoding and decoding capabilities vary depending on d

Hi3518

-
  • Audio: The MPEG-4 AAC Profile (AAC LC), MPEG-3, mono and dual channels, and the MPEG-4 (.mp4 and .m4a), MPEG-3, container format are supported.
  • Video: none
+
  • Audio: The MPEG-4 AAC Profile (AAC LC), MPEG Audio Layer 3 (MP3), mono and dual channels, and the MPEG-4 (.mp4 and .m4a), MP3(.mp3), container format are supported.
  • Video: none
  • Audio: AAC-LC encoding, mono and dual channels, and the MPEG-4 (.mp4) container format are supported.
  • Video: H.264 and H.265 encoding and the MPEG-4 (.mp4) container format are supported.
-- Gitee From 6170d54944b069d3f42e42a405b78839d0bbed17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 08:25:32 +0000 Subject: [PATCH 5/8] update zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md. Signed-off-by: mamingshuai --- zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md index 47f719e2b3b..41bc04b1d73 100755 --- a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -51,7 +51,7 @@ OpenHarmony音视频编解码能力取决于具体设备类型，以当前已支

Hi3516

-
  • 音频解码：支持MPEG-4 AAC Profile (AAC LC)、MPEG-4格式解码,支持单/双声道，支持MPEG-4(.mp4，.m4a)、MPEG-3(.mp3)容器格式。
  • 视频解码：支持H.265 HEVC/H.264 AVC格式解码（限自身编码码流），支持MPEG-4(.mp4)容器格式。
+
  • 音频解码：支持MPEG-4 AAC Profile (AAC LC)、MPEG-4格式解码,支持单/双声道，支持MPEG-4(.mp4，.m4a)、MP3(.mp3)容器格式。
  • 视频解码：支持H.265 HEVC/H.264 AVC格式解码（限自身编码码流），支持MPEG-4(.mp4)容器格式。
  • 音频编码：支持音频AAC_LC编码，支持单/双声道，支持MPEG-4(.mp4)容器格式。
  • 视频编码：支持视频H.264/H.265编码，支持MPEG-4(.mp4)容器格式。
-- Gitee From 63dd7edc57dcd9b5557571cd5a091c82be776969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 08:27:25 +0000 Subject: [PATCH 6/8] update en/device-dev/subsystems/subsys-multimedia-video-overview.md. Signed-off-by: mamingshuai --- en/device-dev/subsystems/subsys-multimedia-video-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/device-dev/subsystems/subsys-multimedia-video-overview.md b/en/device-dev/subsystems/subsys-multimedia-video-overview.md index 690e4d6377c..b858fb4b4f7 100644 --- a/en/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/en/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -51,7 +51,7 @@ Available audio and video encoding and decoding capabilities vary depending on d

Hi3516

-
  • Audio: The MPEG-4 AAC Profile (AAC LC), MPEG-3, mono and dual channels, and the MPEG-4 (.mp4 and .m4a), MPEG-3, container format are supported.
  • Video: The H.265 (HEVC) and H.264 (AVC) (for streams encoded using a chip of the same type) and the MPEG-4 (.mp4) container format are supported.
+
  • Audio: The MPEG-4 AAC Profile (AAC LC), MPEG-3, mono and dual channels, and the MPEG-4 (.mp4 and .m4a), MP3(.mp3), container format are supported.
  • Video: The H.265 (HEVC) and H.264 (AVC) (for streams encoded using a chip of the same type) and the MPEG-4 (.mp4) container format are supported.
  • Audio: AAC-LC encoding, mono and dual channels, and the MPEG-4 (.mp4) container format are supported.
  • Video: H.264 and H.265 encoding and the MPEG-4 (.mp4) container format are supported.
-- Gitee From bd8d6fcc6c44e59a51ab7b86338d6b43ab3726af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 08:40:05 +0000 Subject: [PATCH 7/8] update en/device-dev/subsystems/subsys-multimedia-video-overview.md. Signed-off-by: mamingshuai --- en/device-dev/subsystems/subsys-multimedia-video-overview.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/device-dev/subsystems/subsys-multimedia-video-overview.md b/en/device-dev/subsystems/subsys-multimedia-video-overview.md index b858fb4b4f7..9f3b0433a26 100644 --- a/en/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/en/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -51,7 +51,7 @@ Available audio and video encoding and decoding capabilities vary depending on d

Hi3516

-
  • Audio: The MPEG-4 AAC Profile (AAC LC), MPEG-3, mono and dual channels, and the MPEG-4 (.mp4 and .m4a), MP3(.mp3), container format are supported.
  • Video: The H.265 (HEVC) and H.264 (AVC) (for streams encoded using a chip of the same type) and the MPEG-4 (.mp4) container format are supported.
+
  • Audio: MPEG-4 AAC Profile (AAC LC), MPEG Audio Layer 3 (MP3), mono and dual channels, MPEG-4 (.mp4 and .m4a), and MP3 (.mp3) are supported.
  • Video: The H.265 (HEVC) and H.264 (AVC) (for streams encoded using a chip of the same type) and the MPEG-4 (.mp4) container format are supported.
  • Audio: AAC-LC encoding, mono and dual channels, and the MPEG-4 (.mp4) container format are supported.
  • Video: H.264 and H.265 encoding and the MPEG-4 (.mp4) container format are supported.
@@ -60,7 +60,7 @@ Available audio and video encoding and decoding capabilities vary depending on d

Hi3518

-
  • Audio: The MPEG-4 AAC Profile (AAC LC), MPEG Audio Layer 3 (MP3), mono and dual channels, and the MPEG-4 (.mp4 and .m4a), MP3(.mp3), container format are supported.
  • Video: none
+
  • Audio: MPEG-4 AAC Profile (AAC LC), MPEG Audio Layer 3 (MP3), mono and dual channels, MPEG-4 (.mp4 and .m4a), and MP3 (.mp3) are supported.
  • Video: none
  • Audio: AAC-LC encoding, mono and dual channels, and the MPEG-4 (.mp4) container format are supported.
  • Video: H.264 and H.265 encoding and the MPEG-4 (.mp4) container format are supported.
-- Gitee From fc3dc4622b26e1a750d5c8dcb3c18ce41e70aa28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= Date: Wed, 18 Aug 2021 08:50:20 +0000 Subject: [PATCH 8/8] update zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md. Signed-off-by: mamingshuai --- zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md index 41bc04b1d73..442d452b40b 100755 --- a/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md +++ b/zh-cn/device-dev/subsystems/subsys-multimedia-video-overview.md @@ -51,7 +51,7 @@ OpenHarmony音视频编解码能力取决于具体设备类型，以当前已支

Hi3516

-
  • 音频解码：支持MPEG-4 AAC Profile (AAC LC)、MPEG-4格式解码,支持单/双声道，支持MPEG-4(.mp4，.m4a)、MP3(.mp3)容器格式。
  • 视频解码：支持H.265 HEVC/H.264 AVC格式解码（限自身编码码流），支持MPEG-4(.mp4)容器格式。
+
  • 音频解码：支持MPEG-4 AAC Profile (AAC LC)、MPEG Audio Layer 3 (MP3)格式解码,支持单/双声道，支持MPEG-4(.mp4，.m4a)、MP3(.mp3)容器格式。
  • 视频解码：支持H.265 HEVC/H.264 AVC格式解码（限自身编码码流），支持MPEG-4(.mp4)容器格式。
  • 音频编码：支持音频AAC_LC编码，支持单/双声道，支持MPEG-4(.mp4)容器格式。
  • 视频编码：支持视频H.264/H.265编码，支持MPEG-4(.mp4)容器格式。
-- Gitee