mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 06:10:40 +01:00
3d255309e9
This reverts commit16fe3f290a. Reason for revert: After discussing this problem with nisse@ and yvesg@, we decided to modify how RTC_EXPORT works and avoid to depend on the macro COMPONENT_BUILD. RTC_EXPORT will instead depend on a macro WEBRTC_COMPONENT_BUILD (which can be set as a GN argument which defaults to false). When all the symbols needed by Chromium will be marked with RTC_EXPORT we will flip the GN arg in Chromium, setting to to `component_build` and from that moment, Chromium will depend on a WebRTC shared library when `component_build=true`. Original change's description: > Revert "Export symbols needed by the Chromium component build (part 1)." > > This reverts commit99eea42fc1. > > Reason for revert: > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::UnwrapTurnPacket(unsigned char const *, unsigned int, unsigned int *, unsigned int *)" (__imp_?UnwrapTurnPacket@cricket@@YA_NPBEIPAI1@Z) > >>> referenced by obj/services/network/network_service/socket_manager.obj:("virtual void __thiscall network::P2PSocketManager::DumpPacket(class base::span<unsigned char const, 4294967295>, bool)" (?DumpPacket@P2PSocketManager@network@@EAEXV?$span@$$CBE$0PPPPPPPP@@base@@_N@Z)) > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ValidateRtpHeader(unsigned char const *, unsigned int, unsigned int *)" (__imp_?ValidateRtpHeader@cricket@@YA_NPBEIPAI@Z) > >>> referenced by obj/services/network/network_service/socket_manager.obj:("virtual void __thiscall network::P2PSocketManager::DumpPacket(class base::span<unsigned char const, 4294967295>, bool)" (?DumpPacket@P2PSocketManager@network@@EAEXV?$span@$$CBE$0PPPPPPPP@@base@@_N@Z)) > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ApplyPacketOptions(unsigned char *, unsigned int, struct rtc::PacketTimeUpdateParams const &, unsigned __int64)" (__imp_?ApplyPacketOptions@cricket@@YA_NPAEIABUPacketTimeUpdateParams@rtc@@_K@Z) > >>> referenced by obj/services/network/network_service/socket_tcp.obj:("virtual void __thiscall network::P2PSocketTcp::DoSend(class net::IPEndPoint const &, class std::vector<signed char, class std::allocator<signed char>> const &, struct rtc::PacketOptions const &, struct net::NetworkTrafficAnnotationTag)" (?DoSend@P2PSocketTcp@network@@MAEXABVIPEndPoint@net@@ABV?$vector@CV?$allocator@C@std@@@std@@ABUPacketOptions@rtc@@UNetworkTrafficAnnotationTag@4@@Z)) > >>> referenced by obj/services/network/network_service/socket_tcp.obj:("virtual void __thiscall network::P2PSocketStunTcp::DoSend(class net::IPEndPoint const &, class std::vector<signed char, class std::allocator<signed char>> const &, struct rtc::PacketOptions const &, struct net::NetworkTrafficAnnotationTag)" (?DoSend@P2PSocketStunTcp@network@@MAEXABVIPEndPoint@net@@ABV?$vector@CV?$allocator@C@std@@@std@@ABUPacketOptions@rtc@@UNetworkTrafficAnnotationTag@4@@Z)) > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ApplyPacketOptions(unsigned char *, unsigned int, struct rtc::PacketTimeUpdateParams const &, unsigned __int64)" (__imp_?ApplyPacketOptions@cricket@@YA_NPAEIABUPacketTimeUpdateParams@rtc@@_K@Z) > >>> referenced by obj/services/network/network_service/socket_udp.obj:("bool __thiscall network::P2PSocketUdp::DoSend(struct network::P2PSocketUdp::PendingPacket const &)" (?DoSend@P2PSocketUdp@network@@AAE_NABUPendingPacket@12@@Z)) > > Original change's description: > > Reland "Reland "Export symbols needed by the Chromium component build (part 1)."" > > > > This reverts commitb49520bfc0. > > > > Reason for revert: Problem fixed in https://chromium-review.googlesource.com/c/chromium/src/+/1261398. > > > > Original change's description: > > > Revert "Reland "Export symbols needed by the Chromium component build (part 1)."" > > > > > > This reverts commit588f4642d1. > > > > > > Reason for revert: Breaks WebRTC Chromium FYI Win Builder (dbg). > > > lld-link: error: undefined symbol: "__declspec(dllimport) __thiscall webrtc::Config::Config(void)" (__imp_??0Config@webrtc@@QAE@XZ) > > > [...] > > > > > > Original change's description: > > > > Reland "Export symbols needed by the Chromium component build (part 1)." > > > > > > > > This reverts commit2ea9af2275. > > > > > > > > Reason for revert: The problem will be fixed by > > > > https://chromium-review.googlesource.com/c/chromium/src/+/1261122. > > > > > > > > Original change's description: > > > > > Revert "Export symbols needed by the Chromium component build (part 1)." > > > > > > > > > > This reverts commit9e24dcff16. > > > > > > > > > > Reason for revert: Breaks chromium.webrtc.fyi bots. > > > > > > > > > > Original change's description: > > > > > > Export symbols needed by the Chromium component build (part 1). > > > > > > > > > > > > This CL uses RTC_EXPORT (defined in rtc_base/system/rtc_export.h) > > > > > > to mark WebRTC symbols as visible from a shared library, this doesn't > > > > > > mean these symbols are part of the public API (please continue to refer > > > > > > to [1] for info about what is considered public WebRTC API). > > > > > > > > > > > > [1] - https://webrtc.googlesource.com/src/+/HEAD/native-api.md > > > > > > > > > > > > Bug: webrtc:9419 > > > > > > Change-Id: I802abd32874d42d3aa5ecd3c8022e7cf5e043d99 > > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103505 > > > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > > > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > > > > > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > > > > > > Cr-Commit-Position: refs/heads/master@{#24969} > > > > > > > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > > > > > > > Change-Id: I01f6e18f0d2c0f0309cdaa6c943c3927e1f1f49f > > > > > No-Presubmit: true > > > > > No-Tree-Checks: true > > > > > No-Try: true > > > > > Bug: webrtc:9419 > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103720 > > > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > > > Cr-Commit-Position: refs/heads/master@{#24974} > > > > > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > > > > > Change-Id: I83bbc7f550fc23e823c4d055e0a6f60c828960dd > > > > No-Presubmit: true > > > > No-Tree-Checks: true > > > > No-Try: true > > > > Bug: webrtc:9419 > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103740 > > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#24980} > > > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > > > Change-Id: I4b7cfe492f2c8eeda5c8ac52520e0cfc95ade9b0 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: webrtc:9419 > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103801 > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#24983} > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: webrtc:9419 > > Change-Id: Id986a0a03cdc2818690337784396882af067f7fa > > Reviewed-on: https://webrtc-review.googlesource.com/c/104602 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#25049} > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > Change-Id: I6f58b9c90defccdb160307783fb55271ab424fa1 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9419 > Reviewed-on: https://webrtc-review.googlesource.com/c/104623 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25050} TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org Change-Id: I4d01ed96ae40a8f9ca42c466be5c87653d75d7c1 Bug: webrtc:9419 Reviewed-on: https://webrtc-review.googlesource.com/c/104641 Reviewed-by: Yves Gerey <yvesg@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25108}
45 lines
1.6 KiB
C++
45 lines
1.6 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 API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_
|
|
#define API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/audio_codecs/audio_codec_pair_id.h"
|
|
#include "api/audio_codecs/audio_decoder.h"
|
|
#include "api/audio_codecs/audio_format.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// iSAC decoder API (floating-point implementation) for use as a template
|
|
// parameter to CreateAudioDecoderFactory<...>().
|
|
//
|
|
// NOTE: This struct is still under development and may change without notice.
|
|
struct RTC_EXPORT AudioDecoderIsacFloat {
|
|
struct Config {
|
|
bool IsOk() const {
|
|
return sample_rate_hz == 16000 || sample_rate_hz == 32000;
|
|
}
|
|
int sample_rate_hz = 16000;
|
|
};
|
|
static absl::optional<Config> SdpToConfig(const SdpAudioFormat& audio_format);
|
|
static void AppendSupportedDecoders(std::vector<AudioCodecSpec>* specs);
|
|
static std::unique_ptr<AudioDecoder> MakeAudioDecoder(
|
|
Config config,
|
|
absl::optional<AudioCodecPairId> codec_pair_id = absl::nullopt);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_AUDIO_CODECS_ISAC_AUDIO_DECODER_ISAC_FLOAT_H_
|