Fix potential crash when playing video without audio stream and rando…

…m error messages.
EIRTeam · Nov 11, 2024 · ed018fb · ed018fb
1 parent d08a36b
commit ed018fb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/ffmpeg_frame.h b/ffmpeg_frame.h
@@ -50,6 +50,8 @@ extern "C" {
 }
 
 class FFmpegFrame : public RefCounted {
+	GDCLASS(FFmpegFrame, RefCounted);
+
 protected:
 	static void _bind_methods();
 

diff --git a/ffmpeg_video_stream.cpp b/ffmpeg_video_stream.cpp
@@ -602,7 +602,12 @@ void YUVGPUConverter::convert() {
 
 	ComputeListID compute_list = rd->compute_list_begin();
 	rd->compute_list_bind_compute_pipeline(compute_list, pipeline);
+
+#ifdef GDEXTENSION
+	rd->compute_list_set_push_constant(compute_list, push_constant_data, push_constant_data.size());
+#else
 	rd->compute_list_set_push_constant(compute_list, push_constant_data.ptr(), push_constant_data.size());
+#endif
 	rd->compute_list_bind_uniform_set(compute_list, yuv_planes_uniform_sets[0], 0);
 	rd->compute_list_bind_uniform_set(compute_list, yuv_planes_uniform_sets[1], 1);
 	rd->compute_list_bind_uniform_set(compute_list, yuv_planes_uniform_sets[2], 2);

diff --git a/register_types.cpp b/register_types.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "register_types.h"
+#include "godot_cpp/core/class_db.hpp"
 
 #ifdef GDEXTENSION
 #include "gdextension_build/gdex_print.h"
@@ -77,6 +78,7 @@ void initialize_ffmpeg_module(ModuleInitializationLevel p_level) {
 	GDREGISTER_ABSTRACT_CLASS(FFmpegVideoStreamPlayback);
 	GDREGISTER_ABSTRACT_CLASS(VideoStreamFFMpegLoader);
 	GDREGISTER_CLASS(FFmpegVideoStream);
+	GDREGISTER_INTERNAL_CLASS(FFmpegFrame);
 	ffmpeg_loader.instantiate();
 #ifdef GDEXTENSION
 	ResourceLoader::get_singleton()->add_resource_format_loader(ffmpeg_loader);

diff --git a/video_decoder.cpp b/video_decoder.cpp
@@ -307,7 +307,7 @@ void VideoDecoder::_decode_next_frame(AVPacket *p_packet, AVFrame *p_receive_fra
 
 		bool unref_packet = true;
 
-		if (p_packet->stream_index == video_stream->index || p_packet->stream_index == audio_stream->index) {
+		if ((video_stream && p_packet->stream_index == video_stream->index) || (audio_stream && p_packet->stream_index == audio_stream->index)) {
 			AVCodecContext *codec_ctx = video_codec_context;
 			if (has_audio && p_packet->stream_index == audio_stream->index) {
 				codec_ctx = audio_codec_context;
@@ -516,7 +516,6 @@ void VideoDecoder::_scaler_frame_return(Ref<FFmpegFrame> p_scaler_frame) {
 Ref<FFmpegFrame> VideoDecoder::_ensure_frame_pixel_format(Ref<FFmpegFrame> p_frame, AVPixelFormat p_target_pixel_format) {
 	ZoneScopedN("Video decoder rescale");
 
-	print_line(p_frame->get_frame()->format);
 	if (p_frame->get_frame()->format == p_target_pixel_format) {
 		return p_frame;
 	}