From d90cb1cff7c874f0a82b034870eeee027077aed7 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Sun, 10 Jan 2021 17:25:05 +0300
Subject: [PATCH] fixed alloc_size

---
 src/ustreamer/h264/encoder.c | 8 ++++----
 src/ustreamer/stream.c       | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ustreamer/h264/encoder.c b/src/ustreamer/h264/encoder.c
index afba9d7..90ca7cc 100644
--- a/src/ustreamer/h264/encoder.c
+++ b/src/ustreamer/h264/encoder.c
@@ -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) {
-	LOG_INFO("H264: Configuring MMAL encoder ...");
+	LOG_INFO("H264: Configuring MMAL encoder: zero_copy=%d ...", zero_copy);
 
 	_h264_encoder_cleanup(enc);
 
@@ -224,7 +224,7 @@ int h264_encoder_prepare(h264_encoder_s *enc, const frame_s *frame, bool zero_co
 
 	error:
 		_h264_encoder_cleanup(enc);
-		LOG_ERROR("H264: Encoder disabled due error");
+		LOG_ERROR("H264: Encoder disabled due error (prepare)");
 		return -1;
 
 #	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) {
 		_h264_encoder_cleanup(enc);
-		LOG_ERROR("H264: Encoder disabled due error");
+		LOG_ERROR("H264: Encoder disabled due error (compress)");
 		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 (enc->zero_copy && src_vcsm_handle > 0) {
 				in->data = (uint8_t *)vcsm_vc_hdl_from_hdl(src_vcsm_handle);
-				in->alloc_size = src->used;
 			} else {
 				in->data = src->data;
 			}
+			in->alloc_size = src->used;
 			in->length = src->used;
 			in->offset = 0;
 			in->flags = MMAL_BUFFER_HEADER_FLAG_EOS;
diff --git a/src/ustreamer/stream.c b/src/ustreamer/stream.c
index f0bffec..a03ee55 100644
--- a/src/ustreamer/stream.c
+++ b/src/ustreamer/stream.c
@@ -384,6 +384,7 @@ static void _h264_stream_process(h264_stream_s *h264, const frame_s *frame, int
 	bool zero_copy = false;
 
 	if (is_jpeg(frame->format)) {
+		assert(vcsm_handle <= 0);
 		LOG_DEBUG("H264: Input frame is JPEG; decoding ...");
 		if (unjpeg(frame, h264->tmp_src, true) < 0) {
 			return;