Skip to content

Commit be2c4c9

Browse files
devopvoiddevopvoid
committed
RTP header extension refactoring
1 parent 940a0b7 commit be2c4c9

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎webrtc-jni/include/api/RTCRtpHeaderExtParameters.h ‎webrtc-jni/include/api/RTCRtpHeaderExtension.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef JNI_WEBRTC_API_RTC_RTP_HEADER_EXT_PARAMETERS_H_
18-
#define JNI_WEBRTC_API_RTC_RTP_HEADER_EXT_PARAMETERS_H_
17+
#ifndef JNI_WEBRTC_API_RTC_RTP_HEADER_EXTENSION_H_
18+
#define JNI_WEBRTC_API_RTC_RTP_HEADER_EXTENSION_H_
1919

2020
#include "JavaClass.h"
2121
#include "JavaRef.h"
@@ -26,12 +26,12 @@
2626

2727
namespace jni
2828
{
29-
namespace RTCRtpHeaderExtParameters
29+
namespace RTCRtpHeaderExtension
3030
{
31-
class JavaRTCRtpHeaderExtParametersClass : public JavaClass
31+
class JavaRTCRtpHeaderExtensionClass : public JavaClass
3232
{
3333
public:
34-
explicit JavaRTCRtpHeaderExtParametersClass(JNIEnv * env);
34+
explicit JavaRTCRtpHeaderExtensionClass(JNIEnv * env);
3535

3636
jclass cls;
3737
jmethodID ctor;
@@ -40,8 +40,8 @@ namespace jni
4040
jfieldID encrypted;
4141
};
4242

43-
JavaLocalRef<jobject> toJava(JNIEnv * env, const webrtc::RtpHeaderExtensionParameters & parameters);
44-
webrtc::RtpHeaderExtensionParameters toNative(JNIEnv * env, const JavaRef<jobject> & parameters);
43+
JavaLocalRef<jobject> toJava(JNIEnv * env, const webrtc::RtpExtension & extension);
44+
webrtc::RtpExtension toNative(JNIEnv * env, const JavaRef<jobject> & jExtension);
4545
}
4646
}
4747

‎webrtc-jni/src/api/RTCRtpHeaderExtParameters.cpp ‎webrtc-jni/src/api/RTCRtpHeaderExtension.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "api/RTCRtpHeaderExtParameters.h"
17+
#include "api/RTCRtpHeaderExtension.h"
1818
#include "JavaClasses.h"
1919
#include "JavaObject.h"
2020
#include "JavaString.h"
@@ -23,37 +23,37 @@
2323

