admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Make frame transformer MimeType pure virtual again"

Browse Source 
This is a reland of commit 3ea9fc4cd8135555360aafbfe788571d9e2f23f9

Original change's description:
> Make frame transformer MimeType pure virtual again
>
> after both audio and video have been implemented.
>
> BUG=webrtc:15579
>
> Change-Id: Ib52e8f67292259cbf7497a884672de72f3003282
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/326162
> Commit-Queue: Philipp Hancke <phancke@microsoft.com>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Tony Herre <herre@google.com>
> Cr-Commit-Position: refs/heads/main@{#41114}

BUG=webrtc:15579

Change-Id: Ia020149cba3045022b539f290565d6c1d0e813ce
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/326880
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41121}
This commit is contained in:
Philipp Hancke 2023-11-06 11:28:30 +01:00 committed by WebRTC LUCI CQ
parent 283a5fd7ec
commit 3e3881ae3c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/frame_transformer_interface.h
View File

@ -13,7 +13,6 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector>
#include "api/ref_count.h" #include "api/ref_count.h"
#include "api/scoped_refptr.h" #include "api/scoped_refptr.h"
@ -54,11 +53,7 @@ class TransformableFrameInterface {
// sender frames to allow received frames to be directly re-transmitted on // sender frames to allow received frames to be directly re-transmitted on
// other PeerConnectionss. // other PeerConnectionss.
virtual Direction GetDirection() const { return Direction::kUnknown; } virtual Direction GetDirection() const { return Direction::kUnknown; }
virtual std::string GetMimeType() const { virtual std::string GetMimeType() const = 0;
// TODO(bugs.webrtc.org/15579): Change this to pure virtual after it
// is implemented everywhere.
return "unknown/unknown";
}
}; };
class TransformableVideoFrameInterface : public TransformableFrameInterface { class TransformableVideoFrameInterface : public TransformableFrameInterface {

3
api/test/mock_transformable_audio_frame.h
View File

@ -11,6 +11,8 @@
#ifndef API_TEST_MOCK_TRANSFORMABLE_AUDIO_FRAME_H_ #ifndef API_TEST_MOCK_TRANSFORMABLE_AUDIO_FRAME_H_
#define API_TEST_MOCK_TRANSFORMABLE_AUDIO_FRAME_H_ #define API_TEST_MOCK_TRANSFORMABLE_AUDIO_FRAME_H_
#include <string>
#include "api/frame_transformer_interface.h" #include "api/frame_transformer_interface.h"
#include "test/gmock.h" #include "test/gmock.h"
@ -24,6 +26,7 @@ class MockTransformableAudioFrame : public TransformableAudioFrameInterface {
MOCK_METHOD(uint8_t, GetPayloadType, (), (const, override)); MOCK_METHOD(uint8_t, GetPayloadType, (), (const, override));
MOCK_METHOD(uint32_t, GetSsrc, (), (const, override)); MOCK_METHOD(uint32_t, GetSsrc, (), (const, override));
MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override)); MOCK_METHOD(uint32_t, GetTimestamp, (), (const, override));
MOCK_METHOD(std::string, GetMimeType, (), (const, override));
MOCK_METHOD(rtc::ArrayView<const uint32_t>, MOCK_METHOD(rtc::ArrayView<const uint32_t>,
GetContributingSources, GetContributingSources,
(), (),