commit dd8c16574eb82833060efa7229858de749bbb1b1
author Anders Carlsson <andersc@webrtc.org> Tue Jan 30 10:32:13 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Jan 31 08:33:59 2018 +0000
tree 66e02fbcbaf6b70d912046f70a47641cb788e255
parent 70294c8eab2f7bcc4678c3b597beda5ee504b47c

Enable building WebRTC without built-in software codecs

This CL adds a GN build flag to include builtin software codecs
(enabled by default).

When setting the flag to false, libvpx can also be excluded. The
benefit is that the resulting binary is smaller.

Replaces https://webrtc-review.googlesource.com/c/src/+/29203

Bug: webrtc:7925
Change-Id: Id330ea8a43169e449ee139eca18e4557cc932e10
Reviewed-on: https://webrtc-review.googlesource.com/36340
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21818}

modules/video_coding/codec_database.cc

diff --git a/modules/video_coding/codec_database.cc b/modules/video_coding/codec_database.cc
index 0108019..0cf8d48 100644
--- a/modules/video_coding/codec_database.cc
+++ b/modules/video_coding/codec_database.cc
@@ -10,10 +10,13 @@
 
 #include "modules/video_coding/codec_database.h"
 
+#if defined(USE_BUILTIN_SW_CODECS)
 #include "modules/video_coding/codecs/h264/include/h264.h"
-#include "modules/video_coding/codecs/i420/include/i420.h"
-#include "modules/video_coding/codecs/vp8/include/vp8.h"
-#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "modules/video_coding/codecs/i420/include/i420.h"  // nogncheck
+#include "modules/video_coding/codecs/vp8/include/vp8.h"    // nogncheck
+#include "modules/video_coding/codecs/vp9/include/vp9.h"    // nogncheck
+#endif
+
 #include "modules/video_coding/internal_defines.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
@@ -24,6 +27,7 @@
 
 namespace webrtc {
 
+#if defined(USE_BUILTIN_SW_CODECS)
 // Create an internal Decoder given a codec type
 static std::unique_ptr<VCMGenericDecoder> CreateDecoder(VideoCodecType type) {
   switch (type) {
@@ -48,6 +52,7 @@
   RTC_LOG(LS_WARNING) << "No internal decoder of this type exists.";
   return std::unique_ptr<VCMGenericDecoder>();
 }
+#endif
 
 VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings,
                                      int number_of_cores,
@@ -413,8 +418,12 @@
     ptr_decoder.reset(new VCMGenericDecoder(
         external_dec_item->external_decoder_instance, true));
   } else {
+#if !defined(USE_BUILTIN_SW_CODECS)
+    RTC_LOG(LS_ERROR) << "No decoder of this type exists.";
+#else
     // Create decoder.
     ptr_decoder = CreateDecoder(decoder_item->settings->codecType);
+#endif
   }
   if (!ptr_decoder)
     return nullptr;