2424
namespace jni
2525
{
26-
namespace RTCRtpHeaderExtParameters
26+
namespace RTCRtpHeaderExtension
2727
{
28-
JavaLocalRef<jobject> toJava(JNIEnv * env, const webrtc::RtpHeaderExtensionParameters & parameters)
28+
JavaLocalRef<jobject> toJava(JNIEnv * env, const webrtc::RtpExtension & extension)
2929
{
30-
const auto javaClass = JavaClasses::get<JavaRTCRtpHeaderExtParametersClass>(env);
30+
const auto javaClass = JavaClasses::get<JavaRTCRtpHeaderExtensionClass>(env);
3131

32-
JavaLocalRef<jstring> uri = JavaString::toJava(env, parameters.uri);
33-
jint id = static_cast<jint>(parameters.id);
34-
jboolean encrypted = static_cast<jboolean>(parameters.encrypt);
32+
JavaLocalRef<jstring> uri = JavaString::toJava(env, extension.uri);
33+
jint id = static_cast<jint>(extension.id);
34+
jboolean encrypted = static_cast<jboolean>(extension.encrypt);
3535

3636
jobject object = env->NewObject(javaClass->cls, javaClass->ctor, uri.get(), id, encrypted);
3737
ExceptionCheck(env);
3838

3939
return JavaLocalRef<jobject>(env, object);
4040
}
4141

42-
webrtc::RtpHeaderExtensionParameters toNative(JNIEnv * env, const JavaRef<jobject> & parameters)
42+
webrtc::RtpExtension toNative(JNIEnv * env, const JavaRef<jobject> & jExtension)
4343
{
44-
const auto javaClass = JavaClasses::get<JavaRTCRtpHeaderExtParametersClass>(env);
44+
const auto javaClass = JavaClasses::get<JavaRTCRtpHeaderExtensionClass>(env);
4545

46-
JavaObject obj(env, parameters);
46+
JavaObject obj(env, jExtension);
4747

48-
webrtc::RtpHeaderExtensionParameters params;
49-
params.uri = JavaString::toNative(env, obj.getString(javaClass->uri));
50-
params.id = static_cast<int>(obj.getInt(javaClass->id));
51-
params.encrypt = static_cast<bool>(obj.getBoolean(javaClass->encrypted));
48+
webrtc::RtpExtension extension;
49+
extension.uri = JavaString::toNative(env, obj.getString(javaClass->uri));
50+
extension.id = static_cast<int>(obj.getInt(javaClass->id));
51+
extension.encrypt = static_cast<bool>(obj.getBoolean(javaClass->encrypted));
5252

53-
return params;
53+
return extension;
5454
}
5555

56-
JavaRTCRtpHeaderExtParametersClass::JavaRTCRtpHeaderExtParametersClass(JNIEnv * env)
56+
JavaRTCRtpHeaderExtensionClass::JavaRTCRtpHeaderExtensionClass(JNIEnv * env)
5757
{
5858
cls = FindClass(env, PKG"RTCRtpHeaderExtensionParameters");
5959

‎webrtc-jni/src/api/RTCRtpParameters.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616

1717
#include "api/RTCRtpParameters.h"
18-
#include "api/RTCRtcpParameters.h"
19-
#include "api/RTCRtpHeaderExtParameters.h"
2018
#include "api/RTCRtpCodecParameters.h"
19+
#include "api/RTCRtpHeaderExtension.h"
20+
#include "api/RTCRtcpParameters.h"
2121
#include "JavaArrayList.h"
2222
#include "JavaClasses.h"
2323
#include "JavaIterable.h"
@@ -37,7 +37,7 @@ namespace jni
3737

3838
jobject object = env->NewObject(javaClass->cls, javaClass->ctor);
3939
env->SetObjectField(object, javaClass->rtcp, rtcp.get());
40-
env->SetObjectField(object, javaClass->headerExtensions, JavaList::toArrayList(env, parameters.header_extensions, &RTCRtpHeaderExtParameters::toJava));
40+
env->SetObjectField(object, javaClass->headerExtensions, JavaList::toArrayList(env, parameters.header_extensions, &RTCRtpHeaderExtension::toJava));
4141
env->SetObjectField(object, javaClass->codecs, JavaList::toArrayList(env, parameters.codecs, &RTCRtpCodecParameters::toJava));
4242

4343
return JavaLocalRef<jobject>(env, object);
@@ -55,7 +55,7 @@ namespace jni
5555

5656
webrtc::RtpParameters params;
5757
params.rtcp = RTCRtcpParameters::toNative(env, rtcp);
58-
params.header_extensions = JavaList::toVector(env, headerExtensions, &RTCRtpHeaderExtParameters::toNative);
58+
params.header_extensions = JavaList::toVector(env, headerExtensions, &RTCRtpHeaderExtension::toNative);
5959
params.codecs = JavaList::toVector(env, codecs, &RTCRtpCodecParameters::toNative);
6060

6161
return params;

‎webrtc-jni/src/api/RTCRtpSendParameters.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "api/RTCRtpSendParameters.h"
1818
#include "api/RTCRtpCodecParameters.h"
1919
#include "api/RTCRtpEncodingParameters.h"
20-
#include "api/RTCRtpHeaderExtParameters.h"
20+
#include "api/RTCRtpHeaderExtension.h"
2121
#include "api/RTCRtpParameters.h"
2222
#include "api/RTCRtcpParameters.h"
2323
#include "JavaArrayList.h"
@@ -40,7 +40,7 @@ namespace jni
4040
JavaLocalRef<jstring> transactionId = JavaString::toJava(env, parameters.transaction_id);
4141
JavaLocalRef<jobject> rtcp = RTCRtcpParameters::toJava(env, parameters.rtcp);
4242
JavaLocalRef<jobject> encodings = JavaList::toArrayList(env, parameters.encodings, &RTCRtpEncodingParameters::toJava);
43-
JavaLocalRef<jobject> headerExtensions = JavaList::toArrayList(env, parameters.header_extensions, &RTCRtpHeaderExtParameters::toJava);
43+
JavaLocalRef<jobject> headerExtensions = JavaList::toArrayList(env, parameters.header_extensions, &RTCRtpHeaderExtension::toJava);
4444
JavaLocalRef<jobject> codecs = JavaList::toArrayList(env, parameters.codecs, &RTCRtpCodecParameters::toJava);
4545

4646
jobject object = env->NewObject(javaClass->cls, javaClass->ctor);
@@ -70,7 +70,7 @@ namespace jni
7070
params.transaction_id = JavaString::toNative(env, transactionId);
7171
params.rtcp = RTCRtcpParameters::toNative(env, rtcp);
7272
params.encodings = JavaList::toVector(env, encodings, &RTCRtpEncodingParameters::toNative);
73-
params.header_extensions = JavaList::toVector(env, headerExtensions, &RTCRtpHeaderExtParameters::toNative);
73+
params.header_extensions = JavaList::toVector(env, headerExtensions, &RTCRtpHeaderExtension::toNative);
7474
params.codecs = JavaList::toVector(env, codecs, &RTCRtpCodecParameters::toNative);
7575

7676
return params;

0 commit comments

Comments
 (0)