X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmjpeg_encoder.cpp;h=07e302c4e93148c2b9a83edfc1034e5465f1e8bc;hb=4b58e3f824545472eb1ccf1e18d042b3b1b9be04;hp=3f98cd0662a5e5be7eaec3240b6f267b3e8635e5;hpb=b626186bffe85f4eeb135861bd02b752aa9001da;p=nageru

diff --git a/nageru/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp
index 3f98cd0..07e302c 100644
--- a/nageru/mjpeg_encoder.cpp
+++ b/nageru/mjpeg_encoder.cpp
@@ -318,7 +318,7 @@ void MJPEGEncoder::encoder_thread_func()
 		} else {
 			// Encode synchronously, in the same thread.
 			vector<uint8_t> jpeg = encode_jpeg_libjpeg(qf);
-			write_mjpeg_packet(qf.pts, qf.card_index, jpeg);
+			write_mjpeg_packet(qf.pts, qf.card_index, jpeg.data(), jpeg.size());
 		}
 	}
 
@@ -328,13 +328,13 @@ void MJPEGEncoder::encoder_thread_func()
 	free(tmp_cr);
 }
 
-void MJPEGEncoder::write_mjpeg_packet(int64_t pts, unsigned card_index, const vector<uint8_t> &jpeg)
+void MJPEGEncoder::write_mjpeg_packet(int64_t pts, unsigned card_index, const uint8_t *jpeg, size_t jpeg_size)
 {
 	AVPacket pkt;
 	memset(&pkt, 0, sizeof(pkt));
 	pkt.buf = nullptr;
-	pkt.data = const_cast<uint8_t *>(&jpeg[0]);
-	pkt.size = jpeg.size();
+	pkt.data = const_cast<uint8_t *>(jpeg);
+	pkt.size = jpeg_size;
 	pkt.stream_index = card_index;
 	pkt.flags = AV_PKT_FLAG_KEY;
 	AVRational time_base = avctx->streams[pkt.stream_index]->time_base;
@@ -708,13 +708,11 @@ void MJPEGEncoder::va_receiver_thread_func()
 		va_status = vaMapBuffer(va_dpy->va_dpy, qf.resources.data_buffer, (void **)&segment);
 		CHECK_VASTATUS(va_status, "vaMapBuffer");
 
-		const char *coded_buf = reinterpret_cast<char *>(segment->buf);
-		vector<uint8_t> jpeg(coded_buf, coded_buf + segment->size);
+		const uint8_t *coded_buf = reinterpret_cast<uint8_t *>(segment->buf);
+		write_mjpeg_packet(qf.pts, qf.card_index, coded_buf, segment->size);
 
 		va_status = vaUnmapBuffer(va_dpy->va_dpy, qf.resources.data_buffer);
 		CHECK_VASTATUS(va_status, "vaUnmapBuffer");
-
-		write_mjpeg_packet(qf.pts, qf.card_index, jpeg);
 	}
 }