OLD | NEW |
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 |
11 #include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h" | 11 #include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h" |
12 | 12 |
13 #include <string> | 13 #include <string> |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
16 #include "webrtc/rtc_base/base64.h" | 16 #include "webrtc/base/base64.h" |
17 #include "webrtc/rtc_base/basictypes.h" | 17 #include "webrtc/base/basictypes.h" |
18 #include "webrtc/rtc_base/logging.h" | 18 #include "webrtc/base/logging.h" |
19 | 19 |
20 namespace { | 20 namespace { |
21 | 21 |
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 { |
(...skipping 13 matching lines...) Expand all Loading... |
42 return false; | 42 return false; |
43 } | 43 } |
44 if (!DecodeAndConvert(pps_str, &pps_)) { | 44 if (!DecodeAndConvert(pps_str, &pps_)) { |
45 LOG(LS_WARNING) << "Failed to decode sprop/pps *" << sprop << "*"; | 45 LOG(LS_WARNING) << "Failed to decode sprop/pps *" << sprop << "*"; |
46 return false; | 46 return false; |
47 } | 47 } |
48 return true; | 48 return true; |
49 } | 49 } |
50 | 50 |
51 } // namespace webrtc | 51 } // namespace webrtc |
OLD | NEW |