X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=a18ae88cae0e356847edad989b3935752b008b79;hb=fe342c90022bff98669b5cc96817cafe98c4e768;hp=ac85cccde78fd3e12d881517040888835ea56734;hpb=c6f91f271145ad9cd637f6b8f1560146178d3d41;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index ac85cccd..a18ae88c 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -33,6 +33,12 @@
 #include "mwindow.h"
 #include "vframe.h"
 
+#ifdef FFMPEG3
+#define url filename
+#else
+#define av_register_all(s)
+#define avfilter_register_all(s)
+#endif
 
 #define VIDEO_INBUF_SIZE 0x10000
 #define AUDIO_INBUF_SIZE 0x10000
@@ -1108,6 +1114,7 @@ int FFVideoConvert::convert_picture_vframe(VFrame *frame, AVFrame *ip, AVFrame *
 	case BC_YUV422P:
 		usz /= 2;
 	case BC_YUV444P:
+	case BC_GBRP:
 		// override av_image_fill_arrays() for planar types
 		ipic->data[0] = frame->get_y();  ipic->linesize[0] = ysz;
 		ipic->data[1] = frame->get_u();  ipic->linesize[1] = usz;
@@ -1208,6 +1215,7 @@ int FFVideoConvert::convert_vframe_picture(VFrame *frame, AVFrame *op, AVFrame *
 	case BC_YUV422P:
 		usz /= 2;
 	case BC_YUV444P:
+	case BC_GBRP:
 		// override av_image_fill_arrays() for planar types
 		opic->data[0] = frame->get_y();  opic->linesize[0] = ysz;
 		opic->data[1] = frame->get_u();  opic->linesize[1] = usz;
@@ -1615,7 +1623,7 @@ void FFMPEG::scan_video_options(Asset *asset, EDL *edl)
 		AVCodec *av_codec = !get_codec(video_codec, "video", asset->vcodec) ?
 			avcodec_find_encoder_by_name(video_codec) : 0;
 		if( av_codec && av_codec->pix_fmts ) {
-			if( edl ) {
+			if( 0 && edl ) { // frequently picks a bad answer
 				int color_model = edl->session->color_model;
 				int max_bits = BC_CModels::calculate_pixelsize(color_model) * 8;
 				max_bits /= BC_CModels::components(color_model);
@@ -1925,6 +1933,7 @@ int FFMPEG::info(char *text, int len)
 int FFMPEG::init_decoder(const char *filename)
 {
 	ff_lock("FFMPEG::init_decoder");
+	av_register_all();
 	char file_opts[BCTEXTLEN];
 	char *bp = strrchr(strcpy(file_opts, filename), '/');
 	char *sp = strrchr(!bp ? file_opts : bp, '.');
@@ -2070,6 +2079,7 @@ int FFMPEG::init_encoder(const char *filename)
 		return 1;
 	}
 	ff_lock("FFMPEG::init_encoder");
+	av_register_all();
 	char format[BCSTRLEN];
 	if( get_format(format, "format", file_format) )
 		strcpy(format, file_format);
@@ -2103,7 +2113,9 @@ int FFMPEG::open_encoder(const char *type, const char *spec)
 		return 1;
 	}
 
+#ifdef HAVE_DV
 	if( !strcmp(codec_name, CODEC_TAG_DVSD) ) strcpy(codec_name, "dv");
+#endif
 	else if( !strcmp(codec_name, CODEC_TAG_MJPEG) ) strcpy(codec_name, "mjpeg");
 	else if( !strcmp(codec_name, CODEC_TAG_JPEG) ) strcpy(codec_name, "jpeg");
 
@@ -2856,6 +2868,7 @@ int FFMPEG::ff_cpus()
 
 int FFVideoStream::create_filter(const char *filter_spec, AVCodecParameters *avpar)
 {
+	avfilter_register_all();
 	const char *sp = filter_spec;
 	char filter_name[BCSTRLEN], *np = filter_name;
 	int i = sizeof(filter_name);
@@ -2896,6 +2909,7 @@ int FFVideoStream::create_filter(const char *filter_spec, AVCodecParameters *avp
 
 int FFAudioStream::create_filter(const char *filter_spec, AVCodecParameters *avpar)
 {
+	avfilter_register_all();
 	const char *sp = filter_spec;
 	char filter_name[BCSTRLEN], *np = filter_name;
 	int i = sizeof(filter_name);
@@ -2980,6 +2994,7 @@ int FFMPEG::scan(IndexState *index_state, int64_t *scan_position, int *canceled)
 	if( !frame ) {
 		fprintf(stderr,"FFMPEG::scan: ");
 		fprintf(stderr,_("av_frame_alloc failed\n"));
+		fprintf(stderr,"FFMPEG::scan:file=%s\n", file_base->asset->path);
 		return -1;
 	}
 
@@ -3025,6 +3040,7 @@ int FFMPEG::scan(IndexState *index_state, int64_t *scan_position, int *canceled)
 		}
 		fprintf(stderr,"FFMPEG::scan: ");
 		fprintf(stderr,_("codec open failed\n"));
+		fprintf(stderr,"FFMPEG::scan:file=%s\n", file_base->asset->path);
 		avcodec_free_context(&avctx);
 	}