1.0.8

AgoraView.js

@@ -5,7 +5,8 @@
 import  React, {Component, PropTypes} from 'react'
 import {
     requireNativeComponent,
-    View
+    View,
+    Platform
 } from 'react-native'
 
 export default class AgoraView extends Component {
@@ -20,6 +21,7 @@ export default class AgoraView extends Component {
 AgoraView.propTypes = {
     showLocalVideo: PropTypes.bool,
     remoteUid: PropTypes.number,
+    zOrderMediaOverlay: PropTypes.bool,
     ...View.propTypes
 };
 

README.md

@@ -1,8 +1,13 @@
-[![QQ Group](https://img.shields.io/badge/QQ%20Group-471757030-red.svg)]()
+##### 有任何问题欢迎加入QQ群进行反馈  471757030
 
 # react-native-agora
 
-## Installation and linking libraries
+## 功能介绍
+
+- 支持 iOS Android  声网Agora视频通讯SDK
+- 支持 直播 多人视频会议 语音 功能
+
+## 安装使用
 
 Install with npm:
 
@@ -69,16 +74,20 @@ Add following to `AndroidManifest.xml`
 
 ## Documentation
 
-[声网API文档](https://docs.agora.io/cn/1.11.1/user_guide/API/ios_api_live_cn.html)
+[声网API文档](https://document.agora.io/cn/1.12/api/)
 
 ##### RtcEngine方法
 
 | Property                         | Type                                     | Description                           |
 | -------------------------------- | ---------------------------------------- | ------------------------------------- |
-| init                             | object {appid: 'agora注册的应用id', channelProfile: '频道模式', videoProfile: '视频模式', clientRole: '角色'} | 初始化Agora引擎                            |
+| init                             | object {appid: 'agora注册的应用id', channelProfile: '频道模式', videoProfile: '视频模式', clientRole: '角色', swapWidthAndHeight: 'bool值'} | 初始化Agora引擎                            |
 | joinChannel                      | string channelName （房间名称）   number uid （用户设置的uid 传0系统会自动分配） | 加入房间                                  |
 | leaveChannel                     |                                          | 离开频道                                  |
 | destroy                          |                                          | 销毁引擎实例                                |
+| configPublisher                     | object{} config参数请前往Agora文档查看                                        | 配置旁路直播推流方法                               |
+| setLocalRenderMode                     | number mode (1 2 3)                                        | 设置本地视频显示模式                                |
+| setRemoteRenderMode                     | number uid  number mode (1 2 3)                                          | 设置远端视频显示模式                                |
+| enableAudioVolumeIndication                     | number interval (时间间隔) number smooth(平滑系数。可以设置为 3)                                         | 启用说话者音量提示                                |
 | startPreview                     |                                          | 开启视频预览                                |
 | stopPreview                      |                                          | 关闭视频预览                                |
 | switchCamera                     |                                          | 切换前置/后置摄像头                            |
@@ -92,8 +101,8 @@ Add following to `AndroidManifest.xml`
 | enableLocalVideo                 | bool (default false)                     | 禁用本地视频功能                              |
 | muteAllRemoteVideoStreams        | bool (default false)                     | 暂停所有远端视频流                             |
 | muteRemoteVideoStream            | number uid（用户uid） bool  mute（是否暂停）       | 暂停指定远端视频流                             |
-| startRecordingService (ios only) | string  recordingKey                     | 启动服务端录制服务                             |
-| stopRecordingService (ios only)  | string  recordingKey                     | 停止服务端录制服务                             |
+| startRecordingService (iOS only) | string  recordingKey                     | 启动服务端录制服务                             |
+| stopRecordingService (iOS only)  | string  recordingKey                     | 停止服务端录制服务                             |
 | getSdkVersion                    | callback                                 | 获取版本号                                 |
 
 ##### 原生通知事件
@@ -106,7 +115,8 @@ RtcEngine.eventEmitter({
   onUserJoined: data => {},
   onError: data => {},
   onWarning: data => {},
-  onLeaveChannel: data => {}
+  onLeaveChannel: data => {},
+  onAudioVolumeIndication: data => {}
 })
 ```
 
@@ -119,6 +129,8 @@ RtcEngine.eventEmitter({
 | onError                   | 错误信息         |
 | onWarning                 | 警告           |
 | onLeaveChannel            | 退出频道         |
+| onAudioVolumeIndication            | 音量提示回调         |
+
 
 ##### AgoraView 组件
 
@@ -126,234 +138,32 @@ RtcEngine.eventEmitter({
 | -------------- | -------------------- |
 | showLocalVideo | 是否显示本地视频（bool）       |
 | remoteUid      | 显示远程视频（number 传入uid） |
+| zOrderMediaOverlay (Android only)      | 多视频界面覆盖 设置为true优先在上层（bool） |
 
-## Usage
+
+## 运行示例
 
 [Example](https://github.com/DBshaoYan/RNAgoraExample)
 
-```
-import React, {Component} from 'react';
-import {
-    StyleSheet,
-    View,
-    Text,
-    TouchableOpacity,
-    Image,
-    Dimensions
-} from 'react-native';
-
-const {width, height} = Dimensions.get('window');
-
-import {RtcEngine, AgoraView} from 'react-native-agora'
-
-export default class Meeting extends Component {
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            remotes: [],
-            isJoinSuccess: false,
-            isSpeaker: false,
-            isMute: false
-        };
-    }
-
-    componentWillMount() {
-
-        //初始化Agora
-        const options = {
-            appid: '前往Agora官网进行申请--https://www.agora.io/cn/',
-            channelProfile: 1,
-            videoProfile: 40,
-            clientRole: 1,
-        };
-        RtcEngine.init(options);
-    }
-
-    componentDidMount() {
-
-        //加入房间
-        RtcEngine.joinChannel();
-
-        //所以的原生通知统一管理
-        RtcEngine.eventEmitter({
-            onFirstRemoteVideoDecoded: (data) => {
-                console.log(data);
-                //有远程视频加入 返回重要的  uid  AgoraView 根据uid 来设置remoteUid值
-                const {remotes} = this.state;
-
-                let arr = [...remotes];
-                let sign = false;
-                arr.forEach(v => {
-                    sign = v === data.uid
-                });
-
-                if (!sign) {
-                    arr.push(data.uid)
-                }
-
-                this.setState({
-                    remotes: arr
-                })
-            },
-            onUserOffline: (data) => {
-             	console.log(data);
-              	//有人离开了！
-                const {remotes} = this.state;
-
-                let arr = [...remotes];
-
-                let newArr = [];
-                newArr = arr.filter(v => {
-                    return v !== data.uid
-                });
-
-                this.setState({
-                    remotes: newArr
-                });
-            },
-            onJoinChannelSuccess: (data) => {
-                console.log(data);
- 			   //加入房间成功!
-                this.setState({
-                    isJoinSuccess: true
-                });
-            },
-            onUserJoined: (data) => {
-                console.log(data);
-                //有人来了!
-            },
-            onError: (data) => {
-                console.log(data);
-                //错误!
-                RtcEngine.leaveChannel();
-            }
-        })
-    }
-
-    componentWillUnmount() {
-        RtcEngine.removeEmitter()
-    }
-
-    handlerCancel = () => {
-        RtcEngine.leaveChannel();
-    };
-
-    handlerSwitchCamera = () => {
-        RtcEngine.switchCamera();
-    };
-
-    handlerMuteAllRemoteAudioStreams = () => {
-        this.setState({
-            isMute: !this.state.isMute
-        }, () => {
-            RtcEngine.muteAllRemoteAudioStreams(this.state.isMute)
-        })
-    };
-
-    handlerSetEnableSpeakerphone = () => {
-
-        this.setState({
-            isSpeaker: !this.state.isSpeaker
-        }, () => {
-            RtcEngine.setEnableSpeakerphone(this.state.isSpeaker)
-        });
-
-    };
-
-    render() {
-
-        const {isMute, isSpeaker, remotes, isJoinSuccess} = this.state;
-
-        if (!isJoinSuccess) {
-            return(
-                <View style={{flex:1, backgroundColor:'#fff', justifyContent:'center', alignItems:'center'}}>
-                    <Text>正在创建视频会议...</Text>
-                </View>
-            )
-        }
-
-        return (
-            <View style={styles.container}>
-                <AgoraView style={styles.localView} showLocalVideo={true} />
-                <View style={styles.absView}>
-                    <View style={styles.videoView}>
-                        {remotes.map((v, k) => {
-                            return (
-                                <AgoraView
-                                    style={styles.remoteView}
-                                    key={k}
-                                    remoteUid={v}
-                                />
-                            )
-                        })}
-                    </View>
-                    <View>
-                        <TouchableOpacity
-                            style={{alignSelf: 'center'}}
-                            onPress={this.handlerCancel}>
-                            <Image
-                                style={{width: 60, height: 60}}
-                                source={require('../images/btn_endcall.png')}/>
-                        </TouchableOpacity>
-                        <View style={styles.bottomView}>
-                            <TouchableOpacity onPress={this.handlerMuteAllRemoteAudioStreams} activeOpacity={.7}>
-                                <Image
-                                    style={{width: 50, height: 50}}
-                                    source={ isMute ? require('../images/icon_muted.png') : require('../images/btn_mute.png')}/>
-                            </TouchableOpacity>
-
-                            <TouchableOpacity onPress={this.handlerSwitchCamera} activeOpacity={.7}>
-                                <Image
-                                    style={{width: 50, height: 50}}
-                                    source={ require('../images/btn_switch_camera.png')}/>
-                            </TouchableOpacity>
-
-                            <TouchableOpacity onPress={this.handlerSetEnableSpeakerphone} activeOpacity={.7}>
-                                <Image
-                                    style={{width: 50, height: 50}}
-                                    source={isSpeaker ? require('../images/icon_speaker.png') : require('../images/btn_speaker.png')}/>
-                            </TouchableOpacity>
-                        </View>
-                    </View>
-
-                </View>
-            </View>
-        );
-    }
-}
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: '#F4F4F4'
-    },
-    absView: {
-        position: 'absolute',
-        top: 20,
-        left: 0,
-        right: 0,
-        bottom: 0,
-        justifyContent: 'space-between'
-    },
-    videoView: {
-        padding: 5,
-        flexWrap: 'wrap',
-        flexDirection: 'row',
-        zIndex: 100
-    },
-    localView: {
-        flex: 1
-    },
-    remoteView: {
-        width: (width - 40) / 3,
-        height: (width - 40) / 3,
-        margin: 5
-    },
-    bottomView: {
-        padding: 20,
-        flexDirection: 'row',
-        justifyContent: 'space-around'
-    }
-});
-```
+
+## 更新信息
+
+#### 1.0.8
+
+ - 更新 Agora SDK 为 1.12
+
+ - init 不再默认开启视频预览 根据自己需求和时机调用startPreview
+
+ - init options 新增参数  是否交换宽和高 swapWidthAndHeight 默认false
+
+ - 新增方法 配置旁路直播推流方法 configPublisher
+
+ - 新增方法 设置本地视频显示模式 setLocalRenderMode
+
+ - 新增方法 设置远端视频显示模式 setRemoteRenderMode
+
+ - 新增方法 启用说话者音量提示 enableAudioVolumeIndication
+
+ - 新增音量提示回调 onAudioVolumeIndication
+
+ - Android AgoraView 新增zOrderMediaOverlay属性 解决多视频界面覆盖 设置为true优先在上层

android/src/main/java/com/syan/agora/AgoraManager.java

@@ -1,6 +1,7 @@
 package com.syan.agora;
 
 import android.content.Context;
+import android.util.Log;
 import android.util.SparseArray;
 import android.view.SurfaceView;
 
@@ -51,11 +52,15 @@ public class AgoraManager {
         this.context = context;
 
         //创建RtcEngine对象，mRtcEventHandler为RtcEngine的回调
-        mRtcEngine = RtcEngine.create(context, options.getString("appid"), mRtcEventHandler);
+        try {
+            mRtcEngine = RtcEngine.create(context, options.getString("appid"), mRtcEventHandler);
+
+        } catch (Exception e) {
+            throw new RuntimeException("NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e));
+        }
         //开启视频功能
         mRtcEngine.enableVideo();
-        //视频配置，设置为360P
-        mRtcEngine.setVideoProfile(options.getInt("videoProfile"), true);
+        mRtcEngine.setVideoProfile(options.getInt("videoProfile"), options.getBoolean("swapWidthAndHeight")); //视频配置，
         mRtcEngine.enableWebSdkInteroperability(true);  //设置和web通信
         mRtcEngine.setChannelProfile(options.getInt("channelProfile")); //设置模式
         mRtcEngine.setClientRole(options.getInt("clientRole"), null); //设置角色
@@ -122,4 +127,6 @@ public class AgoraManager {
     public SurfaceView getSurfaceView(int uid) {
         return mSurfaceViews.get(uid);
     }
+
+
 }

android/src/main/java/com/syan/agora/AgoraModule.java

@@ -10,10 +10,12 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import io.agora.rtc.IRtcEngineEventHandler;
+import io.agora.rtc.PublisherConfiguration;
 import io.agora.rtc.RtcEngine;
 
 import static com.facebook.react.bridge.UiThreadUtil.runOnUiThread;
@@ -89,6 +91,33 @@ public class AgoraModule extends ReactContextBaseJavaModule {
 
         }
 
+        /**
+         * 说话声音音量提示回调
+         */
+        @Override
+        public void onAudioVolumeIndication(final AudioVolumeInfo[] speakers,
+                                             final int totalVolume ) {
+
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+
+                    WritableArray arr = Arguments.createArray();
+                    for (int i = 0; i < speakers.length; i++) {
+                        WritableMap obj = Arguments.createMap();
+                        obj.putInt("uid", speakers[i].uid);
+                        obj.putInt("volume", speakers[i].volume);
+                    }
+
+                    WritableMap map = Arguments.createMap();
+                    map.putString("type", "onAudioVolumeIndication");
+                    map.putArray("speakers", arr);
+                    map.putInt("totalVolume", totalVolume);
+                    commonEvent(map);
+                }
+            });
+        }
+
         /**
          * 错误信息
          */
@@ -158,7 +187,6 @@ public class AgoraModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void init(ReadableMap options) {
         AgoraManager.getInstance().init(getReactApplicationContext(), mRtcEventHandler, options);
-        AgoraManager.getInstance().setupLocalVideo().startPreview();
     }
 
     //进入房间
@@ -186,6 +214,42 @@ public class AgoraModule extends ReactContextBaseJavaModule {
         AgoraManager.getInstance().stopPreview();
     }
 
+    //配置旁路直播推流
+    @ReactMethod
+    public void configPublisher(ReadableMap options) {
+        PublisherConfiguration config = new PublisherConfiguration.Builder()
+                .owner(options.getBoolean("owner"))
+                .size(options.getInt("width"), options.getInt("height"))
+                .frameRate(options.getInt("framerate"))
+                .biteRate(options.getInt("bitrate"))
+                .defaultLayout(options.getInt("defaultLayout"))
+                .streamLifeCycle(options.getInt("lifeCycle"))
+                .rawStreamUrl(options.getString("rawStreamUrl"))
+                .publishUrl(options.getString("publishUrl"))
+                .extraInfo(options.getString("extraInfo"))
+                .build();
+
+        AgoraManager.getInstance().mRtcEngine.configPublisher(config);
+    }
+
+    //设置本地视频显示模式
+    @ReactMethod
+    public void setLocalRenderMode(int mode) {
+        AgoraManager.getInstance().mRtcEngine.setLocalRenderMode(mode);
+    }
+
+    //设置远端视频显示模式
+    @ReactMethod
+    public void setRemoteRenderMode(int uid, int mode) {
+        AgoraManager.getInstance().mRtcEngine.setRemoteRenderMode(uid, mode);
+    }
+
+    //启用说话者音量提示
+    @ReactMethod
+    public void enableAudioVolumeIndication(int interval, int smooth) {
+        AgoraManager.getInstance().mRtcEngine.enableAudioVolumeIndication(interval, smooth);
+    }
+
     //打开音频
     @ReactMethod
     public void enableAudio() {
@@ -273,7 +337,7 @@ public class AgoraModule extends ReactContextBaseJavaModule {
     //查询 SDK 版本号
     @ReactMethod
     public void getSdkVersion(Callback callback) {
-        callback.invoke( RtcEngine.getSdkVersion());
+        callback.invoke(RtcEngine.getSdkVersion());
     }
 
     private void commonEvent(WritableMap map) {

android/src/main/java/com/syan/agora/AgoraViewManage.java

@@ -1,7 +1,6 @@
 package com.syan.agora;
 
 import android.view.SurfaceView;
-import android.view.View;
 
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -15,6 +14,8 @@ public class AgoraViewManage extends SimpleViewManager<AgoraVideoView> {
 
     public static final String REACT_CLASS = "RCTAgoraView";
 
+    public SurfaceView surfaceView;
+
     @Override
     public String getName() {
         return REACT_CLASS;
@@ -28,19 +29,25 @@ public class AgoraViewManage extends SimpleViewManager<AgoraVideoView> {
     @ReactProp(name = "showLocalVideo")
     public void setShowLocalVideo(final AgoraVideoView agoraVideoView, boolean showLocalVideo) {
 
-        if (showLocalVideo) {
-            SurfaceView surfaceView = AgoraManager.getInstance().getLocalSurfaceView();
-            surfaceView.setVisibility(View.VISIBLE);
-            agoraVideoView.addView(surfaceView);
-        }
+        AgoraManager.getInstance().setupLocalVideo();
+        surfaceView = AgoraManager.getInstance().getLocalSurfaceView();
+        //surfaceView.setVisibility(View.VISIBLE);
+        agoraVideoView.addView(surfaceView);
+//        surfaceView.setZOrderMediaOverlay(true);
+
+    }
+
+    @ReactProp(name = "zOrderMediaOverlay")
+    public void setZOrderMediaOverlay(final AgoraVideoView agoraVideoView, boolean zOrderMediaOverlay) {
+        surfaceView.setZOrderMediaOverlay(zOrderMediaOverlay);
     }
 
     @ReactProp(name = "remoteUid")
     public void setRemoteUid(final AgoraVideoView agoraVideoView, int remoteUid) {
         AgoraManager.getInstance().setupRemoteVideo(remoteUid);
-        SurfaceView surfaceView = AgoraManager.getInstance().getSurfaceView(remoteUid);
-        surfaceView.setVisibility(View.VISIBLE);
+        surfaceView = AgoraManager.getInstance().getSurfaceView(remoteUid);
+        //surfaceView.setVisibility(View.VISIBLE);
         agoraVideoView.addView(surfaceView);
-        surfaceView.setZOrderMediaOverlay(true);
+//        surfaceView.setZOrderMediaOverlay(true);
     }
 }

android/src/main/jniLibs/include/IAgoraRtcEngine.h

@@ -72,10 +72,13 @@ public:
         ptr_ = ptr;
     }
     template<class C1, class C2>
-    void queryInterface(C1& c, C2 iid) {
-		pointer_type p;
-        if (!c.queryInterface(iid, (void**)&p))
-			reset(p);
+    bool queryInterface(C1* c, C2 iid) {
+        pointer_type p = NULL;
+        if (c && !c->queryInterface(iid, (void**)&p))
+        {
+            reset(p);
+        }
+        return p != NULL;;
 	}
 private:
     AutoPtr(const AutoPtr&);
@@ -129,7 +132,6 @@ enum WARN_CODE_TYPE
     // sdk: 100~1000
     WARN_SWITCH_LIVE_VIDEO_TIMEOUT = 111,
 	WARN_SET_CLIENT_ROLE_TIMEOUT = 118,
-    WARN_SET_CLIENT_ROLE_NOT_AUTHORIZED = 119,
 };
 
 enum ERROR_CODE_TYPE
@@ -168,6 +170,7 @@ enum ERROR_CODE_TYPE
 	ERR_BITRATE_LIMIT = 115,
 	ERR_TOO_MANY_DATA_STREAMS = 116,
 	ERR_STREAM_MESSAGE_TIMEOUT = 117,
+    ERR_SET_CLIENT_ROLE_NOT_AUTHORIZED = 119,
 
     //1001~2000
     ERR_LOAD_MEDIA_ENGINE = 1001,
@@ -230,7 +233,6 @@ enum MEDIA_ENGINE_EVENT_CODE_TYPE
     MEDIA_ENGINE_RECORDING_WARNING = 2,
     MEDIA_ENGINE_PLAYOUT_WARNING = 3,
     MEDIA_ENGINE_AUDIO_FILE_MIX_FINISH = 10,
-    MEDIA_ENGINE_AUDIO_SAMPLE_RATE_RECONFIG_FINISH = 11,
     // media engine role changed
     MEDIA_ENGINE_ROLE_BROADCASTER_SOLO = 20,
     MEDIA_ENGINE_ROLE_BROADCASTER_INTERACTIVE = 21,
@@ -258,6 +260,13 @@ enum MEDIA_DEVICE_TYPE
     VIDEO_CAPTURE_DEVICE = 3,
 };
 
+enum AUDIO_RECORDING_QUALITY_TYPE
+{
+    AUDIO_RECORDING_QUALITY_LOW = 0,
+    AUDIO_RECORDING_QUALITY_MEDIUM = 1,
+    AUDIO_RECORDING_QUALITY_HIGH = 2,
+};
+
 enum QUALITY_TYPE
 {
     QUALITY_UNKNOWN = 0,
@@ -276,6 +285,13 @@ enum RENDER_MODE_TYPE
     RENDER_MODE_ADAPTIVE = 3,
 };
 
+enum VIDEO_MIRROR_MODE_TYPE
+{
+    VIDEO_MIRROR_MODE_AUTO = 0,//determined by SDK
+    VIDEO_MIRROR_MODE_ENABLED = 1,//enabled mirror
+    VIDEO_MIRROR_MODE_DISABLED = 2,//disable mirror
+};
+
 enum VIDEO_PROFILE_TYPE
 {                                   // res       fps  kbps
     VIDEO_PROFILE_120P = 0,         // 160x120   15   65
@@ -435,6 +451,16 @@ struct VideoCompositingLayout
     {}
 };
 
+typedef struct Rect {
+    int top;
+    int left;
+    int bottom;
+    int right;
+
+    Rect(): top(0), left(0), bottom(0), right(0) {}
+    Rect(int t, int l, int b, int r): top(t), left(l), bottom(b), right(r) {}
+} Rect;
+
 #if defined(_WIN32)
 
 enum RTMP_STREAM_LIFE_CYCLE_TYPE
@@ -451,10 +477,14 @@ struct PublisherConfiguration {
 	int defaultLayout;
 	int lifecycle;
 	bool owner;
+	int injectStreamWidth;
+	int injectStreamHeight;
+	const char* injectStreamUrl;
 	const char* publishUrl;
 	const char* rawStreamUrl;
 	const char* extraInfo;
 
+
 	PublisherConfiguration()
 		: width(640)
 		, height(360)
@@ -463,6 +493,9 @@ struct PublisherConfiguration {
 		, defaultLayout(1)
 		, lifecycle(RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL)
 		, owner(true)
+		, injectStreamWidth(0)
+		, injectStreamHeight(0)
+		, injectStreamUrl(NULL)
 		, publishUrl(NULL)
 		, rawStreamUrl(NULL)
 		, extraInfo(NULL)
@@ -673,6 +706,12 @@ public:
     virtual void onAudioMixingFinished() {
     }
 
+    /**
+    * When audio effect playback finished, this function will be called
+    */
+    virtual void onAudioEffectFinished(int soundId) {
+    }
+
     /**
     * when the video device state changed(plugged or removed), the function will be called
     * @param [in] deviceId
@@ -957,7 +996,12 @@ public:
         (void)uid;
         (void)elapsed;
     }
-
+    /** @param [in] uid
+    *        the speaker uid who is talking in the channel
+    */
+    virtual void onActiveSpeaker(uid_t uid) {
+        (void)uid;
+    }
 };
 
 /**
@@ -1566,7 +1610,7 @@ public:
 class AAudioDeviceManager : public agora::util::AutoPtr<IAudioDeviceManager>
 {
 public:
-    AAudioDeviceManager(IRtcEngine& engine)
+    AAudioDeviceManager(IRtcEngine* engine)
     {
 		queryInterface(engine, AGORA_IID_AUDIO_DEVICE_MANAGER);
     }
@@ -1575,7 +1619,7 @@ public:
 class AVideoDeviceManager : public agora::util::AutoPtr<IVideoDeviceManager>
 {
 public:
-    AVideoDeviceManager(IRtcEngine& engine)
+    AVideoDeviceManager(IRtcEngine* engine)
     {
 		queryInterface(engine, AGORA_IID_VIDEO_DEVICE_MANAGER);
     }
@@ -1584,21 +1628,25 @@ public:
 class AParameter : public agora::util::AutoPtr<IRtcEngineParameter>
 {
 public:
-    AParameter(IRtcEngine& engine)
+    AParameter(IRtcEngine& engine) { initialize(&engine); }
+    AParameter(IRtcEngine* engine) { initialize(engine); }
+    AParameter(IRtcEngineParameter* p) :agora::util::AutoPtr<IRtcEngineParameter>(p) {}
+private:
+    bool initialize(IRtcEngine* engine)
     {
-        IRtcEngineParameter* p;
-        if (!engine.queryInterface(AGORA_IID_RTC_ENGINE_PARAMETER, (void**)&p))
+        IRtcEngineParameter* p = NULL;
+        if (engine && !engine->queryInterface(AGORA_IID_RTC_ENGINE_PARAMETER, (void**)&p))
             reset(p);
+        return p != NULL;
     }
-    AParameter(IRtcEngineParameter* p)
-        :agora::util::AutoPtr<IRtcEngineParameter>(p)
-    {}
 };
 
 class RtcEngineParameters
 {
 public:
     RtcEngineParameters(IRtcEngine& engine)
+        :m_parameter(&engine){}
+    RtcEngineParameters(IRtcEngine* engine)
         :m_parameter(engine){}
 
     /**
@@ -1710,16 +1758,16 @@ public:
     *        the .wav file path you want to saved
     * @return return 0 if success or an error code
     */
-    int startAudioRecording(const char* filePath) {
+    int startAudioRecording(const char* filePath, AUDIO_RECORDING_QUALITY_TYPE quality) {
         if (!m_parameter) return -ERR_NOT_INITIALIZED;
 #if defined(_WIN32)
-		util::AString path;
-		if (!m_parameter->convertPath(filePath, path))
-			filePath = path->c_str();
-		else
-			return -ERR_INVALID_ARGUMENT;
+        util::AString path;
+        if (!m_parameter->convertPath(filePath, path))
+            filePath = path->c_str();
+        else
+            return -ERR_INVALID_ARGUMENT;
 #endif
-		return m_parameter->setString("che.audio.start_recording", filePath);
+        return setObject("che.audio.start_recording", "{\"filePath\":\"%s\",\"quality\":%d}", filePath, quality);
     }
 
     /**
@@ -1799,21 +1847,21 @@ public:
         return m_parameter ? m_parameter->setInt("che.audio.mixing.file.position", pos) : -ERR_NOT_INITIALIZED;
     }
 #if defined(__APPLE__)
-	/**
-	* start screen capture
-	* @return return 0 if success or an error code
-	*/
-	int startScreenCapture(unsigned int windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.start_screen_capture", windowId) : -ERR_NOT_INITIALIZED;
-	}
-
     /**
-     * specify window id to capture
-     * @return return 0 if success or an error code
+     * start screen/windows capture
+     *
+     *  @param windowId screen capture, if windowId is 0; windows capture if windowsId isn't 0;
+     *  @param rect     valid when windowId is 0; whole screen if rect is NULL.
+     *
+     *  @return return 0 if success or an error code
      */
-    int setScreenCaptureWindow(unsigned int windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.set_screen_capture_window", windowId) : -ERR_NOT_INITIALIZED;
+    int startScreenCapture(unsigned int windowId, int captureFreq, const Rect *rect) {
+        if (!rect)
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d}", windowId, captureFreq);
+        else
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d,\"top\":%d,\"left\":%d,\"bottom\":%d,\"right\":%d}", windowId, captureFreq, rect->top, rect->left, rect->bottom, rect->right);
     }
+
     /**
      * stop screen capture
      * @return return 0 if success or an error code
@@ -1823,20 +1871,20 @@ public:
     }
 #elif defined(_WIN32)
     /**
-     * start screen capture
-     * @return return 0 if success or an error code
-     */
-    int startScreenCapture(HWND windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.start_screen_capture", (unsigned int)windowId) : -ERR_NOT_INITIALIZED;
-    }
-    
-    /**
-     * specify window id to capture
-     * @return return 0 if success or an error code
+     * start screen/windows capture
+     *
+     *  @param windowId screen capture, if windowId is 0; windows capture if windowsId isn't 0;
+     *  @param rect     valid when windowId is 0; whole screen if rect is NULL.
+     *
+     *  @return return 0 if success or an error code
      */
-    int setScreenCaptureWindow(HWND windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.set_screen_capture_window", (unsigned int)windowId) : -ERR_NOT_INITIALIZED;
+    int startScreenCapture(HWND windowId, int captureFreq, const Rect *rect) {
+        if (!rect)
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d}", (unsigned int)windowId, captureFreq);
+        else
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d,\"top\":%d,\"left\":%d,\"bottom\":%d,\"right\":%d}", (unsigned int)windowId, captureFreq, rect->top, rect->left, rect->bottom, rect->right);
     }
+
     /**
      * stop screen capture
      * @return return 0 if success or an error code
@@ -1894,6 +1942,24 @@ public:
         return setObject("che.video.render_mode", "{\"uid\":%u,\"mode\":%d}", uid, renderMode);
     }
     
+    int setLocalVideoMirrorMode(VIDEO_MIRROR_MODE_TYPE mirrorMode) {
+        if (!m_parameter) return -ERR_NOT_INITIALIZED;
+        const char *value;
+        switch (mirrorMode) {
+        case VIDEO_MIRROR_MODE_AUTO:
+            value = "default";
+            break;
+        case VIDEO_MIRROR_MODE_ENABLED:
+            value = "forceMirror";
+            break;
+        case VIDEO_MIRROR_MODE_DISABLED:
+            value = "disableMirror";
+            break;
+        default:
+            return -ERR_INVALID_ARGUMENT;
+        }
+        return m_parameter->setString("che.video.localViewMirrorSetting", value);
+    }
 	int startRecordingService(const char* recordingKey) {
         return m_parameter ? m_parameter->setString("rtc.api.start_recording_service", recordingKey) : -ERR_NOT_INITIALIZED;
     }
@@ -1942,7 +2008,7 @@ public:
     }
     //only for live broadcasting
     int setVideoQualityParameters(bool preferFrameRateOverImageQuality) {
-        return m_parameter ? m_parameter->setBool("rtc.video.prefer_frame_rate", preferFrameRateOverImageQuality) : -ERR_NOT_INITIALIZED;
+        return setParameters("{\"rtc.video.prefer_frame_rate\":%s,\"che.video.prefer_frame_rate\":%s}", preferFrameRateOverImageQuality ? "true" : "false", preferFrameRateOverImageQuality ? "true" : "false");
     }
 protected:
     AParameter& parameter() {

ios/RCTAgora/RCTAgora.m

@@ -59,12 +59,9 @@ RCT_EXPORT_METHOD(init:(NSDictionary *)options) {
     //启用双流模式
     [self.rtcEngine enableDualStreamMode:YES];
     [self.rtcEngine enableVideo];
-    [self.rtcEngine setVideoProfile:[options[@"videoProfile"] integerValue]swapWidthAndHeight:YES];
+    [self.rtcEngine setVideoProfile:[options[@"videoProfile"] integerValue]swapWidthAndHeight:[options[@"swapWidthAndHeight"]boolValue]];
     [self.rtcEngine setClientRole:[options[@"clientRole"] integerValue] withKey:nil];
     
-    //开启预览
-    [self.rtcEngine startPreview];
-    
     //Agora Native SDK 与 Agora Web SDK 间的互通
     [self.rtcEngine enableWebSdkInteroperability:YES];
     
@@ -113,9 +110,48 @@ RCT_EXPORT_METHOD(setupRemoteVideo:(NSDictionary *)options){
 //开启视频预览
 RCT_EXPORT_METHOD(startPreview){
     [self.rtcEngine startPreview];
+}
+
+//配置旁路直播推流(configPublisher)
+//请确保用户已经调用 setClientRole() 且已将用户角色设为主播
+//主播必须在加入频道前调用本章 API
+RCT_EXPORT_METHOD(configPublisher:(NSDictionary *)config){
+    AgoraPublisherConfiguration *apc = [AgoraPublisherConfiguration new];
     
+    apc.width = [config[@"width"] integerValue];  //旁路直播的输出码流的宽度
+    apc.height = [config[@"height"] integerValue]; //旁路直播的输出码流的高度
+    apc.framerate = [config[@"framerate"] integerValue]; //旁路直播的输出码率帧率
+    apc.bitrate = [config[@"bitrate"] integerValue]; //旁路直播输出码流的码率
+    apc.defaultLayout = [config[@"defaultLayout"] integerValue]; //设置流生命周期
+    apc.lifeCycle = [config[@"lifeCycle"] integerValue]; //默认合图布局
+    apc.publishUrl = config[@"publishUrl"]; //合图推流地址
+    apc.rawStreamUrl = config[@"rawStreamUrl"]; //单流地址
+    apc.extraInfo = config[@"extraInfo"]; //其他信息
+    apc.owner = [config[@"owner"] boolValue]; //是否将当前主播设为该 RTMP 流的主人
+  
+    [self.rtcEngine configPublisher:apc];
+}
+
+//设置本地视频显示模式
+RCT_EXPORT_METHOD(setLocalRenderMode:(NSUInteger)mode){
+    [self.rtcEngine setLocalRenderMode:mode];
 }
 
+//设置远端视频显示模式
+RCT_EXPORT_METHOD(setRemoteRenderMode:(NSUInteger)uid mode:(NSUInteger)mode){
+    [self.rtcEngine setRemoteRenderMode:uid mode:mode];
+}
+
+//启用说话者音量提示
+RCT_EXPORT_METHOD(enableAudioVolumeIndication:(NSUInteger)interval smooth:(NSUInteger)smooth){
+    [self.rtcEngine enableAudioVolumeIndication:interval smooth:smooth];
+}
+
+//开启屏幕共享
+//RCT_EXPORT_METHOD(startScreenCapture:(NSUInteger)windowId){
+//
+//}
+
 //关闭视频预览
 RCT_EXPORT_METHOD(stopPreview){
     [self.rtcEngine stopPreview];
@@ -265,6 +301,25 @@ RCT_EXPORT_METHOD(getSdkVersion:(RCTResponseSenderBlock)callback){
     [self sendEvent:params];
 }
 
+/*
+ 音量提示回调
+ 需要开启enableAudioVolumeIndication
+ */
+- (void)rtcEngine:(AgoraRtcEngineKit *)engine reportAudioVolumeIndicationOfSpeakers:(NSArray*)speakers totalVolume:(NSInteger)totalVolume {
+    NSMutableDictionary *params = @{}.mutableCopy;
+    params[@"type"] = @"onAudioVolumeIndication";
+    
+    NSMutableArray *arr = [NSMutableArray array];
+    for (AgoraRtcAudioVolumeInfo *obj in speakers) {
+        [arr addObject:@{@"uid":[NSNumber numberWithInteger:obj.uid], @"volume":[NSNumber numberWithInteger:obj.volume]}];
+    }
+    
+    params[@"speakers"] = arr;
+    params[@"totalVolume"] = [NSNumber numberWithInteger:totalVolume];
+    
+    [self sendEvent:params];
+}
+
 - (void)sendEvent:(NSDictionary *)params {
     [_bridge.eventDispatcher sendDeviceEventWithName:@"agoraEvent" body:params];
 }

ios/RCTAgora/libs/AgoraRtcEngineKit.framework/Headers/AgoraRtcEngineKit.h

@@ -39,7 +39,6 @@ typedef NS_ENUM(NSInteger, AgoraRtcWarningCode) {
     AgoraRtc_Warn_Adm_PlaybackMalfunction = 1020,
     AgoraRtc_Warn_Adm_RecordMalfunction = 1021,
     AgoraRtc_Warn_Adm_Interruption = 1025,
-    AgoraRtc_Warn_Adm_RouteChange = 1026,
     AgoraRtc_Warn_Apm_Howling = 1051,
 };
 
@@ -188,15 +187,21 @@ typedef NS_ENUM(NSInteger, AgoraRtcVideoStreamType) {
     AgoraRtc_VideoStream_Low = 1,
 };
 
-typedef NS_ENUM(NSInteger, AudioOutputRouting)
+typedef NS_ENUM(NSInteger, AgoraRtcAudioOutputRouting)
 {
-    AudioOutputRouting_Default = -1,
-    AudioOutputRouting_Headset = 0,
-    AudioOutputRouting_Earpiece = 1,
-    AudioOutputRouting_HeadsetNoMic = 2,
-    AudioOutputRouting_Speakerphone = 3,
-    AudioOutputRouting_Loudspeaker = 4,
-    AudioOutputRouting_HeadsetBluetooth = 5
+    AgoraRtc_AudioOutputRouting_Default = -1,
+    AgoraRtc_AudioOutputRouting_Headset = 0,
+    AgoraRtc_AudioOutputRouting_Earpiece = 1,
+    AgoraRtc_AudioOutputRouting_HeadsetNoMic = 2,
+    AgoraRtc_AudioOutputRouting_Speakerphone = 3,
+    AgoraRtc_AudioOutputRouting_Loudspeaker = 4,
+    AgoraRtc_AudioOutputRouting_HeadsetBluetooth = 5
+};
+
+typedef NS_ENUM(NSInteger, AgoraRtcAudioRecordingQuality) {
+    AgoraRtc_AudioRecordingQuality_Low = 0,
+    AgoraRtc_AudioRecordingQuality_Medium = 1,
+    AgoraRtc_AudioRecordingQuality_High = 2
 };
 
 typedef NS_ENUM(NSUInteger, AgoraRtcLogFilter) {
@@ -372,6 +377,9 @@ __attribute__((visibility("default"))) @interface AgoraPublisherConfiguration :
 @property (assign, nonatomic) NSInteger bitrate;
 @property (assign, nonatomic) NSInteger defaultLayout;
 @property (assign, nonatomic) AgoraRtmpStreamLifeCycle lifeCycle;
+@property (assign, nonatomic) NSInteger injectStreamWidth;
+@property (assign, nonatomic) NSInteger injectStreamHeight;
+@property (copy, nonatomic) NSString* injectStreamUrl;
 @property (copy, nonatomic) NSString* publishUrl;
 @property (copy, nonatomic) NSString* rawStreamUrl;
 @property (copy, nonatomic) NSString* extraInfo;
@@ -387,6 +395,7 @@ __attribute__((visibility("default"))) @interface AgoraPublisherConfigurationBui
 - (AgoraPublisherConfigurationBuilder *) setPublisherUrl:(NSString*)url;
 - (AgoraPublisherConfigurationBuilder *) setRawStreamUrl:(NSString*)url;
 - (AgoraPublisherConfigurationBuilder *) setExtraInfo:(NSString *)info;
+- (AgoraPublisherConfigurationBuilder *) injectStream:(NSString *)url width:(NSInteger)width height:(NSInteger)height;
 - (AgoraPublisherConfiguration *) build;
 @end
 
@@ -500,7 +509,7 @@ __attribute__((visibility("default"))) @interface AgoraPublisherConfigurationBui
  *  @param engine The engine kit
  *  @param routing the current audio output routing
  */
-- (void)rtcEngine:(AgoraRtcEngineKit *)engine didAudioRouteChanged:(AudioOutputRouting)routing;
+- (void)rtcEngine:(AgoraRtcEngineKit *)engine didAudioRouteChanged:(AgoraRtcAudioOutputRouting)routing;
 
 
 /**
@@ -549,6 +558,13 @@ __attribute__((visibility("default"))) @interface AgoraPublisherConfigurationBui
  */
 - (void)rtcEngineMediaEngineDidAudioMixingFinish:(AgoraRtcEngineKit *)engine;
 
+/**
+ *  Event of meida engine finish audio mixing.
+ *
+ *  @param engine The engine kit
+ */
+- (void)rtcEngineMediaEngineDidAudioEffectFinish:(AgoraRtcEngineKit *)engine soundId:(NSInteger)soundId;
+
 /**
  *  Event of camera opened
  *
@@ -723,6 +739,14 @@ __attribute__((visibility("default"))) @interface AgoraPublisherConfigurationBui
  */
 - (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteAudioFrameOfUid:(NSUInteger)uid elapsed:(NSInteger)elapsed;
 
+
+/**
+ *  The sdk reports who is active speaker in the channel
+ *
+ *  @param engine      The engine kit
+ *  @param speakerUid  The speaker who is talking
+ */
+- (void)rtcEngine:(AgoraRtcEngineKit *)engine activeSpeaker:(NSUInteger)speakerUid;
 @end
 
 
@@ -1004,10 +1028,12 @@ __attribute__((visibility("default"))) @interface AgoraRtcEngineKit : NSObject
  *  Start recording conversation to file specified by the file path.
  *
  *  @param filePath file path to save recorded conversation.
+ *  @param quality  encode quality for the record file
  *
  *  @return 0 when executed successfully. return negative value if failed.
  */
-- (int)startAudioRecording:(NSString*)filePath;
+- (int)startAudioRecording:(NSString*)filePath
+                   quality:(AgoraRtcAudioRecordingQuality)quality;
 
 
 /**
@@ -1029,23 +1055,9 @@ __attribute__((visibility("default"))) @interface AgoraRtcEngineKit : NSObject
 - (int)getAudioMixingCurrentPosition;
 - (int)setAudioMixingPosition:(NSInteger) pos;
 
-/**
- *  Start screen capture
- *
- *  @return 0 when executed successfully. return negative value if failed.
- */
-- (int)startScreenCapture:(NSUInteger)windowId;
-
-
-/**
- *  Stop screen capture
- *
- *  @return 0 when executed successfully. return negative value if failed.
- */
-- (int)stopScreenCapture;
 
 
-- (int)setScreenCaptureId:(NSUInteger)windowId;
+//- (int)setScreenCaptureId:(NSUInteger)windowId;
 
 
 /**
@@ -1322,6 +1334,20 @@ __attribute__((visibility("default"))) @interface AgoraRtcEngineKit : NSObject
 - (int)clearVideoCompositingLayout;
 
 #if (!(TARGET_OS_IPHONE) && (TARGET_OS_MAC))
+/**
+ *  Start screen capture
+ *
+ *  @return 0 when executed successfully. return negative value if failed.
+ */
+- (int)startScreenCapture:(NSUInteger)windowId withCaptureFreq: (int) captureFreq AndRect :(CGRect)rect;
+
+
+/**
+ *  Stop screen capture
+ *
+ *  @return 0 when executed successfully. return negative value if failed.
+ */
+- (int)stopScreenCapture;
 
 - (void) monitorDeviceChange: (BOOL)enabled;
 - (NSArray*) enumerateDevices:(AgoraRtcDeviceType)type;  // return array of AgoraRtcDeviceInfo
@@ -1340,12 +1366,11 @@ __attribute__((visibility("default"))) @interface AgoraRtcEngineKit : NSObject
 - (int) stopCaptureDeviceTest;
 #endif
 
-- (int) checkAVUrlCompatibility:(NSURL*)url
-                 completionBlock:(void(^)())checkCompletionBlock;
-
 //Audio Effects
 - (double) getEffectsVolume;
 - (int) setEffectsVolume:(double) volume;
+- (int) setVolumeOfEffect:(int) soundId
+               withVolume:(double) volume;
 - (int) playEffect:(int) soundId
           filePath:(NSString*)filePath
               loop:(BOOL)loop

ios/RCTAgora/libs/AgoraRtcEngineKit.framework/Headers/IAgoraRtcEngine.h

@@ -72,10 +72,13 @@ public:
         ptr_ = ptr;
     }
     template<class C1, class C2>
-    void queryInterface(C1& c, C2 iid) {
-		pointer_type p;
-        if (!c.queryInterface(iid, (void**)&p))
-			reset(p);
+    bool queryInterface(C1* c, C2 iid) {
+        pointer_type p = NULL;
+        if (c && !c->queryInterface(iid, (void**)&p))
+        {
+            reset(p);
+        }
+        return p != NULL;;
 	}
 private:
     AutoPtr(const AutoPtr&);
@@ -129,7 +132,6 @@ enum WARN_CODE_TYPE
     // sdk: 100~1000
     WARN_SWITCH_LIVE_VIDEO_TIMEOUT = 111,
 	WARN_SET_CLIENT_ROLE_TIMEOUT = 118,
-    WARN_SET_CLIENT_ROLE_NOT_AUTHORIZED = 119,
 };
 
 enum ERROR_CODE_TYPE
@@ -168,6 +170,7 @@ enum ERROR_CODE_TYPE
 	ERR_BITRATE_LIMIT = 115,
 	ERR_TOO_MANY_DATA_STREAMS = 116,
 	ERR_STREAM_MESSAGE_TIMEOUT = 117,
+    ERR_SET_CLIENT_ROLE_NOT_AUTHORIZED = 119,
 
     //1001~2000
     ERR_LOAD_MEDIA_ENGINE = 1001,
@@ -230,7 +233,6 @@ enum MEDIA_ENGINE_EVENT_CODE_TYPE
     MEDIA_ENGINE_RECORDING_WARNING = 2,
     MEDIA_ENGINE_PLAYOUT_WARNING = 3,
     MEDIA_ENGINE_AUDIO_FILE_MIX_FINISH = 10,
-    MEDIA_ENGINE_AUDIO_SAMPLE_RATE_RECONFIG_FINISH = 11,
     // media engine role changed
     MEDIA_ENGINE_ROLE_BROADCASTER_SOLO = 20,
     MEDIA_ENGINE_ROLE_BROADCASTER_INTERACTIVE = 21,
@@ -258,6 +260,13 @@ enum MEDIA_DEVICE_TYPE
     VIDEO_CAPTURE_DEVICE = 3,
 };
 
+enum AUDIO_RECORDING_QUALITY_TYPE
+{
+    AUDIO_RECORDING_QUALITY_LOW = 0,
+    AUDIO_RECORDING_QUALITY_MEDIUM = 1,
+    AUDIO_RECORDING_QUALITY_HIGH = 2,
+};
+
 enum QUALITY_TYPE
 {
     QUALITY_UNKNOWN = 0,
@@ -276,6 +285,13 @@ enum RENDER_MODE_TYPE
     RENDER_MODE_ADAPTIVE = 3,
 };
 
+enum VIDEO_MIRROR_MODE_TYPE
+{
+    VIDEO_MIRROR_MODE_AUTO = 0,//determined by SDK
+    VIDEO_MIRROR_MODE_ENABLED = 1,//enabled mirror
+    VIDEO_MIRROR_MODE_DISABLED = 2,//disable mirror
+};
+
 enum VIDEO_PROFILE_TYPE
 {                                   // res       fps  kbps
     VIDEO_PROFILE_120P = 0,         // 160x120   15   65
@@ -435,6 +451,16 @@ struct VideoCompositingLayout
     {}
 };
 
+typedef struct Rect {
+    int top;
+    int left;
+    int bottom;
+    int right;
+
+    Rect(): top(0), left(0), bottom(0), right(0) {}
+    Rect(int t, int l, int b, int r): top(t), left(l), bottom(b), right(r) {}
+} Rect;
+
 #if defined(_WIN32)
 
 enum RTMP_STREAM_LIFE_CYCLE_TYPE
@@ -451,10 +477,14 @@ struct PublisherConfiguration {
 	int defaultLayout;
 	int lifecycle;
 	bool owner;
+	int injectStreamWidth;
+	int injectStreamHeight;
+	const char* injectStreamUrl;
 	const char* publishUrl;
 	const char* rawStreamUrl;
 	const char* extraInfo;
 
+
 	PublisherConfiguration()
 		: width(640)
 		, height(360)
@@ -463,6 +493,9 @@ struct PublisherConfiguration {
 		, defaultLayout(1)
 		, lifecycle(RTMP_STREAM_LIFE_CYCLE_BIND2CHANNEL)
 		, owner(true)
+		, injectStreamWidth(0)
+		, injectStreamHeight(0)
+		, injectStreamUrl(NULL)
 		, publishUrl(NULL)
 		, rawStreamUrl(NULL)
 		, extraInfo(NULL)
@@ -673,6 +706,12 @@ public:
     virtual void onAudioMixingFinished() {
     }
 
+    /**
+    * When audio effect playback finished, this function will be called
+    */
+    virtual void onAudioEffectFinished(int soundId) {
+    }
+
     /**
     * when the video device state changed(plugged or removed), the function will be called
     * @param [in] deviceId
@@ -957,7 +996,12 @@ public:
         (void)uid;
         (void)elapsed;
     }
-
+    /** @param [in] uid
+    *        the speaker uid who is talking in the channel
+    */
+    virtual void onActiveSpeaker(uid_t uid) {
+        (void)uid;
+    }
 };
 
 /**
@@ -1566,7 +1610,7 @@ public:
 class AAudioDeviceManager : public agora::util::AutoPtr<IAudioDeviceManager>
 {
 public:
-    AAudioDeviceManager(IRtcEngine& engine)
+    AAudioDeviceManager(IRtcEngine* engine)
     {
 		queryInterface(engine, AGORA_IID_AUDIO_DEVICE_MANAGER);
     }
@@ -1575,7 +1619,7 @@ public:
 class AVideoDeviceManager : public agora::util::AutoPtr<IVideoDeviceManager>
 {
 public:
-    AVideoDeviceManager(IRtcEngine& engine)
+    AVideoDeviceManager(IRtcEngine* engine)
     {
 		queryInterface(engine, AGORA_IID_VIDEO_DEVICE_MANAGER);
     }
@@ -1584,21 +1628,25 @@ public:
 class AParameter : public agora::util::AutoPtr<IRtcEngineParameter>
 {
 public:
-    AParameter(IRtcEngine& engine)
+    AParameter(IRtcEngine& engine) { initialize(&engine); }
+    AParameter(IRtcEngine* engine) { initialize(engine); }
+    AParameter(IRtcEngineParameter* p) :agora::util::AutoPtr<IRtcEngineParameter>(p) {}
+private:
+    bool initialize(IRtcEngine* engine)
     {
-        IRtcEngineParameter* p;
-        if (!engine.queryInterface(AGORA_IID_RTC_ENGINE_PARAMETER, (void**)&p))
+        IRtcEngineParameter* p = NULL;
+        if (engine && !engine->queryInterface(AGORA_IID_RTC_ENGINE_PARAMETER, (void**)&p))
             reset(p);
+        return p != NULL;
     }
-    AParameter(IRtcEngineParameter* p)
-        :agora::util::AutoPtr<IRtcEngineParameter>(p)
-    {}
 };
 
 class RtcEngineParameters
 {
 public:
     RtcEngineParameters(IRtcEngine& engine)
+        :m_parameter(&engine){}
+    RtcEngineParameters(IRtcEngine* engine)
         :m_parameter(engine){}
 
     /**
@@ -1710,16 +1758,16 @@ public:
     *        the .wav file path you want to saved
     * @return return 0 if success or an error code
     */
-    int startAudioRecording(const char* filePath) {
+    int startAudioRecording(const char* filePath, AUDIO_RECORDING_QUALITY_TYPE quality) {
         if (!m_parameter) return -ERR_NOT_INITIALIZED;
 #if defined(_WIN32)
-		util::AString path;
-		if (!m_parameter->convertPath(filePath, path))
-			filePath = path->c_str();
-		else
-			return -ERR_INVALID_ARGUMENT;
+        util::AString path;
+        if (!m_parameter->convertPath(filePath, path))
+            filePath = path->c_str();
+        else
+            return -ERR_INVALID_ARGUMENT;
 #endif
-		return m_parameter->setString("che.audio.start_recording", filePath);
+        return setObject("che.audio.start_recording", "{\"filePath\":\"%s\",\"quality\":%d}", filePath, quality);
     }
 
     /**
@@ -1799,21 +1847,21 @@ public:
         return m_parameter ? m_parameter->setInt("che.audio.mixing.file.position", pos) : -ERR_NOT_INITIALIZED;
     }
 #if defined(__APPLE__)
-	/**
-	* start screen capture
-	* @return return 0 if success or an error code
-	*/
-	int startScreenCapture(unsigned int windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.start_screen_capture", windowId) : -ERR_NOT_INITIALIZED;
-	}
-
     /**
-     * specify window id to capture
-     * @return return 0 if success or an error code
+     * start screen/windows capture
+     *
+     *  @param windowId screen capture, if windowId is 0; windows capture if windowsId isn't 0;
+     *  @param rect     valid when windowId is 0; whole screen if rect is NULL.
+     *
+     *  @return return 0 if success or an error code
      */
-    int setScreenCaptureWindow(unsigned int windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.set_screen_capture_window", windowId) : -ERR_NOT_INITIALIZED;
+    int startScreenCapture(unsigned int windowId, int captureFreq, const Rect *rect) {
+        if (!rect)
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d}", windowId, captureFreq);
+        else
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d,\"top\":%d,\"left\":%d,\"bottom\":%d,\"right\":%d}", windowId, captureFreq, rect->top, rect->left, rect->bottom, rect->right);
     }
+
     /**
      * stop screen capture
      * @return return 0 if success or an error code
@@ -1823,20 +1871,20 @@ public:
     }
 #elif defined(_WIN32)
     /**
-     * start screen capture
-     * @return return 0 if success or an error code
-     */
-    int startScreenCapture(HWND windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.start_screen_capture", (unsigned int)windowId) : -ERR_NOT_INITIALIZED;
-    }
-    
-    /**
-     * specify window id to capture
-     * @return return 0 if success or an error code
+     * start screen/windows capture
+     *
+     *  @param windowId screen capture, if windowId is 0; windows capture if windowsId isn't 0;
+     *  @param rect     valid when windowId is 0; whole screen if rect is NULL.
+     *
+     *  @return return 0 if success or an error code
      */
-    int setScreenCaptureWindow(HWND windowId) {
-        return m_parameter ? m_parameter->setUInt("che.video.set_screen_capture_window", (unsigned int)windowId) : -ERR_NOT_INITIALIZED;
+    int startScreenCapture(HWND windowId, int captureFreq, const Rect *rect) {
+        if (!rect)
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d}", (unsigned int)windowId, captureFreq);
+        else
+            return setObject("che.video.start_screen_capture", "{\"id\":%u,\"captureFreq\":%d,\"top\":%d,\"left\":%d,\"bottom\":%d,\"right\":%d}", (unsigned int)windowId, captureFreq, rect->top, rect->left, rect->bottom, rect->right);
     }
+
     /**
      * stop screen capture
      * @return return 0 if success or an error code
@@ -1894,6 +1942,24 @@ public:
         return setObject("che.video.render_mode", "{\"uid\":%u,\"mode\":%d}", uid, renderMode);
     }
     
+    int setLocalVideoMirrorMode(VIDEO_MIRROR_MODE_TYPE mirrorMode) {
+        if (!m_parameter) return -ERR_NOT_INITIALIZED;
+        const char *value;
+        switch (mirrorMode) {
+        case VIDEO_MIRROR_MODE_AUTO:
+            value = "default";
+            break;
+        case VIDEO_MIRROR_MODE_ENABLED:
+            value = "forceMirror";
+            break;
+        case VIDEO_MIRROR_MODE_DISABLED:
+            value = "disableMirror";
+            break;
+        default:
+            return -ERR_INVALID_ARGUMENT;
+        }
+        return m_parameter->setString("che.video.localViewMirrorSetting", value);
+    }
 	int startRecordingService(const char* recordingKey) {
         return m_parameter ? m_parameter->setString("rtc.api.start_recording_service", recordingKey) : -ERR_NOT_INITIALIZED;
     }
@@ -1942,7 +2008,7 @@ public:
     }
     //only for live broadcasting
     int setVideoQualityParameters(bool preferFrameRateOverImageQuality) {
-        return m_parameter ? m_parameter->setBool("rtc.video.prefer_frame_rate", preferFrameRateOverImageQuality) : -ERR_NOT_INITIALIZED;
+        return setParameters("{\"rtc.video.prefer_frame_rate\":%s,\"che.video.prefer_frame_rate\":%s}", preferFrameRateOverImageQuality ? "true" : "false", preferFrameRateOverImageQuality ? "true" : "false");
     }
 protected:
     AParameter& parameter() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-agora",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "声网Agora",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,10 @@
   "keywords": [
     "agora",
     "react-native",
-    "react-native-agora"
+    "react-native-agora",
+    "live",
+    "react",
+    "Agora"
   ],
   "author": "",
   "license": "ISC",