Changeset 4672

Timestamp:

03/05/10 12:55:34 (3 years ago)

Author:

douglask

Message:

Avoid using SWSCALE to scale 1920x1080 to 1920x1072 due to poor performance

clip widescreen resoltion when using CIF & QCIF

Files:

• vic/branches/mpeg4/video/grabber-decklink.cpp (modified) (9 diffs)

vic/branches/mpeg4/video/grabber-decklink.cpp

@@ -105 +105 @@
         cformat = format;
         for (int i = 0; i < mBufferSize; i++) {
-            mBuffer[i] = new uint8_t[width * height * 2];
-            memset((void *)mBuffer[i], width * height * 2, sizeof(uint8_t));
+            if (cformat == CF_422) {
+                    mBuffer[i] = new uint8_t[width * height * 2];
+            } else {
+                    mBuffer[i] = new uint8_t[width * height * 3 / 2];
+            }
+            mBufferFrameNum[i] = 0;
         }
     }
@@ -122 +126 @@
         }
 
-                // ignore older frames
-                if (mLastReadFrameNum >= mBufferFrameNum[mReadIndex] && mLastReadFrameNum <= 0xFFFFFFFF - mBufferSize) {
+        // ignore older frames
+        if (mLastReadFrameNum >= mBufferFrameNum[mReadIndex] && mLastReadFrameNum <= 0xFFFFFFFF - mBufferSize) {
             return NULL;
         }
@@ -132 +136 @@
         mReadIndex = nextElement;
 
-// fprintf(stderr, "*pop * mBuffer[%i] = 0x%lx\n", mReadIndex, mBuffer[mReadIndex]);
-
         return retval;
-
     }
 
@@ -196 +197 @@
         if(nextElementIndex != mReadIndex) {
 #ifdef HAVE_SWSCALE
+            // don't use SWSCALE to scale 1920x1080 to 1920x1072
+            if (outh == 1072) {
+                if (cformat == CF_422) {
+                    packedUYVY422_to_planarYUYV422((char *)mBuffer[mWriteIndex], outw, outh,
+                                                   (char *)videoFrame, arrivedFrame->GetWidth(), arrivedFrame->GetHeight());
+                } else {
+                    packedUYVY422_to_planarYUYV420((char *)mBuffer[mWriteIndex], outw, outh,
+                                                   (char *)videoFrame, arrivedFrame->GetWidth(), arrivedFrame->GetHeight());
+                }
+                mBufferFrameNum[mWriteIndex] = ++mLastWriteFrameNum;
+                mWriteIndex = nextElementIndex;
+
+                return S_OK;
+            }
+
             int flags = SWS_FAST_BILINEAR;
 
@@ -246 +262 @@
             sws_scale(sws_context, sws_src, sws_src_stride, 0, arrivedFrame->GetHeight(), sws_tar, sws_tar_stride);
 #else
-            memcpy((void *)(mBuffer[mWriteIndex]), videoFrame, arrivedFrame->GetRowBytes() * arrivedFrame->GetHeight());
-#endif
-
-// fprintf(stderr, "*push* mBuffer[%i] = 0x%lx\n", mWriteIndex, mBuffer[mWriteIndex]);
-                        mBufferFrameNum[mWriteIndex] = ++mLastWriteFrameNum;
+            if (cformat == CF_422) {
+                packedUYVY422_to_planarYUYV422((char *)mBuffer[mWriteIndex], outw, outh,
+                                               (char *)videoFrame, arrivedFrame->GetWidth(), arrivedFrame->GetHeight());
+            } else {
+                packedUYVY422_to_planarYUYV420((char *)mBuffer[mWriteIndex], outw, outh,
+                                               (char *)videoFrame, arrivedFrame->GetWidth(), arrivedFrame->GetHeight());
+            }
+#endif
+            mBufferFrameNum[mWriteIndex] = ++mLastWriteFrameNum;
             mWriteIndex = nextElementIndex;
         }
@@ -743 +763 @@
     // Set the image size.
     switch (decimate_) {
-    case 1: // full-sized
+    case 1: // large-size
         if (strcmp(setSoftwareScale, "960p") == 0) {
             width_ = int(960 * displayModeWidth_ / displayModeHeight_);
@@ -761 +781 @@
         }
         break;
-    case 2: // CIF-sized
-        width_ = CIF_WIDTH;
+    case 2: // CIF-size
+        width_ = int(CIF_HEIGHT * displayModeWidth_ / displayModeHeight_);
         height_ = CIF_HEIGHT;
         break;
-    case 4: // QCIF-sized
-        width_ = QCIF_WIDTH;
+    case 4: // QCIF-size
+        width_ = int(QCIF_HEIGHT * displayModeWidth_ / displayModeHeight_);
         height_ = QCIF_HEIGHT;
         break;
@@ -792 +812 @@
         delegate_->Release();
     }
-    delegate_ = new DeckLinkCaptureDelegate(outw_, outh_, cformat_);
+    if (decimate_ >= 2) {
+        delegate_ = new DeckLinkCaptureDelegate(width_, height_, cformat_);
+    } else {
+        delegate_ = new DeckLinkCaptureDelegate(outw_, outh_, cformat_);
+    }
 
     result = deckLinkInput_->SetCallback(delegate_);
@@ -842 +866 @@
     }
 
-#ifdef HAVE_SWSCALE
-    switch (cformat_) {
-    case CF_420:
-    case CF_CIF:
-        memcpy((char *)frame_, (char *)fr, outw_ * outh_ * 3 / 2);
-      break;
-
-    case CF_422:
-        memcpy((char *)frame_, (char *)fr, outw_ * outh_ * 2);
-      break;
-    }
-#else
-    switch (cformat_) {
-    case CF_420:
-    case CF_CIF:
-        packedUYVY422_to_planarYUYV420((char *)frame_, outw_, outh_, (char *)fr, inw_, inh_);
-      break;
-
-    case CF_422:
-        packedUYVY422_to_planarYUYV422((char *)frame_, outw_, outh_, (char *)fr, inw_, inh_);
-      break;
-    }
-#endif
+
+    switch (decimate_) {
+    case 1: // large-size
+        if (cformat_ == CF_422) {
+            memcpy((char *)frame_, (char *)fr, outw_ * outh_ * 2);
+        } else {
+            memcpy((char *)frame_, (char *)fr, outw_ * outh_ * 3 / 2);
+        }
+        break;
+
+    case 2: // CIF-size
+        if (cformat_ == CF_422) {
+            planarYUYV422_to_planarYUYV422((char *)frame_, CIF_WIDTH, CIF_HEIGHT, (char *)fr, width_, height_);
+        } else {
+            planarYUYV420_to_planarYUYV420((char *)frame_, CIF_WIDTH, CIF_HEIGHT, (char *)fr, width_, height_);
+        }
+        break;
+
+    case 4: // QCIF-size
+        if (cformat_ == CF_422) {
+            planarYUYV422_to_planarYUYV422((char *)frame_, QCIF_WIDTH, QCIF_HEIGHT, (char *)fr, width_, height_);
+        } else {
+            planarYUYV420_to_planarYUYV420((char *)frame_, QCIF_WIDTH, QCIF_HEIGHT, (char *)fr, width_, height_);
+        }
+        break;
+    }
+
     suppress(frame_);
     saveblks(frame_);