update.

Author: cloudwebrtc

sdk/objc/native/src/objc_desktop_capture.mm

@@ -72,12 +72,14 @@
 
   int width = frame->size().width();
   int height = frame->size().height();
-  int real_width = frame->size().width();
+  int real_width = width;
 
-  // A multiple of 32 must be used as the width of the src frame,
-  // and the right black border needs to be cropped during conversion.
-  if( (width % 32) !=0 ) {
-    width = (width / 32 + 1) * 32;
+  if(type_ == kWindow) {
+    // A multiple of 32 must be used as the width of the src frame,
+    // and the right black border needs to be cropped during conversion.
+    if( (width % 32) !=0 ) {
+      width = (width / 32 + 1) * 32;
+    }
   }
 
   if (!i420_buffer_ || !i420_buffer_.get() ||

sdk/objc/native/src/objc_desktop_media_list.h

@@ -49,8 +49,8 @@ class ObjCDesktopMediaList : public rtc::MessageHandler {
 
     class MediaSource {
     public:
-        MediaSource(DesktopCapturer::Source src)
-        : source(src) {}
+        MediaSource(DesktopCapturer::Source src, DesktopType type)
+        : source(src), type_(type) {}
         virtual ~MediaSource();
         DesktopCapturer::Source source;
         // source id
@@ -64,6 +64,7 @@ class ObjCDesktopMediaList : public rtc::MessageHandler {
                                         std::unique_ptr<webrtc::DesktopFrame> frame);
     private:
         std::vector<unsigned char> thumbnail_;
+        DesktopType type_;
     };
  public:
   ObjCDesktopMediaList(DesktopType type, RTC_OBJC_TYPE(RTCDesktopMediaList)* objcMediaList);
@@ -101,6 +102,7 @@ class ObjCDesktopMediaList : public rtc::MessageHandler {
   std::unique_ptr<rtc::Thread> thread_;
   std::vector<std::shared_ptr<MediaSource>> sources_;
   RTC_OBJC_TYPE(RTCDesktopMediaList)* objcMediaList_;
+  DesktopType type_;
 };
 
 }  // namespace webrtc

sdk/objc/native/src/objc_desktop_media_list.mm

@@ -35,7 +35,7 @@
 
 ObjCDesktopMediaList::ObjCDesktopMediaList(DesktopType type,
                                       RTC_OBJC_TYPE(RTCDesktopMediaList)* objcMediaList)
-    :thread_(rtc::Thread::Create()),objcMediaList_(objcMediaList) {
+    :thread_(rtc::Thread::Create()),objcMediaList_(objcMediaList),type_(type) {
   options_ = webrtc::DesktopCaptureOptions::CreateDefault();
   options_.set_detect_updated_region(true);
   options_.set_allow_iosurface(true);
@@ -79,7 +79,7 @@
     }
     for (size_t i = 0; i < new_sources.size(); ++i) {
       if (old_source_set.find(new_sources[i].id) == old_source_set.end()) {
-        MediaSource* source = new MediaSource(new_sources[i]);
+        MediaSource* source = new MediaSource(new_sources[i],type_);
         sources_.insert(sources_.begin() + i, std::shared_ptr<MediaSource>(source));
         [objcMediaList_ mediaSourceAdded:i];
       }
@@ -163,10 +163,14 @@
 
   int width = frame->size().width();
   int height = frame->size().height();
-  int real_width = frame->size().width();
+  int real_width = width;
 
-  if( (width % 32) !=0 ) {
-    width = (width / 32 + 1) * 32;
+  if(type_ == kWindow) {
+    // A multiple of 32 must be used as the width of the src frame,
+    // and the right black border needs to be cropped during conversion.
+    if( (width % 32) !=0 ) {
+      width = (width / 32 + 1) * 32;
+    }
   }
 
   cinfo.image_width = real_width;