X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=70098ca189c5267b3aeea8bfdb9de8ea19f051ff;hp=47c603f2f72feedc8429243dd4c7dd06f9783ab0;hb=cdb8b00f2f7ecf0b4910a40e1d90a87540d2891d;hpb=8e67d840c5a93f77de021102a4f0bfc4e07504f4

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 47c603f2..70098ca1 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -374,7 +374,21 @@ int FFStream::decode_activate()
 		}
 		while( ret >= 0 && st != 0 && !reading ) {
 			AVCodecID codec_id = st->codecpar->codec_id;
-			AVCodec *decoder = avcodec_find_decoder(codec_id);
+			AVCodec *decoder = 0;
+			if( is_video() ) {
+				if( ffmpeg->opt_video_decoder )
+					decoder = avcodec_find_decoder_by_name(ffmpeg->opt_video_decoder);
+				else
+					ffmpeg->video_codec_remaps.update(codec_id, decoder);
+			}
+			else if( is_audio() ) {
+				if( ffmpeg->opt_audio_decoder )
+					decoder = avcodec_find_decoder_by_name(ffmpeg->opt_audio_decoder);
+				else
+					ffmpeg->audio_codec_remaps.update(codec_id, decoder);
+			}
+			if( !decoder )
+				decoder = avcodec_find_decoder(codec_id);
 			avctx = avcodec_alloc_context3(decoder);
 			if( !avctx ) {
 				eprintf(_("cant allocate codec context\n"));
@@ -1238,6 +1252,26 @@ int FFVideoStream::encode_frame(AVFrame *frame)
 		frame->interlaced_frame = interlaced;
 		frame->top_field_first = top_field_first;
 	}
+	if( frame && frame->format == AV_PIX_FMT_VAAPI ) { // ugly
+		int ret = avcodec_send_frame(avctx, frame);
+		for( int retry=MAX_RETRY; !ret && --retry>=0; ) {
+			FFPacket pkt;  av_init_packet(pkt);
+			pkt->data = NULL;  pkt->size = 0;
+			if( (ret=avcodec_receive_packet(avctx, pkt)) < 0 ) {
+				if( ret == AVERROR(EAGAIN) ) ret = 0; // weird
+				break;
+			}
+			ret = write_packet(pkt);
+			pkt->stream_index = 0;
+			av_packet_unref(pkt);
+		}
+		if( ret < 0 ) {
+			ff_err(ret, "FFStream::encode_frame: vaapi encode failed.\nfile: %s\n",
+				ffmpeg->fmt_ctx->url);
+			return -1;
+		}
+		return 0;
+	}
 	return FFStream::encode_frame(frame);
 }
 
@@ -1547,6 +1581,8 @@ FFMPEG::FFMPEG(FileBase *file_base)
 	opt_video_filter = 0;
 	opt_audio_filter = 0;
 	opt_hw_dev = 0;
+	opt_video_decoder = 0;
+	opt_audio_decoder = 0;
 	fflags = 0;
 	char option_path[BCTEXTLEN];
 	set_option_path(option_path, "%s", "ffmpeg.opts");
@@ -1992,6 +2028,45 @@ int FFMPEG::scan_options(const char *options, AVDictionary *&opts, AVStream *st)
 	return ret;
 }
 
+FFCodecRemap::FFCodecRemap()
+{
+	old_codec = 0;
+	new_codec = 0;
+}
+FFCodecRemap::~FFCodecRemap()
+{
+	delete [] old_codec;
+	delete [] new_codec;
+}
+
+int FFCodecRemaps::add(const char *val)
+{
+	char old_codec[BCSTRLEN], new_codec[BCSTRLEN];
+	if( sscanf(val, " %63[a-zA-z0-9_-] = %63[a-z0-9_-]",
+		&old_codec[0], &new_codec[0]) != 2 ) return 1;
+	FFCodecRemap &remap = append();
+	remap.old_codec = cstrdup(old_codec);
+	remap.new_codec = cstrdup(new_codec);
+	return 0;
+}
+
+
+int FFCodecRemaps::update(AVCodecID &codec_id, AVCodec *&decoder)
+{
+	AVCodec *codec = avcodec_find_decoder(codec_id);
+	if( !codec ) return -1;
+	const char *name = codec->name;
+	FFCodecRemaps &map = *this;
+	int k = map.size();
+	while( --k >= 0 && strcmp(map[k].old_codec, name) );
+	if( k < 0 ) return 1;
+	const char *new_codec = map[k].new_codec;
+	codec = avcodec_find_decoder_by_name(new_codec);
+	if( !codec ) return -1;
+	decoder = codec;
+	return 0;
+}
+
 int FFMPEG::read_options(FILE *fp, const char *options, AVDictionary *&opts)
 {
 	int ret = 0, no = 0;
@@ -2008,6 +2083,14 @@ int FFMPEG::read_options(FILE *fp, const char *options, AVDictionary *&opts)
 		if( !ret ) {
 			if( !strcmp(key, "duration") )
 				opt_duration = strtod(val, 0);
+			else if( !strcmp(key, "video_decoder") )
+				opt_video_decoder = cstrdup(val);
+			else if( !strcmp(key, "audio_decoder") )
+				opt_audio_decoder = cstrdup(val);
+			else if( !strcmp(key, "remap_video_decoder") )
+				video_codec_remaps.add(val);
+			else if( !strcmp(key, "remap_audio_decoder") )
+				audio_codec_remaps.add(val);
 			else if( !strcmp(key, "video_filter") )
 				opt_video_filter = cstrdup(val);
 			else if( !strcmp(key, "audio_filter") )