Skip to content

Commit f106d30

Browse files
committed
chore: use log_error in native library
1 parent b042ada commit f106d30

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

internal/native/cgo/edid.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ int get_edid(uint8_t *edid, size_t max_size)
3636
fd = open(V4L_SUBDEV, O_RDWR);
3737
if (fd < 0)
3838
{
39-
perror("Failed to open device");
39+
log_error("Failed to open device");
4040
return -1;
4141
}
4242

@@ -48,7 +48,7 @@ int get_edid(uint8_t *edid, size_t max_size)
4848

4949
if (ioctl(fd, VIDIOC_G_EDID, &v4l2_edid) < 0)
5050
{
51-
perror("Failed to get EDID");
51+
log_error("Failed to get EDID");
5252
close(fd);
5353
return -1;
5454
}
@@ -90,7 +90,7 @@ int set_edid(uint8_t *edid, size_t size)
9090
fd = open(V4L_SUBDEV, O_RDWR);
9191
if (fd < 0)
9292
{
93-
perror("Failed to open device");
93+
log_error("Failed to open device");
9494
return -1;
9595
}
9696

@@ -104,7 +104,7 @@ int set_edid(uint8_t *edid, size_t size)
104104

105105
if (ioctl(fd, VIDIOC_S_EDID, &v4l2_edid) < 0)
106106
{
107-
perror("Failed to set EDID");
107+
log_error("Failed to set EDID");
108108
close(fd);
109109
return -1;
110110
}
@@ -123,13 +123,13 @@ const char *videoc_log_status()
123123
fd = open(V4L_SUBDEV, O_RDWR);
124124
if (fd < 0)
125125
{
126-
perror("Failed to open device");
126+
log_error("Failed to open device");
127127
return NULL;
128128
}
129129

130130
if (ioctl(fd, VIDIOC_LOG_STATUS) == -1)
131131
{
132-
perror("VIDIOC_LOG_STATUS failed");
132+
log_error("VIDIOC_LOG_STATUS failed");
133133
close(fd);
134134
return NULL;
135135
}
@@ -166,7 +166,7 @@ const char *videoc_log_status()
166166
buffer = strdup(p);
167167
if (buffer == NULL)
168168
{
169-
perror("Failed to allocate memory for status");
169+
log_error("Failed to allocate memory for status");
170170
return NULL;
171171
}
172172
return buffer;

internal/native/cgo/video.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,14 @@ static void *venc_read_stream(void *arg)
268268
stFrame.pstPack = malloc(sizeof(VENC_PACK_S));
269269
while (venc_running)
270270
{
271-
// printf("RK_MPI_VENC_GetStream\n");
271+
log_trace("RK_MPI_VENC_GetStream\n");
272272
s32Ret = RK_MPI_VENC_GetStream(VENC_CHANNEL, &stFrame, 200); // blocks max 200ms
273273
if (s32Ret == RK_SUCCESS)
274274
{
275275
RK_U64 nowUs = get_us();
276-
// printf("chn:0, loopCount:%d enc->seq:%d wd:%d pts=%llu delay=%lldus\n",
277-
// loopCount, stFrame.u32Seq, stFrame.pstPack->u32Len,
278-
// stFrame.pstPack->u64PTS, nowUs - stFrame.pstPack->u64PTS);
276+
log_trace("chn:0, loopCount:%d enc->seq:%d wd:%d pts=%llu delay=%lldus\n",
277+
loopCount, stFrame.u32Seq, stFrame.pstPack->u32Len,
278+
stFrame.pstPack->u64PTS, nowUs - stFrame.pstPack->u64PTS);
279279
pData = RK_MPI_MB_Handle2VirAddr(stFrame.pstPack->pMbBlk);
280280
video_send_frame(pData, (ssize_t)stFrame.pstPack->u32Len);
281281
s32Ret = RK_MPI_VENC_ReleaseStream(VENC_CHANNEL, &stFrame);
@@ -348,7 +348,7 @@ void *run_video_stream(void *arg)
348348

349349
if (ioctl(video_dev_fd, VIDIOC_S_FMT, &fmt) < 0)
350350
{
351-
perror("Set format fail");
351+
log_error("Set format fail");
352352
usleep(100000); // Sleep for 100 milliseconds
353353
close(video_dev_fd);
354354
continue;
@@ -363,7 +363,7 @@ void *run_video_stream(void *arg)
363363

364364
if (ioctl(video_dev_fd, VIDIOC_REQBUFS, &req) < 0)
365365
{
366-
perror("VIDIOC_REQBUFS failed");
366+
log_error("VIDIOC_REQBUFS failed");
367367
return errno;
368368
}
369369
log_info("VIDIOC_REQBUFS successful");
@@ -385,7 +385,7 @@ void *run_video_stream(void *arg)
385385

386386
if (-1 == ioctl(video_dev_fd, VIDIOC_QUERYBUF, &buf))
387387
{
388-
perror("VIDIOC_QUERYBUF failed");
388+
log_error("VIDIOC_QUERYBUF failed");
389389
req.count = i;
390390
return errno;
391391
}
@@ -425,15 +425,15 @@ void *run_video_stream(void *arg)
425425
buf.m.planes = &buffers[i].plane_buffer;
426426
if (ioctl(video_dev_fd, VIDIOC_QBUF, &buf) < 0)
427427
{
428-
perror("VIDIOC_QBUF failed");
428+
log_error("VIDIOC_QBUF failed");
429429
return errno;
430430
}
431431
log_info("VIDIOC_QBUF successful for buffer %d\n", i);
432432
}
433433

434434
if (ioctl(video_dev_fd, VIDIOC_STREAMON, &type) < 0)
435435
{
436-
perror("VIDIOC_STREAMON failed");
436+
log_error("VIDIOC_STREAMON failed");
437437
goto cleanup;
438438
}
439439

@@ -486,7 +486,7 @@ void *run_video_stream(void *arg)
486486
log_error("VIDIOC_DQBUF failed");
487487
break;
488488
}
489-
// printf("got frame, bytesused = %d\n", tmp_plane.bytesused);
489+
log_trace("got frame, bytesused = %d\n", tmp_plane.bytesused);
490490
memset(&stFrame, 0, sizeof(VIDEO_FRAME_INFO_S));
491491
MB_BLK blk = RK_NULL;
492492
blk = RK_MPI_MMZ_Fd2Handle(tmp_plane.m.fd);
@@ -509,9 +509,9 @@ void *run_video_stream(void *arg)
509509
// if (pData) {
510510
// size_t frameSize = tmp_plane.bytesused; // Use the actual size reported by the driver
511511
// write_buffer_to_file(pData, frameSize, "/userdata/banana.raw");
512-
// printf("Frame 100 written to /userdata/banana.raw\n");
512+
// log_trace("Frame 100 written to /userdata/banana.raw\n");
513513
// } else {
514-
// printf("Failed to get virtual address for frame 100\n");
514+
// log_trace("Failed to get virtual address for frame 100\n");
515515
// }
516516
// }
517517
retry_send_frame:
@@ -604,7 +604,7 @@ void video_start_streaming()
604604
pthread_mutex_lock(&streaming_mutex);
605605
if (streaming_thread != NULL)
606606
{
607-
log_info("video streaming already started");
607+
log_warn("video streaming already started");
608608
pthread_mutex_unlock(&streaming_mutex);
609609
return;
610610
}

0 commit comments

Comments
 (0)