Skip to content

Commit

Permalink
st22/tx: Updated st22 interlace support for plugins. (#632)
Browse files Browse the repository at this point in the history
Following up on
#628, I
updated tx_st22p_get_encoder() to set the interlaced parameter in the
st22_get_encoder_request struct. This change is critical for the
parameter to get passed to any st22 plugins.

I also updated the interlaced parameter type in the test json
configurations, since interlaced is a boolean but was set as a string,
and json-c defaults all strings as true.

Signed-off-by: Cole <[email protected]>
  • Loading branch information
HickHackz authored Dec 8, 2023
1 parent c3bc652 commit f2eeb10
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/src/st2110/pipeline/st22_pipeline_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ static int tx_st22p_get_encoder(struct mtl_main_impl* impl, struct st22p_tx_ctx*
req.req.quality = ops->quality;
req.req.framebuff_cnt = ops->framebuff_cnt;
req.req.codec_thread_cnt = ops->codec_thread_cnt;

req.req.interlaced = ops->interlaced;
req.priv = ctx;
req.get_frame = tx_st22p_encode_get_frame;
req.put_frame = tx_st22p_encode_put_frame;
Expand Down
6 changes: 3 additions & 3 deletions tests/script/loop_json/st22p_1v_1080i59.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"width": 1920,
"height": 1080,
"fps": "p59",
"interlaced": "true",
"interlaced": true,
"codec": "JPEG-XS",
"device": "AUTO",
"quality": "speed",
Expand Down Expand Up @@ -53,14 +53,14 @@
"width": 1920,
"height": 1080,
"fps": "p59",
"interlaced": "true",
"interlaced": true,
"codec": "JPEG-XS",
"device": "AUTO",
"pack_type": "codestream",
"output_format": "YUV422RFC4175PG2BE10",
"codec_thread_count" : 2,
"display": false,
"measure_latency": true,
"measure_latency": true
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion tests/script/loop_json/st22p_interlaced_pcap.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"width": 1920,
"height": 1080,
"fps": "p59",
"interlaced": "true",
"interlaced": true,
"codec": "JPEG-XS",
"device": "AUTO",
"pack_type": "codestream",
Expand Down

0 comments on commit f2eeb10

Please sign in to comment.