diff --git a/http/http_h264.c b/http/http_h264.c index 8bc12de..2b5911c 100644 --- a/http/http_h264.c +++ b/http/http_h264.c @@ -50,7 +50,7 @@ void http_video(http_worker_t *worker, FILE *stream) goto error; } } else if (!requested_key_frame) { - device_force_key(buf->buf_list->device); + device_video_force_key(buf->buf_list->device); requested_key_frame = true; } buffer_consumed(buf); diff --git a/http/http_methods.c b/http/http_methods.c index e151409..dc207cc 100644 --- a/http/http_methods.c +++ b/http/http_methods.c @@ -2,8 +2,6 @@ #include #include "http/http.h" -#include "hw/buffer.h" -#include "hw/buffer_lock.h" void http_index(http_worker_t *worker, FILE *stream) { diff --git a/hw/device.c b/hw/device.c index 99e4421..69ce5bf 100644 --- a/hw/device.c +++ b/hw/device.c @@ -152,7 +152,7 @@ error: return -1; } -int device_force_key(device_t *dev) +int device_video_force_key(device_t *dev) { struct v4l2_control ctl = {0}; ctl.id = V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME; diff --git a/hw/device.h b/hw/device.h index fbb6e01..a86191c 100644 --- a/hw/device.h +++ b/hw/device.h @@ -22,7 +22,7 @@ int device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsi int device_consume_event(device_t *device); int device_stream(device_t *dev, bool do_on); -int device_force_key(device_t *dev); +int device_video_force_key(device_t *dev); int device_set_option(device_t *dev, const char *name, uint32_t id, int32_t value); int device_set_fps(device_t *dev, int desired_fps);