Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO: DELETE THIS BRANCH ONCE YOU MERGE！！！] Sync cn prototype to en prototype in a flash #3806

Merged
merged 1 commit into from
Oct 31, 2024
Merged

[AUTO: DELETE THIS BRANCH ONCE YOU MERGE！！！] Sync cn prototype to en prototype in a flash #3806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 68 additions & 5 deletions en-US/dita/RTC-NG/API/class_mediarecorderconfiguration.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
public int streamType = STREAM_TYPE_BOTH;
public int maxDurationMs = 120000;
public int recorderInfoUpdateInterval = 0;
public int width;
public int height;
public int fps;
public int sample_rate;
public int channel_num;
public int videoSourceType;

public MediaRecorderConfiguration(String storagePath, int containerFormat, int streamType,
int maxDurationMs, int recorderInfoUpdateInterval) {
Expand All @@ -20,6 +26,28 @@
this.streamType = streamType;
this.maxDurationMs = maxDurationMs;
this.recorderInfoUpdateInterval = recorderInfoUpdateInterval;
this.width = 1280;
this.height = 720;
this.fps = 30;
this.sample_rate = 48000;
this.channel_num = 1;
this.videoSourceType = 0;
}

public MediaRecorderConfiguration(String storagePath, int containerFormat, int streamType,
int maxDurationMs, int recorderInfoUpdateInterval, int width, int height, int fps,
int sample_rate, int channel_num, int videoSourceType) {
this.storagePath = storagePath;
this.containerFormat = containerFormat;
this.streamType = streamType;
this.maxDurationMs = maxDurationMs;
this.recorderInfoUpdateInterval = recorderInfoUpdateInterval;
this.width = width;
this.height = height;
this.fps = fps;
this.sample_rate = sample_rate;
this.channel_num = channel_num;
this.videoSourceType = videoSourceType;
}
}</codeblock>
<codeblock props="hmos" outputclass="language-arkts">export class MediaRecorderConfiguration {
Expand Down Expand Up @@ -47,17 +75,52 @@
@property(assign, nonatomic) AgoraMediaRecorderContainerFormat containerFormat;
@property(assign, nonatomic) AgoraMediaRecorderStreamType streamType;
@property(assign, nonatomic) NSUInteger maxDurationMs;
@property(assign, nonatomic) NSUInteger recorderInfoUpdateInterval;</codeblock>
@property(assign, nonatomic) NSUInteger recorderInfoUpdateInterval;
@property(assign, nonatomic) NSUInteger width;
@property(assign, nonatomic) NSUInteger height;
@property(assign, nonatomic) NSUInteger fps;
@property(assign, nonatomic) NSUInteger sample_rate;
@property(assign, nonatomic) NSUInteger channel_num;
@property(assign, nonatomic) AgoraVideoSourceType videoSourceType;
@end</codeblock>
<codeblock props="cpp unreal" outputclass="language-cpp">struct MediaRecorderConfiguration {
const char* storagePath;
MediaRecorderContainerFormat containerFormat;
MediaRecorderStreamType streamType;
int maxDurationMs;
int recorderInfoUpdateInterval;

MediaRecorderConfiguration() : storagePath(NULL), containerFormat(FORMAT_MP4), streamType(STREAM_TYPE_BOTH), maxDurationMs(120000), recorderInfoUpdateInterval(0) {}
MediaRecorderConfiguration(const char* path, MediaRecorderContainerFormat format, MediaRecorderStreamType type, int duration, int interval) : storagePath(path), containerFormat(format), streamType(type), maxDurationMs(duration), recorderInfoUpdateInterval(interval) {}
};</codeblock>
int width;
int height;
int fps;
int sample_rate;
int channel_num;
agora::rtc::VIDEO_SOURCE_TYPE videoSourceType;

MediaRecorderConfiguration()
: storagePath(NULL),
containerFormat(FORMAT_MP4),
streamType(STREAM_TYPE_BOTH),
maxDurationMs(120000),
recorderInfoUpdateInterval(0),
width(1280),
height(720),
fps(30),
sample_rate(48000),
channel_num(1),
videoSourceType(rtc::VIDEO_SOURCE_CAMERA_PRIMARY) {}
MediaRecorderConfiguration(const char* path, MediaRecorderContainerFormat format,
MediaRecorderStreamType type, int duration, int interval)
: storagePath(path),
containerFormat(format),
streamType(type),
maxDurationMs(duration),
recorderInfoUpdateInterval(interval),
width(1280),
height(720),
fps(30),
sample_rate(48000),
channel_num(1),
videoSourceType(rtc::VIDEO_SOURCE_CAMERA_PRIMARY) {}};</codeblock>
<codeblock props="bp" outputclass="language-cpp">USTRUCT(BlueprintType)
struct FMediaRecorderConfiguration
{
Expand Down
19 changes: 12 additions & 7 deletions en-US/dita/RTC-NG/API/class_recorderstreaminfo.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
<section id="prototype">
<p outputclass="codeblock">
<codeblock props="android" outputclass="language-java">public class RecorderStreamInfo {
public String channelId;
public int uid;
public String channelId;
public int recorderStreamType;
}</codeblock>
<codeblock props="hmos" outputclass="language-arkts">export class RecorderStreamInfo {

Expand All @@ -24,15 +25,19 @@
}
}</codeblock>
<codeblock props="ios mac" outputclass="language-objectivec">__attribute__((visibility("default"))) @interface AgoraRecorderStreamInfo: NSObject

@property (nonatomic, copy) NSString *_Nonnull channelId;
@property (nonatomic, nonatomic) NSUInteger uid;

@property (nonatomic, copy) NSString *_Nonnull channelId;
@property (assign, nonatomic) AgoraRecorderStreamType type;
@end</codeblock>
<codeblock props="cpp unreal" outputclass="language-cpp">struct RecorderStreamInfo {
const char* channelId;
uid_t uid;
RecorderStreamInfo() : channelId(NULL), uid(0) {}
const char* channelId;
uid_t uid;
RecorderStreamType type;
RecorderStreamInfo() : channelId(NULL), uid(0), type(RTC) {}
RecorderStreamInfo(const char* channelId, uid_t uid)
: channelId(channelId), uid(uid), type(RTC) {}
RecorderStreamInfo(const char* channelId, uid_t uid, RecorderStreamType)
: channelId(channelId), uid(uid), type(RTC) {}
};</codeblock>
<codeblock props="bp" outputclass="language-cpp">USTRUCT(BlueprintType)
struct FRecorderStreamInfo {
Expand Down
Loading
Loading