zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always compile VP9 source files.

Browse Source 
Instead of optionally compile VP9 source files based on the value of
the GN argument 'rtc_libvpx_build_vp9', this CL uses the preprocessor
macro RTC_ENABLE_VP9 to decide if VP9 related code needs to be compiled
or not.

Bug: None
Change-Id: I5c1b69d7ec35e8446181d98c912277d0ae8fdba2
Reviewed-on: https://webrtc-review.googlesource.com/c/111063
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25685}
This commit is contained in:
Mirko Bonadei
2018-11-19 09:52:37 +01:00
committed by Commit Bot
parent dced9f6d2a
commit 95adedb9c2
6 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/video_coding/codecs/vp9/vp9_impl.cc
View File

@ -9,6 +9,8 @@
*
*/
#ifdef RTC_ENABLE_VP9
#include "modules/video_coding/codecs/vp9/vp9_impl.h"
#include <algorithm>
@ -124,23 +126,6 @@ ColorSpace ExtractVP9ColorSpace(vpx_color_space_t space_t,
}
} // namespace
std::vector<SdpVideoFormat> SupportedVP9Codecs() {
// TODO(emircan): Add Profile 2 support after fixing browser_tests.
std::vector<SdpVideoFormat> supported_formats{SdpVideoFormat(
cricket::kVp9CodecName,
{{kVP9FmtpProfileId, VP9ProfileToString(VP9Profile::kProfile0)}})};
return supported_formats;
}
std::unique_ptr<VP9Encoder> VP9Encoder::Create() {
return absl::make_unique<VP9EncoderImpl>(cricket::VideoCodec());
}
std::unique_ptr<VP9Encoder> VP9Encoder::Create(
const cricket::VideoCodec& codec) {
return absl::make_unique<VP9EncoderImpl>(codec);
}
void VP9EncoderImpl::EncoderOutputCodedPacketCallback(vpx_codec_cx_pkt* pkt,
void* user_data) {
VP9EncoderImpl* enc = static_cast<VP9EncoderImpl*>(user_data);
@ -1260,10 +1245,6 @@ VideoEncoder::EncoderInfo VP9EncoderImpl::GetEncoderInfo() const {
return info;
}
std::unique_ptr<VP9Decoder> VP9Decoder::Create() {
return absl::make_unique<VP9DecoderImpl>();
}
VP9DecoderImpl::VP9DecoderImpl()
: decode_complete_callback_(nullptr),
inited_(false),
@ -1458,3 +1439,5 @@ const char* VP9DecoderImpl::ImplementationName() const {
}
} // namespace webrtc
#endif // RTC_ENABLE_VP9