Fix linux build issue after upgrading to M88. (#522)

Author: taste1981

scripts/build_linux.py

@@ -44,7 +44,7 @@
 
 def gen_lib_path(scheme):
     out_lib = OUT_LIB % {'scheme': scheme}
-    return os.path.join(r'out', out_lib)
+    return os.path.join(HOME_PATH + r'/out', out_lib)
 
 def gngen(arch, ssl_root, msdk_root, quic_root, scheme, tests, use_gcc, fake_audio):
     gn_args = list(GN_ARGS)
@@ -101,7 +101,9 @@ def gngen(arch, ssl_root, msdk_root, quic_root, scheme, tests, use_gcc, fake_aud
     return False
 
 def getoutputpath(arch, scheme):
-    return 'out/%s-%s' % (scheme, arch)
+    bin_path = 'out/%s-%s' % (scheme, arch)
+    obj_path = os.path.join(HOME_PATH, bin_path)
+    return obj_path
 
 
 def ninjabuild(arch, scheme):
@@ -138,11 +140,11 @@ def pack_sdk(arch, scheme, output_path):
     src_lib_path = gen_lib_path(scheme)
     src_include_path = os.path.join(HOME_PATH, r'talk/owt/sdk/include/cpp')
     src_doc_path = os.path.join(HOME_PATH, r'talk/owt/docs/cpp/html')
-    dst_lib_path = os.path.join(output_path, 'libs')
-    dst_include_path = os.path.join(output_path, 'include')
-    dst_doc_path = os.path.join(output_path, 'docs')
+    dst_lib_path = os.path.join(os.path.abspath(output_path), 'libs')
+    dst_include_path = os.path.join(os.path.abspath(output_path), 'include')
+    dst_doc_path = os.path.join(os.path.abspath(output_path), 'docs')
     if not os.path.exists(dst_lib_path):
-        os.mkdir(dst_lib_path)
+        os.makedirs(dst_lib_path)
     if os.path.exists(dst_include_path):
         shutil.rmtree(dst_include_path)
     shutil.copy(src_lib_path, dst_lib_path)

talk/owt/BUILD.gn

@@ -254,6 +254,8 @@ static_library("owt_sdk_base") {
   }
   if (is_linux) {
     if (owt_msdk_header_root != "") {
+      include_dirs += [ owt_msdk_header_root ]
+      defines += [ "OWT_USE_MSDK" ]
       sources += [
         "sdk/base/linux/displayutils.cc",
         "sdk/base/linux/displayutils.h",

talk/owt/sdk/base/linux/msdkvideodecoder.cc

@@ -7,7 +7,7 @@
 #include "talk/owt/sdk/base/linux/msdkvideodecoder.h"
 #include "webrtc/api/scoped_refptr.h"
 #include "webrtc/rtc_base/logging.h"
-
+#include "webrtc/rtc_base/ref_counted_object.h"
 #include "msdkcommon.h"
 #include "msdkvideobase.h"
 #include "msdkvideodecoder.h"
@@ -205,9 +205,8 @@ int32_t MsdkVideoDecoder::Decode(
   // 4. Invoke the callback to send decoded image to video sink.
   ReadFromInputStream(bit_stream_.get(), input_image.data(),
                       input_image.size());
-  if (input_image._completeFrame){
-      bit_stream_->DataFlag = MFX_BITSTREAM_COMPLETE_FRAME;
-  }
+  bit_stream_->DataFlag = MFX_BITSTREAM_COMPLETE_FRAME;
+
   mfxStatus sts = MFX_ERR_NONE;
   // First try to extract the video parameters from the frame after the
   // initialization

talk/owt/sdk/base/linux/msdkvideodecoder.h

@@ -7,7 +7,6 @@
 
 #include "webrtc/api/video_codecs/video_encoder.h"
 #include "webrtc/api/video_codecs/sdp_video_format.h"
-#include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/rtc_base/bind.h"
 #include "webrtc/rtc_base/checks.h"

talk/owt/sdk/base/mediautils.cc

@@ -12,7 +12,6 @@
 #include "webrtc/rtc_base/string_to_number.h"
 #include "system_wrappers/include/field_trial.h"
 #include "talk/owt/sdk/base/mediautils.h"
-#include "talk/owt/sdk/base/win/mediacapabilities.h"
 
 namespace owt {
 namespace base {

talk/owt/sdk/base/mediautils.h

@@ -81,7 +81,7 @@ enum class H265ProfileId : int {
   kMain10,
   kMainStillPicture,
   kMainRExt,  // Range extension
-  KScc  // Screen content extension.
+  kScc  // Screen content extension.
 };
 
 /// Level ID as negotiated in SDP level-id field.

talk/owt/sdk/base/win/mediacapabilities.cc

@@ -209,7 +209,7 @@ MediaCapabilities::SupportedCapabilitiesForVideoEncoder(
             hevc_scc_cap.max_temporal_layers = 1;
             hevc_scc_cap.max_spatial_layers = 1;
             hevc_scc_cap.low_power = true;
-            hevc_scc_cap.codec_specific.H265.profile = H265ProfileId::KScc;
+            hevc_scc_cap.codec_specific.H265.profile = H265ProfileId::kScc;
             hevc_scc_cap.supported_brc_modes.push_back(BRCMode::kCBR);
             hevc_scc_cap.supported_brc_modes.push_back(BRCMode::kVBR);
             hevc_scc_cap.supported_brc_modes.push_back(BRCMode::kCQP);