Moving src/webrtc into src/.
In order to eliminate the WebRTC Subtree mirror in Chromium, WebRTC is moving the content of the src/webrtc directory up to the src/ directory. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true TBR=tommi@webrtc.org Bug: chromium:611808 Change-Id: Iac59c5b51b950f174119565bac87955a7994bc38 Reviewed-on: https://webrtc-review.googlesource.com/1560 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Henrik Kjellander <kjellander@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19845}
This commit is contained in:
committed by
Commit Bot
parent
6674846b4a
commit
bb547203bf
51
modules/video_coding/h264_sprop_parameter_sets.cc
Normal file
51
modules/video_coding/h264_sprop_parameter_sets.cc
Normal file
@ -0,0 +1,51 @@
|
||||
/*
|
||||
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/rtc_base/base64.h"
|
||||
#include "webrtc/rtc_base/basictypes.h"
|
||||
#include "webrtc/rtc_base/logging.h"
|
||||
|
||||
namespace {
|
||||
|
||||
bool DecodeAndConvert(const std::string& base64, std::vector<uint8_t>* binary) {
|
||||
return rtc::Base64::DecodeFromArray(base64.data(), base64.size(),
|
||||
rtc::Base64::DO_STRICT, binary, nullptr);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
bool H264SpropParameterSets::DecodeSprop(const std::string& sprop) {
|
||||
size_t separator_pos = sprop.find(',');
|
||||
LOG(LS_INFO) << "Parsing sprop \"" << sprop << "\"";
|
||||
if ((separator_pos <= 0) || (separator_pos >= sprop.length() - 1)) {
|
||||
LOG(LS_WARNING) << "Invalid seperator position " << separator_pos << " *"
|
||||
<< sprop << "*";
|
||||
return false;
|
||||
}
|
||||
std::string sps_str = sprop.substr(0, separator_pos);
|
||||
std::string pps_str = sprop.substr(separator_pos + 1, std::string::npos);
|
||||
if (!DecodeAndConvert(sps_str, &sps_)) {
|
||||
LOG(LS_WARNING) << "Failed to decode sprop/sps *" << sprop << "*";
|
||||
return false;
|
||||
}
|
||||
if (!DecodeAndConvert(pps_str, &pps_)) {
|
||||
LOG(LS_WARNING) << "Failed to decode sprop/pps *" << sprop << "*";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
Reference in New Issue
Block a user