wifi-display: misc fixes for M3 response parsing

- fix wfd_video_format parsing w/ multiple H264-Codec
- fix handling of CRLF at end of M3 response
- fix missing wfd_client_rtp_ports

Bug: 8871667
Bug: 8875749

Change-Id: Idb0b5605313bba6ff067bcd765512bbed42e5202

1 files changed, 23 insertions, 0 deletions

diff --git a/media/libstagefright/wifi-display/VideoFormats.h b/media/libstagefright/wifi-display/VideoFormats.h
index 69e2197..01de246 100644
--- a/media/libstagefright/wifi-display/VideoFormats.h
+++ b/media/libstagefright/wifi-display/VideoFormats.h
@@ -36,6 +36,27 @@ struct AString;
 struct VideoFormats {
     VideoFormats();
 
+    struct config_t {
+        size_t width, height, framesPerSecond;
+        bool interlaced;
+        unsigned char profile, level;
+    };
+
+    enum ProfileType {
+        PROFILE_CBP = 0,
+        PROFILE_CHP,
+        kNumProfileTypes,
+    };
+
+    enum LevelType {
+        LEVEL_31 = 0,
+        LEVEL_32,
+        LEVEL_40,
+        LEVEL_41,
+        LEVEL_42,
+        kNumLevelTypes,
+    };
+
     enum ResolutionType {
         RESOLUTION_CEA,
         RESOLUTION_VESA,
@@ -69,10 +90,12 @@ struct VideoFormats {
             size_t *chosenIndex);
 
 private:
+    bool parseH264Codec(const char *spec);
     ResolutionType mNativeType;
     size_t mNativeIndex;
 
     uint32_t mResolutionEnabled[kNumResolutionTypes];
+    static config_t mConfigs[kNumResolutionTypes][32];
 
     DISALLOW_EVIL_CONSTRUCTORS(VideoFormats);
 };