From ba71bac475bb9c99a9ec470246a103ea45d9c365 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Tue, 8 Oct 2019 09:55:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=87sdp=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/Parser.h | 2 +- src/Extension/Factory.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Common/Parser.h b/src/Common/Parser.h index bf9854a7..eaa1874d 100644 --- a/src/Common/Parser.h +++ b/src/Common/Parser.h @@ -163,7 +163,7 @@ class Parser { for (string &key_val : arg_vec) { auto key = FindField(key_val.data(), NULL, key_delim); auto val = FindField(key_val.data(), key_delim, NULL); - ret.emplace_force(key,val); + ret.emplace_force(trim(key),trim(val)); } return ret; } diff --git a/src/Extension/Factory.cpp b/src/Extension/Factory.cpp index b81772a8..763ba27c 100644 --- a/src/Extension/Factory.cpp +++ b/src/Extension/Factory.cpp @@ -62,9 +62,6 @@ Track::Ptr Factory::getTrackBySdp(const SdpTrack::Ptr &track) { if (strcasecmp(track->_codec.data(), "h264") == 0) { //a=fmtp:96 packetization-mode=1;profile-level-id=42C01F;sprop-parameter-sets=Z0LAH9oBQBboQAAAAwBAAAAPI8YMqA==,aM48gA== auto map = Parser::parseArgs(FindField(track->_fmtp.data()," ", nullptr),";","="); - for(auto &pr : map){ - trim(pr.second); - } auto sps_pps = map["sprop-parameter-sets"]; if(sps_pps.empty()){ return std::make_shared(); @@ -79,9 +76,6 @@ Track::Ptr Factory::getTrackBySdp(const SdpTrack::Ptr &track) { if (strcasecmp(track->_codec.data(), "h265") == 0) { //a=fmtp:96 sprop-sps=QgEBAWAAAAMAsAAAAwAAAwBdoAKAgC0WNrkky/AIAAADAAgAAAMBlQg=; sprop-pps=RAHA8vA8kAA= auto map = Parser::parseArgs(FindField(track->_fmtp.data()," ", nullptr),";","="); - for(auto &pr : map){ - trim(pr.second); - } auto vps = decodeBase64(map["sprop-vps"]); auto sps = decodeBase64(map["sprop-sps"]); auto pps = decodeBase64(map["sprop-pps"]);