File opencv-2.3-ffmpeg.patch of Package opencv

Overview Repositories Revisions Requests Users Attributes Meta

File opencv-2.3-ffmpeg.patch of Package opencv (Revision 90d1a2f442a7183b9d17d558e3f4c7fe)

Currently displaying revision 90d1a2f442a7183b9d17d558e3f4c7fe , Show latest

Index: modules/highgui/include/opencv2/highgui/highgui_c.h
===================================================================
--- modules/highgui/include/opencv2/highgui/highgui_c.h.orig
+++ modules/highgui/include/opencv2/highgui/highgui_c.h
@@ -367,8 +367,10 @@ enum
     CV_CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION_ON = CV_CAP_OPENNI_DEPTH_GENERATOR + CV_CAP_PROP_OPENNI_REGISTRATION_ON,
     
     // Properties of cameras available through GStreamer interface
-    CV_CAP_GSTREAMER_QUEUE_LENGTH	= 200, // default is 1
-    CV_CAP_PROP_PVAPI_MULTICASTIP       = 300 // ip for anable multicast master mode. 0 for disable multicast
+    CV_CAP_GSTREAMER_QUEUE_LENGTH   = 200, // default is 1
+    CV_CAP_PROP_PVAPI_MULTICASTIP   = 300, // ip for anable multicast master mode. 0 for disable multicast
+    
+    CV_CAP_PROP_THREADS = 400 
 };
 
 enum
Index: modules/highgui/src/cap_ffmpeg_api.hpp
===================================================================
--- modules/highgui/src/cap_ffmpeg_api.hpp.orig
+++ modules/highgui/src/cap_ffmpeg_api.hpp
@@ -21,7 +21,8 @@ enum
     CV_FFMPEG_CAP_PROP_FRAME_HEIGHT=4,
     CV_FFMPEG_CAP_PROP_FPS=5,
     CV_FFMPEG_CAP_PROP_FOURCC=6,
-    CV_FFMPEG_CAP_PROP_FRAME_COUNT=7
+    CV_FFMPEG_CAP_PROP_FRAME_COUNT=7,
+    CV_FFMPEG_CAP_PROP_THREADS=8
 };
 
 
Index: modules/highgui/src/cap_ffmpeg_impl.hpp
===================================================================
--- modules/highgui/src/cap_ffmpeg_impl.hpp.orig
+++ modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -135,7 +135,7 @@ extern "C" {
 #define PIX_FMT_RGBA32 PIX_FMT_RGB32
 #endif
 
-
+#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c )
 
 char * FOURCC2str( int fourcc )
 {
@@ -365,6 +365,7 @@ struct CvCapture_FFMPEG
    and so the filename is needed to reopen the file on backward seeking.
 */
     char              * filename;
+	int                 count_threads;
 };
 
 
@@ -379,6 +380,7 @@ void CvCapture_FFMPEG::init()
     memset( &frame, 0, sizeof(frame) );
     filename = 0;
     packet.data = NULL;
+	count_threads = 1;
 #if defined(HAVE_FFMPEG_SWSCALE)
     img_convert_ctx = 0;
 #endif
@@ -444,6 +446,9 @@ bool CvCapture_FFMPEG::reopen()
 #else
     AVCodecContext *enc = &ic->streams[video_stream]->codec;
 #endif
+
+    avcodec_thread_init(enc, count_threads);
+
     AVCodec *codec = avcodec_find_decoder(enc->codec_id);
     avcodec_open(enc, codec);
     video_st = ic->streams[video_stream];
@@ -489,7 +494,13 @@ bool CvCapture_FFMPEG::open( const char*
         AVCodecContext *enc = &ic->streams[i]->codec;
 #endif
 
-        if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
+        avcodec_thread_init(enc, count_threads);
+
+        #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 4, 0)
+            #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
+        #endif
+        
+        if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
             AVCodec *codec = avcodec_find_decoder(enc->codec_id);
             if (!codec ||
             avcodec_open(enc, codec) < 0)
@@ -576,14 +587,18 @@ bool CvCapture_FFMPEG::grabFrame()
 		        continue;
     		}
 
-#if LIBAVFORMAT_BUILD > 4628
-        avcodec_decode_video(video_st->codec,
-                             picture, &got_picture,
-                             packet.data, packet.size);
-#else
-        avcodec_decode_video(&video_st->codec,
-                             picture, &got_picture,
-                             packet.data, packet.size);
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
+			avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet); 
+#else
+	#if LIBAVFORMAT_BUILD > 4628
+			avcodec_decode_video(video_st->codec,
+								 picture, &got_picture,
+								 packet.data, packet.size);
+	#else
+			avcodec_decode_video(&video_st->codec,
+								 picture, &got_picture,
+								 packet.data, packet.size);
+	#endif
 #endif
 
         if (got_picture) {
@@ -702,12 +717,14 @@ double CvCapture_FFMPEG::getProperty( in
         return (double)video_st->codec.codec_tag;
 #endif
     break;
+    case CV_CAP_PROP_THREADS:
+		return count_threads;
+	break;
     }
+	
     return 0;
 }
 
