From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 14 Mar 2019 08:32:34 +0000 (+0100)
Subject: Fix a confusing variable name (frame_bytes sounded like a number of bytes).
X-Git-Tag: 1.8.5~20
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=3a4f297238b16eb74c1dc9fee60b628d9a6d7547

Fix a confusing variable name (frame_bytes sounded like a number of bytes).
---

diff --git a/nageru/decklink_capture.cpp b/nageru/decklink_capture.cpp
index ea55b46..a09aefa 100644
--- a/nageru/decklink_capture.cpp
+++ b/nageru/decklink_capture.cpp
@@ -254,19 +254,19 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
 
 		current_video_frame = video_frame_allocator->alloc_frame();
 		if (current_video_frame.data != nullptr) {
-			const uint8_t *frame_bytes;
-			video_frame->GetBytes((void **)&frame_bytes);
+			const uint8_t *src;
+			video_frame->GetBytes((void **)&src);
 			size_t num_bytes = stride * height;
 
 			if (current_video_frame.interleaved) {
 				uint8_t *data = current_video_frame.data;
 				uint8_t *data2 = current_video_frame.data2;
-				memcpy_interleaved(data, data2, frame_bytes, num_bytes);
+				memcpy_interleaved(data, data2, src, num_bytes);
 			} else {
-				memcpy(current_video_frame.data, frame_bytes, num_bytes);
+				memcpy(current_video_frame.data, src, num_bytes);
 			}
 			if (current_video_frame.data_copy != nullptr) {
-				memcpy(current_video_frame.data_copy, frame_bytes, num_bytes);
+				memcpy(current_video_frame.data_copy, src, num_bytes);
 			}
 			current_video_frame.len += num_bytes;
 
@@ -281,11 +281,11 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
 
 		current_audio_frame = audio_frame_allocator->alloc_frame();
 		if (current_audio_frame.data != nullptr) {
-			const uint8_t *frame_bytes;
-			audio_frame->GetBytes((void **)&frame_bytes);
+			const uint8_t *src;
+			audio_frame->GetBytes((void **)&src);
 			current_audio_frame.len = sizeof(int32_t) * 2 * num_samples;
 
-			memcpy(current_audio_frame.data, frame_bytes, current_audio_frame.len);
+			memcpy(current_audio_frame.data, src, current_audio_frame.len);
 
 			audio_format.bits_per_sample = 32;
 			audio_format.num_channels = 2;