Display and control your Android device
Do not select the AVCodec from the demuxer
Romain Vimont077bb8cf9a5c
diff --git a/app/src/decoder.c b/app/src/decoder.cindex a8dfc569..83abde95 100644--- a/app/src/decoder.c+++ b/app/src/decoder.c@@ -12,11 +12,17 @@#define DOWNCAST(SINK) container_of(SINK, struct sc_decoder, packet_sink)static bool-sc_decoder_open(struct sc_decoder *decoder, const AVCodec *codec,- const AVCodecParameters *params,+sc_decoder_open(struct sc_decoder *decoder, const AVCodecParameters *params,const struct sc_stream_session *session) {// A video stream must have a session- assert(session || codec->type != AVMEDIA_TYPE_VIDEO);+ assert(session || params->codec_type != AVMEDIA_TYPE_VIDEO);++ const AVCodec *codec = avcodec_find_decoder(params->codec_id);+ if (!codec) {+ LOGE("Decoder '%s': no decoder for %s", decoder->name,+ avcodec_get_name(params->codec_id));+ return false;+ }decoder->ctx = avcodec_alloc_context3(codec);if (!decoder->ctx) {@@ -329,11 +335,11 @@ sc_decoder_push_session(struct sc_decoder *decoder,}static bool-sc_decoder_packet_sink_open(struct sc_packet_sink *sink, const AVCodec *codec,+sc_decoder_packet_sink_open(struct sc_packet_sink *sink,const AVCodecParameters *params,const struct sc_stream_session *session) {struct sc_decoder *decoder = DOWNCAST(sink);- return sc_decoder_open(decoder, codec, params, session);+ return sc_decoder_open(decoder, params, session);}static voiddiff --git a/app/src/demuxer.c b/app/src/demuxer.cindex bb4ce77d..69e0a771 100644--- a/app/src/demuxer.c+++ b/app/src/demuxer.c@@ -219,13 +219,7 @@ run_demuxer(void *data) {goto end;}- const AVCodec *codec = avcodec_find_decoder(codec_id);- if (!codec) {- LOGE("Demuxer '%s': stream disabled due to missing decoder",- demuxer->name);- sc_packet_source_sinks_disable(&demuxer->packet_source);- goto end;- }+ enum AVMediaType codec_type = avcodec_get_type(codec_id);AVCodecParameters *params = avcodec_parameters_alloc();if (!params) {@@ -233,14 +227,14 @@ run_demuxer(void *data) {goto end;}- params->codec_type = codec->type;- params->codec_id = codec->id;+ params->codec_type = codec_type;+ params->codec_id = codec_id;uint8_t header[SC_PACKET_HEADER_SIZE];struct sc_stream_session session_data;struct sc_stream_session *session = NULL;- if (codec->type == AVMEDIA_TYPE_VIDEO) {+ if (codec_type == AVMEDIA_TYPE_VIDEO) {bool ok = sc_demuxer_recv_header(demuxer, header);if (!ok) {goto finally_free_params;@@ -275,7 +269,7 @@ run_demuxer(void *data) {}}- if (!sc_packet_source_sinks_open(&demuxer->packet_source, codec, params,+ if (!sc_packet_source_sinks_open(&demuxer->packet_source, params,session)) {goto finally_free_params;}diff --git a/app/src/recorder.c b/app/src/recorder.cindex 357224af..1d819ee0 100644--- a/app/src/recorder.c+++ b/app/src/recorder.c@@ -534,7 +534,6 @@ sc_recorder_set_orientation(AVStream *stream, enum sc_orientation orientation) {static boolsc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,- const AVCodec *codec,const AVCodecParameters *params,const struct sc_stream_session *session) {(void) session;@@ -549,7 +548,7 @@ sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,return false;}- AVStream *stream = avformat_new_stream(recorder->ctx, codec);+ AVStream *stream = avformat_new_stream(recorder->ctx, NULL);if (!stream) {sc_mutex_unlock(&recorder->mutex);return false;@@ -573,9 +572,11 @@ sc_recorder_video_packet_sink_open(struct sc_packet_sink *sink,sc_orientation_get_name(recorder->orientation));}+ enum AVCodecID codec_id = params->codec_id;+// A config packet is provided for all supported formats except VPx- recorder->video_expects_config_packet = codec->id != AV_CODEC_ID_VP8- && codec->id != AV_CODEC_ID_VP9;+ recorder->video_expects_config_packet = codec_id != AV_CODEC_ID_VP8+ && codec_id != AV_CODEC_ID_VP9;recorder->video_init = true;sc_cond_signal(&recorder->cond);@@ -636,7 +637,6 @@ sc_recorder_video_packet_sink_push(struct sc_packet_sink *sink,static boolsc_recorder_audio_packet_sink_open(struct sc_packet_sink *sink,- const AVCodec *codec,const AVCodecParameters *params,const struct sc_stream_session *session) {(void) session;@@ -648,7 +648,7 @@ sc_recorder_audio_packet_sink_open(struct sc_packet_sink *sink,sc_mutex_lock(&recorder->mutex);- AVStream *stream = avformat_new_stream(recorder->ctx, codec);+ AVStream *stream = avformat_new_stream(recorder->ctx, NULL);if (!stream) {sc_mutex_unlock(&recorder->mutex);return false;@@ -664,7 +664,7 @@ sc_recorder_audio_packet_sink_open(struct sc_packet_sink *sink,// A config packet is provided for all supported formats except raw audiorecorder->audio_expects_config_packet =- codec->id != AV_CODEC_ID_PCM_S16LE;+ params->codec_id != AV_CODEC_ID_PCM_S16LE;recorder->audio_init = true;sc_cond_signal(&recorder->cond);diff --git a/app/src/trait/packet_sink.h b/app/src/trait/packet_sink.hindex 3755f5b8..87d46013 100644--- a/app/src/trait/packet_sink.h+++ b/app/src/trait/packet_sink.h@@ -29,8 +29,7 @@ struct sc_stream_session {struct sc_packet_sink_ops {bool- (*open)(struct sc_packet_sink *sink, const AVCodec *codec,- const AVCodecParameters *params,+ (*open)(struct sc_packet_sink *sink, const AVCodecParameters *params,const struct sc_stream_session *session);voiddiff --git a/app/src/trait/packet_source.c b/app/src/trait/packet_source.cindex 25682421..9184ca4c 100644--- a/app/src/trait/packet_source.c+++ b/app/src/trait/packet_source.c@@ -27,13 +27,12 @@ sc_packet_source_sinks_close_firsts(struct sc_packet_source *source,boolsc_packet_source_sinks_open(struct sc_packet_source *source,- const AVCodec *codec,const AVCodecParameters *params,const struct sc_stream_session *session) {assert(source->sink_count);for (unsigned i = 0; i < source->sink_count; ++i) {struct sc_packet_sink *sink = source->sinks[i];- if (!sink->ops->open(sink, codec, params, session)) {+ if (!sink->ops->open(sink, params, session)) {sc_packet_source_sinks_close_firsts(source, i);return false;}diff --git a/app/src/trait/packet_source.h b/app/src/trait/packet_source.hindex a206b185..d5d1dc7b 100644--- a/app/src/trait/packet_source.h+++ b/app/src/trait/packet_source.h@@ -28,7 +28,6 @@ sc_packet_source_add_sink(struct sc_packet_source *source,boolsc_packet_source_sinks_open(struct sc_packet_source *source,- const AVCodec *codec,const AVCodecParameters *params,const struct sc_stream_session *session);