-
-
 // this is a VERY slow fallback function, ONLY used if ffmpeg's av_seek_frame delivers no correct result!
 bool CvCapture_FFMPEG::slowSeek( int framenumber )
 {
@@ -787,6 +804,12 @@ bool CvCapture_FFMPEG::setProperty( int
             picture_pts=(int64_t)value;
         }
         break;
+		
+    case CV_CAP_PROP_THREADS:
+	{
+		count_threads = (int)value;
+	} 
+	break;
 
     default:
         return false;
@@ -824,6 +847,38 @@ struct CvVideoWriter_FFMPEG
 
 static const char * icvFFMPEGErrStr(int err)
 {
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
+    switch(err) {
+ 		case AVERROR_BSF_NOT_FOUND:
+ 			return "Bitstream filter not found";
+ 		case AVERROR_DECODER_NOT_FOUND:
+ 			return "Decoder not found";
+ 		case AVERROR_DEMUXER_NOT_FOUND:
+ 			return "Demuxer not found";
+ 		case AVERROR_ENCODER_NOT_FOUND:
+ 			return "Encoder not found";
+ 		case AVERROR_EOF:
+ 			return "End of file";
+ 		case AVERROR_EXIT:
+ 			return "Immediate exit was requested; the called function should not be restarted";
+ 		case AVERROR_FILTER_NOT_FOUND:
+ 			return "Filter not found";
+ 		case AVERROR_INVALIDDATA:
+ 			return "Invalid data found when processing input";
+ 		case AVERROR_MUXER_NOT_FOUND:
+ 			return "Muxer not found";
+ 		case AVERROR_OPTION_NOT_FOUND:
+ 			return "Option not found";
+ 		case AVERROR_PATCHWELCOME:
+ 			return "Not yet implemented in FFmpeg, patches welcome";
+ 		case AVERROR_PROTOCOL_NOT_FOUND:
+ 			return "Protocol not found";
+ 		case AVERROR_STREAM_NOT_FOUND:
+ 			return "Stream not found";
+ 		default:
+ 			break;
+ 	}
+#else
     switch(err) {
     case AVERROR_NUMEXPECTED:
 		return "Incorrect filename syntax";
@@ -838,7 +893,9 @@ static const char * icvFFMPEGErrStr(int
     default:
 		break;
     }
-  	return "Unspecified error";
+#endif
+
+ 	return "Unspecified error";
 }
 
 /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
@@ -918,7 +975,7 @@ static AVStream *icv_add_video_stream_FF
 #endif
 
 #if LIBAVFORMAT_BUILD > 4621
-	c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
+	c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
 #else
 	c->codec_id = oc->oformat->video_codec;
 #endif
@@ -930,7 +987,7 @@ static AVStream *icv_add_video_stream_FF
     //if(codec_tag) c->codec_tag=codec_tag;
 	codec = avcodec_find_encoder(c->codec_id);
 
-	c->codec_type = CODEC_TYPE_VIDEO;
+	c->codec_type = AVMEDIA_TYPE_VIDEO;
 
 	/* put sample parameters */
 	c->bit_rate = bitrate;
@@ -1015,7 +1072,11 @@ int icv_av_write_frame_FFMPEG( AVFormatC
         AVPacket pkt;
         av_init_packet(&pkt);
 
-        pkt.flags |= PKT_FLAG_KEY;
+		#ifndef PKT_FLAG_KEY
+			#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+		#endif
+		
+        pkt.flags |= PKT_FLAG_KEY; 
         pkt.stream_index= video_st->index;
         pkt.data= (uint8_t *)picture;
         pkt.size= sizeof(AVPicture);
@@ -1237,7 +1298,13 @@ bool CvVideoWriter_FFMPEG::open( const c
 	av_register_all ();
 
 	/* auto detect the output format from the name and fourcc code. */
+
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
+	fmt = av_guess_format(NULL, filename, NULL);
+#else
 	fmt = guess_format(NULL, filename, NULL);
+#endif
+	
 	if (!fmt)
         return false;
 
@@ -1260,7 +1327,11 @@ bool CvVideoWriter_FFMPEG::open( const c
 #endif
 
     // alloc memory for context
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
+	oc = avformat_alloc_context();
+#else
 	oc = av_alloc_format_context();
+#endif
 	assert (oc);
 
 	/* set file name */

Places

File opencv-2.3-ffmpeg.patch of Package opencv (Revision 90d1a2f442a7183b9d17d558e3f4c7fe)

Places