9d138fc7ce
Deleting the apparently unused include of api/rtp_headers from common/video/include/video_frame.h broke the PayloadRouter and VideoSendStream code under video/. Missing declaration of the RtpPayloadState struct declared in api/rtp_headers.h. Moving the declaration of that struct to payload_router.h (outside of the api), since it's used only internally in video/, and that seemed to be a more logical place for it. Bug: webrtc:7504 Change-Id: Ibed8233dfeea8bdf144db5422cdf897da824d6ee Reviewed-on: https://webrtc-review.googlesource.com/53701 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22080}
85 lines
2.7 KiB
C++
85 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2015 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 VIDEO_PAYLOAD_ROUTER_H_
|
|
#define VIDEO_PAYLOAD_ROUTER_H_
|
|
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "common_types.h" // NOLINT(build/include)
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/criticalsection.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RTPFragmentationHeader;
|
|
class RtpRtcp;
|
|
struct RTPVideoHeader;
|
|
|
|
// Currently only VP8/VP9 specific.
|
|
struct RtpPayloadState {
|
|
int16_t picture_id = -1;
|
|
};
|
|
|
|
// PayloadRouter routes outgoing data to the correct sending RTP module, based
|
|
// on the simulcast layer in RTPVideoHeader.
|
|
class PayloadRouter : public EncodedImageCallback {
|
|
public:
|
|
// Rtp modules are assumed to be sorted in simulcast index order.
|
|
PayloadRouter(const std::vector<RtpRtcp*>& rtp_modules,
|
|
const std::vector<uint32_t>& ssrcs,
|
|
int payload_type,
|
|
const std::map<uint32_t, RtpPayloadState>& states);
|
|
~PayloadRouter();
|
|
|
|
// PayloadRouter will only route packets if being active, all packets will be
|
|
// dropped otherwise.
|
|
void SetActive(bool active);
|
|
// Sets the sending status of the rtp modules and appropriately sets the
|
|
// payload router to active if any rtp modules are active.
|
|
void SetActiveModules(const std::vector<bool> active_modules);
|
|
bool IsActive();
|
|
|
|
std::map<uint32_t, RtpPayloadState> GetRtpPayloadStates() const;
|
|
|
|
// Implements EncodedImageCallback.
|
|
// Returns 0 if the packet was routed / sent, -1 otherwise.
|
|
EncodedImageCallback::Result OnEncodedImage(
|
|
const EncodedImage& encoded_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const RTPFragmentationHeader* fragmentation) override;
|
|
|
|
void OnBitrateAllocationUpdated(const BitrateAllocation& bitrate);
|
|
|
|
private:
|
|
class RtpPayloadParams;
|
|
|
|
void UpdateModuleSendingState() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
|
rtc::CriticalSection crit_;
|
|
bool active_ RTC_GUARDED_BY(crit_);
|
|
|
|
// Rtp modules are assumed to be sorted in simulcast index order. Not owned.
|
|
const std::vector<RtpRtcp*> rtp_modules_;
|
|
const int payload_type_;
|
|
|
|
const bool forced_fallback_enabled_;
|
|
std::vector<RtpPayloadParams> params_ RTC_GUARDED_BY(crit_);
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(PayloadRouter);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // VIDEO_PAYLOAD_ROUTER_H_
|