forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-10 17:43:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed alloc_size

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-10 17:25:05 +03:00
parent 94dab648bc
commit d90cb1cff7
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ustreamer/h264/encoder.c
View File

@@ -96,7 +96,7 @@ bool h264_encoder_is_prepared_for(h264_encoder_s *enc, const frame_s *frame, boo
} }
int h264_encoder_prepare(h264_encoder_s *enc, const frame_s *frame, bool zero_copy) { int h264_encoder_prepare(h264_encoder_s *enc, const frame_s *frame, bool zero_copy) {
LOG_INFO("H264: Configuring MMAL encoder ..."); LOG_INFO("H264: Configuring MMAL encoder: zero_copy=%d ...", zero_copy);
_h264_encoder_cleanup(enc); _h264_encoder_cleanup(enc);
@@ -224,7 +224,7 @@ int h264_encoder_prepare(h264_encoder_s *enc, const frame_s *frame, bool zero_co
error: error:
_h264_encoder_cleanup(enc); _h264_encoder_cleanup(enc);
LOG_ERROR("H264: Encoder disabled due error"); LOG_ERROR("H264: Encoder disabled due error (prepare)");
return -1; return -1;
# undef ENABLE_PORT # undef ENABLE_PORT
@@ -273,7 +273,7 @@ int h264_encoder_compress(h264_encoder_s *enc, const frame_s *src, int src_vcsm_
if (_h264_encoder_compress_raw(enc, src, src_vcsm_handle, dest, force_key) < 0) { if (_h264_encoder_compress_raw(enc, src, src_vcsm_handle, dest, force_key) < 0) {
_h264_encoder_cleanup(enc); _h264_encoder_cleanup(enc);
LOG_ERROR("H264: Encoder disabled due error"); LOG_ERROR("H264: Encoder disabled due error (compress)");
return -1; return -1;
} }
@@ -321,10 +321,10 @@ static int _h264_encoder_compress_raw(h264_encoder_s *enc, const frame_s *src, i
if (!sent && mmal_wrapper_buffer_get_empty(enc->input_port, &in, 0) == MMAL_SUCCESS) { if (!sent && mmal_wrapper_buffer_get_empty(enc->input_port, &in, 0) == MMAL_SUCCESS) {
if (enc->zero_copy && src_vcsm_handle > 0) { if (enc->zero_copy && src_vcsm_handle > 0) {
in->data = (uint8_t *)vcsm_vc_hdl_from_hdl(src_vcsm_handle); in->data = (uint8_t *)vcsm_vc_hdl_from_hdl(src_vcsm_handle);
in->alloc_size = src->used;
} else { } else {
in->data = src->data; in->data = src->data;
} }
in->alloc_size = src->used;
in->length = src->used; in->length = src->used;
in->offset = 0; in->offset = 0;
in->flags = MMAL_BUFFER_HEADER_FLAG_EOS; in->flags = MMAL_BUFFER_HEADER_FLAG_EOS;

1
src/ustreamer/stream.c
View File

@@ -384,6 +384,7 @@ static void _h264_stream_process(h264_stream_s *h264, const frame_s *frame, int
bool zero_copy = false; bool zero_copy = false;
if (is_jpeg(frame->format)) { if (is_jpeg(frame->format)) {
assert(vcsm_handle <= 0);
LOG_DEBUG("H264: Input frame is JPEG; decoding ..."); LOG_DEBUG("H264: Input frame is JPEG; decoding ...");
if (unjpeg(frame, h264->tmp_src, true) < 0) { if (unjpeg(frame, h264->tmp_src, true) < 0) {
return; return;