Skip to content

Display and control your Android device

Allocate AVPacket for v4l2_sink

Romain Vimontcd2894570d22
diff --git a/app/src/v4l2_sink.c b/app/src/v4l2_sink.c
index d7c1a667..bd184b4d 100644
--- a/app/src/v4l2_sink.c
+++ b/app/src/v4l2_sink.c
@@ -86,7 +86,7 @@ encode_and_write_frame(struct sc_v4l2_sink *vs, const AVFrame *frame) {
return false;
}
- AVPacket *packet = &vs->packet;
+ AVPacket *packet = vs->packet;
ret = avcodec_receive_packet(vs->encoder_ctx, packet);
if (ret == 0) {
// A packet was received
@@ -235,11 +235,17 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {
goto error_avcodec_close;
}
+ vs->packet = av_packet_alloc();
+ if (!vs->packet) {
+ LOGE("Could not allocate packet");
+ goto error_av_frame_free;
+ }
+
LOGD("Starting v4l2 thread");
ok = sc_thread_create(&vs->thread, run_v4l2_sink, "v4l2", vs);
if (!ok) {
LOGC("Could not start v4l2 thread");
- goto error_av_frame_free;
+ goto error_av_packet_free;
}
vs->header_written = false;
@@ -249,6 +255,8 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {
return true;
+error_av_packet_free:
+ av_packet_free(&vs->packet);
error_av_frame_free:
av_frame_free(&vs->frame);
error_avcodec_close:
@@ -278,6 +286,7 @@ sc_v4l2_sink_close(struct sc_v4l2_sink *vs) {
sc_thread_join(&vs->thread, NULL);
+ av_packet_free(&vs->packet);
av_frame_free(&vs->frame);
avcodec_close(vs->encoder_ctx);
avcodec_free_context(&vs->encoder_ctx);
diff --git a/app/src/v4l2_sink.h b/app/src/v4l2_sink.h
index 9d2ee149..81bcdd1e 100644
--- a/app/src/v4l2_sink.h
+++ b/app/src/v4l2_sink.h
@@ -26,7 +26,7 @@ struct sc_v4l2_sink {
bool header_written;
AVFrame *frame;
- AVPacket packet;
+ AVPacket *packet;
};
bool