Skip to content

Commit 82a0d24

Browse files
chenzhihong007sakumisu
chenzhihong007
authored and
sakumisu
committed
usbd_video: use pingpang buffer to improve tx performance
- use pingpang buffer to improve tx performance Signed-off-by: Zhihong Chen <[email protected]>
1 parent ac3be8c commit 82a0d24

File tree

6 files changed

+95
-46
lines changed

6 files changed

+95
-46
lines changed

‎class/video/usbd_video.c

Lines changed: 85 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ struct usbd_video_priv {
1818
uint8_t power_mode;
1919
uint8_t error_code;
2020
struct video_entity_info info[3];
21-
uint8_t *ep_buffer;
21+
uint8_t *ep_buf0;
22+
uint8_t *ep_buf1;
23+
bool ep_buf0_ready;
24+
bool ep_buf1_ready;
25+
uint32_t ep_buf0_len;
26+
uint32_t ep_buf1_len;
27+
uint8_t ep_buf_idx;
28+
bool stream_finish;
2229
uint32_t max_packets;
2330
uint8_t *stream_buf;
2431
uint32_t stream_len;
@@ -749,6 +756,40 @@ static void usbd_video_probe_and_commit_controls_init(uint8_t busid, uint32_t dw
749756
g_usbd_video[busid].stream_headerlen = 2;
750757
}
751758

759+
static uint32_t usbd_video_prepare_ep_buf_data(uint8_t busid, uint32_t remain, uint8_t *ep_buf)
760+
{
761+
struct video_payload_header *header;
762+
uint32_t len;
763+
uint32_t offset;
764+
765+
len = MIN(remain, (g_usbd_video[busid].probe.dwMaxPayloadTransferSize - g_usbd_video[busid].stream_headerlen) * g_usbd_video[busid].max_packets);
766+
offset = 0;
767+
while (len > 0) {
768+
header = (struct video_payload_header *)&ep_buf[offset];
769+
header->bHeaderLength = g_usbd_video[busid].stream_headerlen;
770+
header->headerInfoUnion.bmheaderInfo = 0;
771+
header->headerInfoUnion.headerInfoBits.endOfHeader = 1;
772+
header->headerInfoUnion.headerInfoBits.endOfFrame = 0;
773+
header->headerInfoUnion.headerInfoBits.frameIdentifier = g_usbd_video[busid].stream_frameid;
774+
775+
uint32_t len2 = MIN(len, g_usbd_video[busid].probe.dwMaxPayloadTransferSize - g_usbd_video[busid].stream_headerlen);
776+
777+
usb_memcpy(&ep_buf[offset + g_usbd_video[busid].stream_headerlen],
778+
&g_usbd_video[busid].stream_buf[g_usbd_video[busid].stream_offset],
779+
len2);
780+
781+
g_usbd_video[busid].stream_offset += len2;
782+
len -= len2;
783+
offset += (len2 + g_usbd_video[busid].stream_headerlen);
784+
785+
if (g_usbd_video[busid].stream_offset == g_usbd_video[busid].stream_len) {
786+
header->headerInfoUnion.headerInfoBits.endOfFrame = 1;
787+
}
788+
}
789+
790+
return offset;
791+
}
792+
752793
struct usbd_interface *usbd_video_init_intf(uint8_t busid,
753794
struct usbd_interface *intf,
754795
uint32_t dwFrameInterval,
@@ -776,60 +817,68 @@ struct usbd_interface *usbd_video_init_intf(uint8_t busid,
776817

777818
bool usbd_video_stream_split_transfer(uint8_t busid, uint8_t ep)
778819
{
779-
struct video_payload_header *header;
780820
uint32_t remain;
781-
uint32_t len;
782-
uint32_t offset;
783821

784-
remain = g_usbd_video[busid].stream_len - g_usbd_video[busid].stream_offset;
785-
786-
if (remain == 0) {
787-
g_usbd_video[busid].stream_frameid ^= 1;
788-
return true;
822+
if (g_usbd_video[busid].ep_buf1_ready && (g_usbd_video[busid].ep_buf_idx == 0)) { /* callback: buf1 ready and buf0 was sent */
823+
g_usbd_video[busid].ep_buf0_ready = false;
824+
g_usbd_video[busid].ep_buf_idx = 1;
825+
usbd_ep_start_write(busid, ep, g_usbd_video[busid].ep_buf1, g_usbd_video[busid].ep_buf1_len);
826+
} else if (g_usbd_video[busid].ep_buf0_ready && (g_usbd_video[busid].ep_buf_idx == 1)) { /* callback: buf0 ready and buf1 was sent */
827+
g_usbd_video[busid].ep_buf1_ready = false;
828+
g_usbd_video[busid].ep_buf_idx = 0;
829+
usbd_ep_start_write(busid, ep, g_usbd_video[busid].ep_buf0, g_usbd_video[busid].ep_buf0_len);
830+
} else {
831+
if (g_usbd_video[busid].stream_finish) {
832+
return true;
833+
}
789834
}
790835

791-
len = MIN(remain, (g_usbd_video[busid].probe.dwMaxPayloadTransferSize - g_usbd_video[busid].stream_headerlen) * g_usbd_video[busid].max_packets);
792-
793-
offset = 0;
794-
while (len > 0) {
795-
header = (struct video_payload_header *)&g_usbd_video[busid].ep_buffer[offset];
796-
header->bHeaderLength = g_usbd_video[busid].stream_headerlen;
797-
header->headerInfoUnion.bmheaderInfo = 0;
798-
header->headerInfoUnion.headerInfoBits.endOfHeader = 1;
799-
header->headerInfoUnion.headerInfoBits.endOfFrame = 0;
800-
header->headerInfoUnion.headerInfoBits.frameIdentifier = g_usbd_video[busid].stream_frameid;
801-
802-
uint32_t len2 = MIN(len, g_usbd_video[busid].probe.dwMaxPayloadTransferSize - g_usbd_video[busid].stream_headerlen);
803-
804-
usb_memcpy(&g_usbd_video[busid].ep_buffer[offset + g_usbd_video[busid].stream_headerlen],
805-
&g_usbd_video[busid].stream_buf[g_usbd_video[busid].stream_offset],
806-
len2);
807-
808-
g_usbd_video[busid].stream_offset += len2;
809-
len -= len2;
810-
offset += (len2 + g_usbd_video[busid].stream_headerlen);
836+
if (!g_usbd_video[busid].ep_buf0_ready) {
837+
remain = g_usbd_video[busid].stream_len - g_usbd_video[busid].stream_offset;
838+
if (remain == 0) {
839+
g_usbd_video[busid].stream_frameid ^= 1;
840+
g_usbd_video[busid].stream_finish = true;
841+
} else {
842+
g_usbd_video[busid].ep_buf0_len = usbd_video_prepare_ep_buf_data(busid, remain, g_usbd_video[busid].ep_buf0);
843+
g_usbd_video[busid].ep_buf0_ready = true;
844+
if (!g_usbd_video[busid].ep_buf1_ready) {
845+
g_usbd_video[busid].ep_buf_idx = 0;
846+
usbd_ep_start_write(busid, ep, g_usbd_video[busid].ep_buf0, g_usbd_video[busid].ep_buf0_len);
847+
}
848+
}
849+
}
811850

812-
if (g_usbd_video[busid].stream_offset == g_usbd_video[busid].stream_len) {
813-
header->headerInfoUnion.headerInfoBits.endOfFrame = 1;
851+
if (!g_usbd_video[busid].ep_buf1_ready) {
852+
remain = g_usbd_video[busid].stream_len - g_usbd_video[busid].stream_offset;
853+
if (remain == 0) {
854+
g_usbd_video[busid].stream_frameid ^= 1;
855+
g_usbd_video[busid].stream_finish = true;
856+
} else {
857+
g_usbd_video[busid].ep_buf1_len = usbd_video_prepare_ep_buf_data(busid, remain, g_usbd_video[busid].ep_buf1);
858+
g_usbd_video[busid].ep_buf1_ready = true;
814859
}
815860
}
816861

817-
usbd_ep_start_write(busid, ep, g_usbd_video[busid].ep_buffer, offset);
818862
return false;
819863
}
820864

821-
int usbd_video_stream_start_write(uint8_t busid, uint8_t ep, uint8_t *ep_buffer, uint32_t ep_bufsize, uint8_t *stream_buf, uint32_t stream_len)
865+
int usbd_video_stream_start_write(uint8_t busid, uint8_t ep, uint8_t *ep_buf0, uint8_t *ep_buf1, uint32_t ep_bufsize, uint8_t *stream_buf, uint32_t stream_len)
822866
{
823-
if (usb_device_is_configured(busid) == 0) {
867+
if ((usb_device_is_configured(busid) == 0) || (stream_len == 0)) {
824868
return -1;
825869
}
826870

827-
g_usbd_video[busid].ep_buffer = ep_buffer;
871+
g_usbd_video[busid].ep_buf0 = ep_buf0;
872+
g_usbd_video[busid].ep_buf1 = ep_buf1;
873+
g_usbd_video[busid].ep_buf0_ready = false;
874+
g_usbd_video[busid].ep_buf1_ready = false;
875+
g_usbd_video[busid].ep_buf_idx = 0;
876+
g_usbd_video[busid].stream_finish = false;
828877
g_usbd_video[busid].max_packets = ep_bufsize / g_usbd_video[busid].probe.dwMaxPayloadTransferSize;
829878
g_usbd_video[busid].stream_buf = stream_buf;
830879
g_usbd_video[busid].stream_len = stream_len;
831880
g_usbd_video[busid].stream_offset = 0;
832881

833882
usbd_video_stream_split_transfer(busid, ep);
834883
return 0;
835-
}
884+
}

‎class/video/usbd_video.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void usbd_video_open(uint8_t busid, uint8_t intf);
2222
void usbd_video_close(uint8_t busid, uint8_t intf);
2323

2424
bool usbd_video_stream_split_transfer(uint8_t busid, uint8_t ep);
25-
int usbd_video_stream_start_write(uint8_t busid, uint8_t ep, uint8_t *ep_buffer, uint32_t ep_bufsize, uint8_t *stream_buf, uint32_t stream_len);
25+
int usbd_video_stream_start_write(uint8_t busid, uint8_t ep, uint8_t *ep_buf0, uint8_t *ep_buf1, uint32_t ep_bufsize, uint8_t *stream_buf, uint32_t stream_len);
2626

2727
#ifdef __cplusplus
2828
}

‎demo/video_audiov1_hid_template.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ static const uint8_t hid_keyboard_report_desc[HID_KEYBOARD_REPORT_DESC_SIZE] = {
269269

270270
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t audio_read_buffer[AUDIO_OUT_PACKET];
271271
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t audio_write_buffer[AUDIO_IN_PACKET];
272-
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t video_packet_buffer[MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE];
272+
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t video_packet_buffer[2][MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE];
273273

274274
volatile bool video_tx_flag = 0;
275275
volatile bool audio_tx_flag = 0;
@@ -480,7 +480,7 @@ void video_test(uint8_t busid)
480480
while (1) {
481481
if (video_tx_flag) {
482482
video_iso_tx_busy = true;
483-
usbd_video_stream_start_write(busid, VIDEO_IN_EP, video_packet_buffer, MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_mjpeg, sizeof(cherryusb_mjpeg));
483+
usbd_video_stream_start_write(busid, VIDEO_IN_EP, &video_packet_buffer[0][0], &video_packet_buffer[1][0], MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_mjpeg, sizeof(cherryusb_mjpeg));
484484
while (video_iso_tx_busy) {
485485
if (video_tx_flag == 0) {
486486
break;

‎demo/video_static_h264_template.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,19 +206,19 @@ void video_init(uint8_t busid, uintptr_t reg_base)
206206
usbd_initialize(busid, reg_base, usbd_event_handler);
207207
}
208208

209-
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t packet_buffer[40 * 1024];
209+
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t packet_buffer[2][40 * 1024];
210210

211211
void video_test(uint8_t busid)
212212
{
213213
uint32_t out_len;
214214
uint32_t packets;
215215

216216
(void)packets;
217-
memset(packet_buffer, 0, 40 * 1024);
217+
memset(packet_buffer, 0, sizeof(packet_buffer));
218218
while (1) {
219219
if (tx_flag) {
220220
iso_tx_busy = true;
221-
usbd_video_stream_start_write(busid, VIDEO_IN_EP, packet_buffer, MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_h264, sizeof(cherryusb_h264));
221+
usbd_video_stream_start_write(busid, VIDEO_IN_EP, &packet_buffer[0][0], &packet_buffer[1][0], MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_h264, sizeof(cherryusb_h264));
222222
while (iso_tx_busy) {
223223
if (tx_flag == 0) {
224224
break;

‎demo/video_static_mjpeg_template.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void video_init(uint8_t busid, uintptr_t reg_base)
206206
usbd_initialize(busid, reg_base, usbd_event_handler);
207207
}
208208

209-
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t packet_buffer[MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE];
209+
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t packet_buffer[2][MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE];
210210

211211
void video_test(uint8_t busid)
212212
{
@@ -215,7 +215,7 @@ void video_test(uint8_t busid)
215215
while (1) {
216216
if (tx_flag) {
217217
iso_tx_busy = true;
218-
usbd_video_stream_start_write(busid, VIDEO_IN_EP, packet_buffer, MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_mjpeg, sizeof(cherryusb_mjpeg));
218+
usbd_video_stream_start_write(busid, VIDEO_IN_EP, &packet_buffer[0][0], &packet_buffer[1][0], MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_mjpeg, sizeof(cherryusb_mjpeg));
219219
while (iso_tx_busy) {
220220
if (tx_flag == 0) {
221221
break;

‎demo/video_static_yuyv_template.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void video_init(uint8_t busid, uintptr_t reg_base)
208208
usbd_initialize(busid, reg_base, usbd_event_handler);
209209
}
210210

211-
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t packet_buffer[MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE];
211+
USB_NOCACHE_RAM_SECTION USB_MEM_ALIGNX uint8_t packet_buffer[2][MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE];
212212

213213
void video_test(uint8_t busid)
214214
{
@@ -217,7 +217,7 @@ void video_test(uint8_t busid)
217217
while (1) {
218218
if (tx_flag) {
219219
iso_tx_busy = true;
220-
usbd_video_stream_start_write(busid, VIDEO_IN_EP, packet_buffer, MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_yuyv, sizeof(cherryusb_yuyv));
220+
usbd_video_stream_start_write(busid, VIDEO_IN_EP, &packet_buffer[0][0], &packet_buffer[1][0], MAX_PACKETS_IN_ONE_TRANSFER * MAX_PAYLOAD_SIZE, (uint8_t *)cherryusb_yuyv, sizeof(cherryusb_yuyv));
221221
while (iso_tx_busy) {
222222
if (tx_flag == 0) {
223223
break;

0 commit comments

Comments
 (0)