summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Tan <solomonbstoner@yahoo.com.au>2021-08-24 21:36:31 +0800
committermormj <34754695+mormj@users.noreply.github.com>2021-09-02 09:24:22 -0400
commit4d0f2900e887b87e547a1af5874b5d502b5fc71e (patch)
tree97fc03953996077674ba9287acd54cff5b79ec17
parent5ff50fe1f7c46abab8e5dc26039419dc0cf5f526 (diff)
gr-video-sdl: Remove if (1)
Remove `if (1)`. Signed-off-by: Solomon Tan <solomonbstoner@yahoo.com.au>
-rw-r--r--gr-video-sdl/lib/sink_s_impl.cc31
-rw-r--r--gr-video-sdl/lib/sink_uc_impl.cc31
2 files changed, 18 insertions, 44 deletions
diff --git a/gr-video-sdl/lib/sink_s_impl.cc b/gr-video-sdl/lib/sink_s_impl.cc
index df8d9a8c0f..25fbd077ee 100644
--- a/gr-video-sdl/lib/sink_s_impl.cc
+++ b/gr-video-sdl/lib/sink_s_impl.cc
@@ -270,28 +270,15 @@ int sink_s_impl::work(int noutput_items,
}
break;
case 2:
- if (1) { // if(pixel_interleaved_uv)
- // first channel=Y, second channel is alternating pixels U and V
- src_pixels_0 = (short*)input_items[0];
- src_pixels_1 = (short*)input_items[1];
- for (int i = 0; i < noutput_items; i += d_chunk_size) {
- copy_plane_to_surface(12, d_chunk_size / 2, src_pixels_1);
- noutput_items_produced +=
- copy_plane_to_surface(0, d_chunk_size, src_pixels_0);
- src_pixels_0 += d_chunk_size;
- src_pixels_1 += d_chunk_size;
- }
- } else {
- // first channel=Y, second channel is alternating lines U and V
- src_pixels_0 = (short*)input_items[0];
- src_pixels_1 = (short*)input_items[1];
- for (int i = 0; i < noutput_items; i += d_chunk_size) {
- copy_plane_to_surface(1222, d_chunk_size / 2, src_pixels_1);
- noutput_items_produced +=
- copy_plane_to_surface(0, d_chunk_size, src_pixels_0);
- src_pixels_0 += d_chunk_size;
- src_pixels_1 += d_chunk_size;
- }
+ // first channel=Y, second channel is alternating pixels U and V
+ src_pixels_0 = (short*)input_items[0];
+ src_pixels_1 = (short*)input_items[1];
+ for (int i = 0; i < noutput_items; i += d_chunk_size) {
+ copy_plane_to_surface(12, d_chunk_size / 2, src_pixels_1);
+ noutput_items_produced +=
+ copy_plane_to_surface(0, d_chunk_size, src_pixels_0);
+ src_pixels_0 += d_chunk_size;
+ src_pixels_1 += d_chunk_size;
}
break;
case 1: // grey (Y) input
diff --git a/gr-video-sdl/lib/sink_uc_impl.cc b/gr-video-sdl/lib/sink_uc_impl.cc
index 85b9314cdb..5da2926ba5 100644
--- a/gr-video-sdl/lib/sink_uc_impl.cc
+++ b/gr-video-sdl/lib/sink_uc_impl.cc
@@ -265,28 +265,15 @@ int sink_uc_impl::work(int noutput_items,
}
break;
case 2:
- if (1) { // if(pixel_interleaved_uv)
- // first channel=Y, second channel is alternating pixels U and V
- src_pixels_0 = (unsigned char*)input_items[0];
- src_pixels_1 = (unsigned char*)input_items[1];
- for (int i = 0; i < noutput_items; i += d_chunk_size) {
- copy_plane_to_surface(12, d_chunk_size / 2, src_pixels_1);
- noutput_items_produced +=
- copy_plane_to_surface(0, d_chunk_size, src_pixels_0);
- src_pixels_0 += d_chunk_size;
- src_pixels_1 += d_chunk_size;
- }
- } else {
- // first channel=Y, second channel is alternating lines U and V
- src_pixels_0 = (unsigned char*)input_items[0];
- src_pixels_1 = (unsigned char*)input_items[1];
- for (int i = 0; i < noutput_items; i += d_chunk_size) {
- copy_plane_to_surface(1222, d_chunk_size / 2, src_pixels_1);
- noutput_items_produced +=
- copy_plane_to_surface(0, d_chunk_size, src_pixels_0);
- src_pixels_0 += d_chunk_size;
- src_pixels_1 += d_chunk_size;
- }
+ // first channel=Y, second channel is alternating pixels U and V
+ src_pixels_0 = (unsigned char*)input_items[0];
+ src_pixels_1 = (unsigned char*)input_items[1];
+ for (int i = 0; i < noutput_items; i += d_chunk_size) {
+ copy_plane_to_surface(12, d_chunk_size / 2, src_pixels_1);
+ noutput_items_produced +=
+ copy_plane_to_surface(0, d_chunk_size, src_pixels_0);
+ src_pixels_0 += d_chunk_size;
+ src_pixels_1 += d_chunk_size;
}
break;
case 1: // grey (Y) input