[PATCH WIP 5/6] media: vidtv: Move s302m specific fields into encoder context

Daniel W. S. Almeida
2020-09-29T03:26:53Z

A few fields used only by the tone generator in the s302m encoder
are stored in struct vidtv_encoder. Move them into
struct vidtv_s302m_ctx instead. While we are at it: fix a
checkpatch warning for long lines.

Signed-off-by: Daniel W. S. Almeida <dwlsalmeida@gmail.com>
---
.../media/test-drivers/vidtv/vidtv_encoder.h | 3 --
.../media/test-drivers/vidtv/vidtv_s302m.c | 30 +++++++++++--------
.../media/test-drivers/vidtv/vidtv_s302m.h | 3 ++
3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/drivers/media/test-drivers/vidtv/vidtv_encoder.h b/drivers/media/test-drivers/vidtv/vidtv_encoder.h
index 65d81daef4c3..f742d566fbcb 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_encoder.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_encoder.h
@@ -131,9 +131,6 @@ struct vidtv_encoder {
u32 encoder_buf_offset;

u64 sample_count;
- int last_duration;
- int note_offset;
- enum musical_notes last_tone;

struct vidtv_access_unit *access_units;

diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
index 6e5e72ce90d0..f7afbda6335d 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
@@ -233,36 +233,38 @@ static u16 vidtv_s302m_get_sample(struct vidtv_encoder *e)
{
u16 sample;
int pos;
+ struct vidtv_s302m_ctx *ctx = e->ctx;

if (!e->src_buf) {
/*
* Simple tone generator: play the tones at the
* beethoven_5th_symphony array.
*/
- if (e->last_duration <= 0) {
+ if (ctx->last_duration <= 0) {
if (e->src_buf_offset >= ARRAY_SIZE(beethoven_5th_symphony))
e->src_buf_offset = 0;

- e->last_tone = beethoven_5th_symphony[e->src_buf_offset].note;
- e->last_duration = beethoven_5th_symphony[e->src_buf_offset].duration * S302M_SAMPLING_RATE_HZ / COMPASS / 5;
+ ctx->last_tone = beethoven_5th_symphony[e->src_buf_offset].note;
+ ctx->last_duration = beethoven_5th_symphony[e->src_buf_offset].duration *
+ S302M_SAMPLING_RATE_HZ / COMPASS / 5;
e->src_buf_offset++;
- e->note_offset = 0;
+ ctx->note_offset = 0;
} else {
- e->last_duration--;
+ ctx->last_duration--;
}

/* Handle silent */
- if (!e->last_tone) {
+ if (!ctx->last_tone) {
e->src_buf_offset = 0;
return 0x8000;
}

- pos = (2 * PI * e->note_offset * e->last_tone / S302M_SAMPLING_RATE_HZ);
+ pos = (2 * PI * ctx->note_offset * ctx->last_tone / S302M_SAMPLING_RATE_HZ);

if (pos == 360)
- e->note_offset = 0;
+ ctx->note_offset = 0;
else
- e->note_offset++;
+ ctx->note_offset++;

return (fixp_sin32(pos % (2 * PI)) >> 16) + 0x8000;
}
@@ -445,6 +447,10 @@ struct vidtv_encoder
{
struct vidtv_encoder *e;
u32 priv_sz = sizeof(struct vidtv_s302m_ctx);
+ struct vidtv_s302m_ctx *ctx = kzalloc(priv_sz, GFP_KERNEL);
+
+ if (!ctx)
+ return NULL;

e = kzalloc(sizeof(*e), GFP_KERNEL);
if (!e)
@@ -460,16 +466,14 @@ struct vidtv_encoder
e->encoder_buf_offset = 0;

e->sample_count = 0;
- e->last_duration = 0;

e->src_buf = (args.src_buf) ? args.src_buf : NULL;
e->src_buf_sz = (args.src_buf) ? args.src_buf_sz : 0;
e->src_buf_offset = 0;

e->is_video_encoder = false;
- e->ctx = kzalloc(priv_sz, GFP_KERNEL);
- if (!e->ctx)
- return NULL;
+ e->ctx = ctx;
+ ctx->last_duration = 0;

e->encode = vidtv_s302m_encode;
e->clear = vidtv_s302m_clear;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.h b/drivers/media/test-drivers/vidtv/vidtv_s302m.h
index eafe457e761d..a0101734e758 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_s302m.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.h
@@ -38,6 +38,9 @@ struct vidtv_s302m_ctx {
struct vidtv_encoder *enc;
u32 frame_index;
u32 au_count;
+ int last_duration;
+ int note_offset;
+ enum musical_notes last_tone;
};

/**
--
2.28.0