063f0c0d3a
Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed:084c55a63a> > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed:1f88531038TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
43 lines
1.3 KiB
C++
43 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 2017 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_
|
|
#define WEBRTC_API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_
|
|
|
|
#include <map>
|
|
#include <string>
|
|
|
|
namespace webrtc {
|
|
|
|
// SDP specification for a single video codec.
|
|
// NOTE: This class is still under development and may change without notice.
|
|
struct SdpVideoFormat {
|
|
using Parameters = std::map<std::string, std::string>;
|
|
|
|
explicit SdpVideoFormat(const std::string& name) : name(name) {}
|
|
SdpVideoFormat(const std::string& name, const Parameters& parameters)
|
|
: name(name), parameters(parameters) {}
|
|
|
|
friend bool operator==(const SdpVideoFormat& a, const SdpVideoFormat& b) {
|
|
return a.name == b.name && a.parameters == b.parameters;
|
|
}
|
|
|
|
friend bool operator!=(const SdpVideoFormat& a, const SdpVideoFormat& b) {
|
|
return !(a == b);
|
|
}
|
|
|
|
std::string name;
|
|
Parameters parameters;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_API_VIDEO_CODECS_SDP_VIDEO_FORMAT_H_
|