Implement x264 speedcontrol.

[nageru] / decklink_capture.cpp

diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index df8b668f28c26b4552bb3fa0b07e297934999ed4..956c546e6f93a9b8d823e1e7475917466befb83f 100644 (file)
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -72,9 +72,9 @@ size_t memcpy_interleaved_fastpath(uint8_t *dest1, uint8_t *dest2, const uint8_t
        assert(((limit - src) % 64) == 0);
 
 #if __AVX2__
-       const __restrict __m256i *in = (const __m256i *)src;
-       __restrict __m256i *out1 = (__m256i *)dest1;
-       __restrict __m256i *out2 = (__m256i *)dest2;
+       const __m256i * __restrict in = (const __m256i *)src;
+       __m256i * __restrict out1 = (__m256i *)dest1;
+       __m256i * __restrict out2 = (__m256i *)dest2;
 
        __m256i shuffle_cw = _mm256_set_epi8(
                15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2, 0,
@@ -102,9 +102,9 @@ size_t memcpy_interleaved_fastpath(uint8_t *dest1, uint8_t *dest2, const uint8_t
                consumed += 64;
        }
 #else
-       const __restrict __m128i *in = (const __m128i *)src;
-       __restrict __m128i *out1 = (__m128i *)dest1;
-       __restrict __m128i *out2 = (__m128i *)dest2;
+       const __m128i * __restrict in = (const __m128i *)src;
+       __m128i * __restrict out1 = (__m128i *)dest1;
+       __m128i * __restrict out2 = (__m128i *)dest2;
 
        __m128i mask_lower_byte = _mm_set1_epi16(0x00ff);
        while (in < (const __m128i *)limit) {
@@ -140,9 +140,9 @@ DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
                const char *model_name;
                char buf[256];
                if (card->GetModelName(&model_name) == S_OK) {
-                       snprintf(buf, sizeof(buf), "Card %d: %s", card_index, model_name);
+                       snprintf(buf, sizeof(buf), "PCI card %d: %s", card_index, model_name);
                } else {
-                       snprintf(buf, sizeof(buf), "Card %d: Unknown DeckLink card", card_index);
+                       snprintf(buf, sizeof(buf), "PCI card %d: Unknown DeckLink card", card_index);
                }
                description = buf;
        }