Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: webrtc/modules/video_coding/h264_sprop_parameter_sets.cc

Issue 2641463002: Unit test out of band H264 SPS,PPS within RtpStreamReceiver. (Closed)
Patch Set: Rebase. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/video/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 11 matching lines...) Expand all
22 bool DecodeAndConvert(const std::string& base64, std::vector<uint8_t>* binary) { 22 bool DecodeAndConvert(const std::string& base64, std::vector<uint8_t>* binary) {
23 return rtc::Base64::DecodeFromArray(base64.data(), base64.size(), 23 return rtc::Base64::DecodeFromArray(base64.data(), base64.size(),
24 rtc::Base64::DO_STRICT, binary, nullptr); 24 rtc::Base64::DO_STRICT, binary, nullptr);
25 } 25 }
26 } // namespace 26 } // namespace
27 27
28 namespace webrtc { 28 namespace webrtc {
29 29
30 bool H264SpropParameterSets::DecodeSprop(const std::string& sprop) { 30 bool H264SpropParameterSets::DecodeSprop(const std::string& sprop) {
31 size_t separator_pos = sprop.find(','); 31 size_t separator_pos = sprop.find(',');
32 LOG(LS_INFO) << "Parsing sprop \"" << sprop << "\"";
32 if ((separator_pos <= 0) || (separator_pos >= sprop.length() - 1)) { 33 if ((separator_pos <= 0) || (separator_pos >= sprop.length() - 1)) {
33 LOG(LS_WARNING) << "Invalid seperator position " << separator_pos << " *" 34 LOG(LS_WARNING) << "Invalid seperator position " << separator_pos << " *"
34 << sprop << "*"; 35 << sprop << "*";
35 return false; 36 return false;
36 } 37 }
37 std::string sps_str = sprop.substr(0, separator_pos); 38 std::string sps_str = sprop.substr(0, separator_pos);
38 std::string pps_str = sprop.substr(separator_pos + 1, std::string::npos); 39 std::string pps_str = sprop.substr(separator_pos + 1, std::string::npos);
39 if (!DecodeAndConvert(sps_str, &sps_)) { 40 if (!DecodeAndConvert(sps_str, &sps_)) {
40 LOG(LS_WARNING) << "Failed to decode sprop/sps *" << sprop << "*"; 41 LOG(LS_WARNING) << "Failed to decode sprop/sps *" << sprop << "*";
41 return false; 42 return false;
42 } 43 }
43 if (!DecodeAndConvert(pps_str, &pps_)) { 44 if (!DecodeAndConvert(pps_str, &pps_)) {
44 LOG(LS_WARNING) << "Failed to decode sprop/pps *" << sprop << "*"; 45 LOG(LS_WARNING) << "Failed to decode sprop/pps *" << sprop << "*";
45 return false; 46 return false;
46 } 47 }
47 return true; 48 return true;
48 } 49 }
49 50
50 } // namespace webrtc 51 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698