Browse Source

Add explicit type to enums in rtcCodec

Filip Klembara 4 years ago
parent
commit
1542c78ec5
2 changed files with 16 additions and 16 deletions
  1. 4 4
      include/rtc/rtc.h
  2. 12 12
      src/capi.cpp

+ 4 - 4
include/rtc/rtc.h

@@ -81,12 +81,12 @@ typedef enum { // Don't change, it must match plog severity
 
 
 typedef enum {
 typedef enum {
     // video
     // video
-    RTC_H264,
-    RTC_VP8,
-    RTC_VP9,
+    RTC_CODEC_H264,
+    RTC_CODEC_VP8,
+    RTC_CODEC_VP9,
 
 
     // audio
     // audio
-    RTC_OPUS
+    RTC_CODEC_OPUS
 } rtcCodec;
 } rtcCodec;
 
 
 typedef enum {
 typedef enum {

+ 12 - 12
src/capi.cpp

@@ -481,12 +481,12 @@ int rtcAddTrackEx(int pc, rtcCodec codec, int payloadType, uint32_t ssrc, const
 
 
         string mid = "video";
         string mid = "video";
         switch (codec) {
         switch (codec) {
-            case RTC_H264:
-            case RTC_VP8:
-            case RTC_VP9:
+            case RTC_CODEC_H264:
+            case RTC_CODEC_VP8:
+            case RTC_CODEC_VP9:
                 mid = "video";
                 mid = "video";
                 break;
                 break;
-            case RTC_OPUS:
+            case RTC_CODEC_OPUS:
                 mid = "audio";
                 mid = "audio";
                 break;
                 break;
         }
         }
@@ -498,18 +498,18 @@ int rtcAddTrackEx(int pc, rtcCodec codec, int payloadType, uint32_t ssrc, const
         optional<Description::Media> optDescription = nullopt;
         optional<Description::Media> optDescription = nullopt;
 
 
         switch (codec) {
         switch (codec) {
-            case RTC_H264:
-            case RTC_VP8:
-            case RTC_VP9: {
+            case RTC_CODEC_H264:
+            case RTC_CODEC_VP8:
+            case RTC_CODEC_VP9: {
                 auto desc = Description::Video(mid, direction);
                 auto desc = Description::Video(mid, direction);
                 switch (codec) {
                 switch (codec) {
-                    case RTC_H264:
+                    case RTC_CODEC_H264:
                         desc.addH264Codec(payloadType);
                         desc.addH264Codec(payloadType);
                         break;
                         break;
-                    case RTC_VP8:
+                    case RTC_CODEC_VP8:
                         desc.addVP8Codec(payloadType);
                         desc.addVP8Codec(payloadType);
                         break;
                         break;
-                    case RTC_VP9:
+                    case RTC_CODEC_VP9:
                         desc.addVP8Codec(payloadType);
                         desc.addVP8Codec(payloadType);
                         break;
                         break;
                     default:
                     default:
@@ -518,10 +518,10 @@ int rtcAddTrackEx(int pc, rtcCodec codec, int payloadType, uint32_t ssrc, const
                 optDescription = desc;
                 optDescription = desc;
                 break;
                 break;
             }
             }
-            case RTC_OPUS: {
+            case RTC_CODEC_OPUS: {
                 auto desc = Description::Audio(mid, direction);
                 auto desc = Description::Audio(mid, direction);
                 switch (codec) {
                 switch (codec) {
-                    case RTC_OPUS:
+                    case RTC_CODEC_OPUS:
                         desc.addOpusCodec(payloadType);
                         desc.addOpusCodec(payloadType);
                         break;
                         break;
                     default:
                     default: