Changeset 211046 in webkit
- Timestamp:
- Jan 23, 2017 11:32:37 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt
r211009 r211046 156 156 ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/video_coding/video_receiver.cc 157 157 ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/video_coding/video_sender.cc 158 ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/video_coding/codecs/vp8/vp8_noop.cc 158 159 ${LIBWEBRTC_INPUT_DIR}/webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc) 159 160 add_library(WebrtcModulesVideo_CodingVideo_Coding STATIC ${WebrtcModulesVideo_CodingVideo_Coding_SOURCES}) … … 4219 4220 CMakeFiles/WebrtcModulesVideo_CodingVideo_Coding.dir/Source/webrtc/modules/video_coding/packet.cc.o 4220 4221 CMakeFiles/WebrtcModulesVideo_CodingVideo_Coding.dir/Source/webrtc/modules/video_coding/timestamp_map.cc.o 4222 CMakeFiles/WebrtcModulesVideo_CodingVideo_Coding.dir/Source/webrtc/modules/video_coding/codecs/vp8/vp8_noop.cc.o 4221 4223 CMakeFiles/WebrtcModulesVideo_CodingVideo_Coding.dir/Source/webrtc/modules/video_coding/inter_frame_delay.cc.o 4222 4224 CMakeFiles/WebrtcModulesVideo_CodingVideo_Coding.dir/Source/webrtc/modules/video_coding/h264_sps_pps_tracker.cc.o -
trunk/Source/ThirdParty/libwebrtc/ChangeLog
r211009 r211046 1 2017-01-23 Youenn Fablet <youennf@gmail.com> 2 3 [WebRTC] Make VP8 optional in libwebrtc 4 https://bugs.webkit.org/show_bug.cgi?id=167257 5 6 Reviewed by Darin Adler. 7 8 Reusing strategy used to have VP9 optional for VP8 codec. 9 10 * CMakeLists.txt: Updated tocompile and link vp8_noop.cc 11 * Source/webrtc/media/engine/webrtcvideoengine2.cc: 12 * Source/webrtc/modules/video_coding/codecs/vp8/include/vp8.h: 13 * Source/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc: 14 * Source/webrtc/modules/video_coding/codecs/vp8/vp8_noop.cc: Added. 15 * Source/webrtc/video/video_encoder.cc: 16 1 17 2017-01-20 Youenn Fablet <youennf@gmail.com> 2 18 -
trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideoengine2.cc
r210942 r211046 116 116 RTC_DCHECK(factory_ != NULL); 117 117 // If it's a codec type we can simulcast, create a wrapped encoder. 118 #ifndef RTC_DISABLE_VP8 119 ASSERT(webrtc::VP8Encoder::IsSupported()); 118 120 if (CodecNamesEq(codec.name.c_str(), kVp8CodecName)) { 119 121 return new webrtc::SimulcastEncoderAdapter( 120 122 new EncoderFactoryAdapter(factory_)); 121 123 } 124 #endif 122 125 webrtc::VideoEncoder* encoder = factory_->CreateVideoEncoder(codec); 123 126 if (encoder) { … … 431 434 std::vector<VideoCodec> DefaultVideoCodecList() { 432 435 std::vector<VideoCodec> codecs; 433 AddCodecAndMaybeRtxCodec( 436 if (webrtc::VP8Encoder::IsSupported() && webrtc::VP8Decoder::IsSupported()) { 437 AddCodecAndMaybeRtxCodec( 434 438 MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType, kVp8CodecName), 435 439 &codecs); 440 } 436 441 if (webrtc::VP9Encoder::IsSupported() && webrtc::VP9Decoder::IsSupported()) { 437 442 AddCodecAndMaybeRtxCodec(MakeVideoCodecWithDefaultFeedbackParams( -
trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/video_coding/codecs/vp8/include/vp8.h
r210942 r211046 20 20 class VP8Encoder : public VideoEncoder { 21 21 public: 22 static bool IsSupported(); 22 23 static VP8Encoder* Create(); 23 24 … … 27 28 class VP8Decoder : public VideoDecoder { 28 29 public: 30 static bool IsSupported(); 29 31 static VP8Decoder* Create(); 30 32 -
trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
r210942 r211046 104 104 } // namespace 105 105 106 bool VP8Encoder::IsSupported() { 107 return true; 108 } 109 106 110 VP8Encoder* VP8Encoder::Create() { 107 111 return new VP8EncoderImpl(); 112 } 113 114 bool VP8Decoder::IsSupported() { 115 return true; 108 116 } 109 117 -
trunk/Source/ThirdParty/libwebrtc/Source/webrtc/video/video_encoder.cc
r210942 r211046 40 40 return H264Encoder::IsSupported(); 41 41 case kVp8: 42 return true;42 return VP8Encoder::IsSupported(); 43 43 case kVp9: 44 44 return VP9Encoder::IsSupported(); -
trunk/Tools/ChangeLog
r211045 r211046 1 2017-01-23 Youenn Fablet <youennf@gmail.com> 2 3 [WebRTC] Make VP8 optional in libwebrtc 4 https://bugs.webkit.org/show_bug.cgi?id=167257 5 6 Reviewed by Darin Adler. 7 8 * Scripts/webkitpy/libwebrtc/generate_cmake.py: 9 (CMakeGenerator.remove_libvpx): Adding vp8_noop.cc to the build system. 10 1 11 2017-01-23 Jer Noble <jer.noble@apple.com> 2 12 -
trunk/Tools/Scripts/webkitpy/libwebrtc/generate_cmake.py
r211009 r211046 282 282 target["defines"].append("RTC_DISABLE_VP8") 283 283 target["defines"].append("RTC_DISABLE_VP9") 284 target["sources"].append("//webrtc/modules/video_coding/codecs/vp8/vp8_noop.cc") 285 target["source_outputs"]["//webrtc/modules/video_coding/codecs/vp8/vp8_noop.cc"] = ["obj/webrtc/modules/video_coding/webrtc_vp8/vp8_noop.o"] 284 286 target["sources"].append("//webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc") 285 287 target["source_outputs"]["//webrtc/modules/video_coding/codecs/vp9/vp9_noop.cc"] = ["obj/webrtc/modules/video_coding/webrtc_vp9/vp9_noop.o"]
Note: See TracChangeset
for help on using the changeset viewer.