From c93dbf8c3e5bee59c8e24ce435e73fe54810d5ac Mon Sep 17 00:00:00 2001 From: Niklas P Andersson <3985238+niklaspandersson@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:20:19 +0200 Subject: [PATCH] chore: clang format --- .../decklink/consumer/hdr_v210_strategy.cpp | 28 +++++++++---------- .../decklink/consumer/hdr_v210_strategy.h | 2 +- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/modules/decklink/consumer/hdr_v210_strategy.cpp b/src/modules/decklink/consumer/hdr_v210_strategy.cpp index 614fa865da..cbe4060bad 100644 --- a/src/modules/decklink/consumer/hdr_v210_strategy.cpp +++ b/src/modules/decklink/consumer/hdr_v210_strategy.cpp @@ -132,10 +132,10 @@ inline void pack_v210_avx2(__m256i luma[6], __m256i chroma[6], __m128i** v210_de uint16_t* luma_ptr = reinterpret_cast(luma_16bit); uint16_t* chroma_ptr = reinterpret_cast(chroma_16bit); for (int i = 0; i < 8; ++i) { - __m128i luma_values = _mm_loadu_si128(reinterpret_cast<__m128i*>(luma_ptr)); - __m128i chroma_values = _mm_loadu_si128(reinterpret_cast<__m128i*>(chroma_ptr)); - __m128i luma_packed = _mm_mullo_epi16(luma_values, luma_mult); - __m128i chroma_packed = _mm_mullo_epi16(chroma_values, chroma_mult); + __m128i luma_values = _mm_loadu_si128(reinterpret_cast<__m128i*>(luma_ptr)); + __m128i chroma_values = _mm_loadu_si128(reinterpret_cast<__m128i*>(chroma_ptr)); + __m128i luma_packed = _mm_mullo_epi16(luma_values, luma_mult); + __m128i chroma_packed = _mm_mullo_epi16(chroma_values, chroma_mult); luma_packed = _mm_shuffle_epi8(luma_packed, luma_shuf); chroma_packed = _mm_shuffle_epi8(chroma_packed, chroma_shuf); @@ -197,7 +197,6 @@ void pack_v210(const ARGBPixel* src, const std::vector& color_matrix, u } } - struct hdr_v210_strategy::impl final { std::vector bt709{0.2126, 0.7152, 0.0722, -0.1146, -0.3854, 0.5, 0.5, -0.4542, -0.0458}; @@ -283,12 +282,12 @@ struct hdr_v210_strategy::impl final // Pack the final pixels one by one if (rest_x > 0) { auto src = reinterpret_cast(frame.image_data(0).data()) + - (y * decklink_format_desc.width + fullspeed_x * 48); + (y * decklink_format_desc.width + fullspeed_x * 48); auto dest = reinterpret_cast(v210_dest); // clear the remainder of the row - auto rest_bytes = reinterpret_cast(dest_row) + byte_count_line - - reinterpret_cast(dest); + auto rest_bytes = + reinterpret_cast(dest_row) + byte_count_line - reinterpret_cast(dest); memset(dest, 0, rest_bytes); // pack pixels @@ -352,13 +351,12 @@ std::shared_ptr hdr_v210_strategy::allocate_frame_data(const core::video_f { return impl_->allocate_frame_data(format_desc); } -std::shared_ptr -hdr_v210_strategy::convert_frame_for_port(const core::video_format_desc& channel_format_desc, - const core::video_format_desc& decklink_format_desc, - const port_configuration& config, - const core::const_frame& frame1, - const core::const_frame& frame2, - BMDFieldDominance field_dominance) +std::shared_ptr hdr_v210_strategy::convert_frame_for_port(const core::video_format_desc& channel_format_desc, + const core::video_format_desc& decklink_format_desc, + const port_configuration& config, + const core::const_frame& frame1, + const core::const_frame& frame2, + BMDFieldDominance field_dominance) { return impl_->convert_frame_for_port( channel_format_desc, decklink_format_desc, config, frame1, frame2, field_dominance); diff --git a/src/modules/decklink/consumer/hdr_v210_strategy.h b/src/modules/decklink/consumer/hdr_v210_strategy.h index d04f2c6286..e9689d45c3 100644 --- a/src/modules/decklink/consumer/hdr_v210_strategy.h +++ b/src/modules/decklink/consumer/hdr_v210_strategy.h @@ -56,7 +56,7 @@ class hdr_v210_strategy private: struct impl; std::unique_ptr impl_; - hdr_v210_strategy(const hdr_v210_strategy&) = delete; + hdr_v210_strategy(const hdr_v210_strategy&) = delete; hdr_v210_strategy& operator=(const hdr_v210_strategy&) = delete; };