mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 00:20:40 -04:00
340e390eeb
Fix python support in highgui module. Bump PORTREVISION Pass maintainership to submitter. PR: 137805, 137871 Submitted by: Alberto Villa <villa.alberto AT gmail DOT com> Approved by: miwi (mentor)
121 lines
3.5 KiB
C++
121 lines
3.5 KiB
C++
--- otherlibs/highgui/cvcap_ffmpeg.cpp.orig 2006-07-25 00:27:39.000000000 +0200
|
|
+++ otherlibs/highgui/cvcap_ffmpeg.cpp 2009-08-15 23:05:18.343750709 +0200
|
|
@@ -41,9 +41,14 @@
|
|
|
|
#include "_highgui.h"
|
|
|
|
+#define __STDC_CONSTANT_MACROS
|
|
|
|
extern "C" {
|
|
#include <ffmpeg/avformat.h>
|
|
+#include <ffmpeg/avcodec.h>
|
|
+#include <ffmpeg/swscale.h>
|
|
+#include <sys/types.h> /* size_t */
|
|
+#include <sys/errno.h>
|
|
}
|
|
|
|
#ifdef NDEBUG
|
|
@@ -52,6 +57,8 @@
|
|
#define CV_WARN(message) fprintf(stderr, "warning: %s (%s:%d)\n", message, __FILE__, __LINE__)
|
|
#endif
|
|
|
|
+static struct SwsContext *img_convert_ctx;
|
|
+
|
|
typedef struct CvCaptureAVI_FFMPEG
|
|
{
|
|
CvCaptureVTable * vtable;
|
|
@@ -214,19 +221,21 @@
|
|
{
|
|
if( !capture || !capture->video_st || !capture->picture->data[0] )
|
|
return 0;
|
|
-#if LIBAVFORMAT_BUILD > 4628
|
|
- img_convert( (AVPicture*)&capture->rgb_picture, PIX_FMT_BGR24,
|
|
- (AVPicture*)capture->picture,
|
|
- capture->video_st->codec->pix_fmt,
|
|
- capture->video_st->codec->width,
|
|
- capture->video_st->codec->height );
|
|
-#else
|
|
- img_convert( (AVPicture*)&capture->rgb_picture, PIX_FMT_BGR24,
|
|
- (AVPicture*)capture->picture,
|
|
- capture->video_st->codec.pix_fmt,
|
|
- capture->video_st->codec.width,
|
|
- capture->video_st->codec.height );
|
|
-#endif
|
|
+
|
|
+ img_convert_ctx = sws_getContext(capture->video_st->codec->width,
|
|
+ capture->video_st->codec->height,
|
|
+ capture->video_st->codec->pix_fmt,
|
|
+ capture->video_st->codec->width,
|
|
+ capture->video_st->codec->height,
|
|
+ PIX_FMT_BGR24,
|
|
+ SWS_BICUBIC,
|
|
+ NULL, NULL, NULL);
|
|
+
|
|
+ sws_scale(img_convert_ctx, capture->picture->data,
|
|
+ capture->picture->linesize, 0,
|
|
+ capture->video_st->codec->height,
|
|
+ capture->rgb_picture.data, capture->rgb_picture.linesize);
|
|
+
|
|
return &capture->frame;
|
|
}
|
|
|
|
@@ -389,7 +398,11 @@
|
|
picture = avcodec_alloc_frame();
|
|
if (!picture)
|
|
return NULL;
|
|
+#if LIBAVCODEC_BUILD < 3416064
|
|
size = avpicture_get_size(pix_fmt, width, height);
|
|
+#else
|
|
+ size = avpicture_get_size((PixelFormat)pix_fmt, width, height);
|
|
+#endif
|
|
if(alloc){
|
|
picture_buf = (uint8_t *) cvAlloc(size);
|
|
if (!picture_buf)
|
|
@@ -398,7 +411,11 @@
|
|
return NULL;
|
|
}
|
|
avpicture_fill((AVPicture *)picture, picture_buf,
|
|
+#if LIBAVCODEC_BUILD < 3416064
|
|
pix_fmt, width, height);
|
|
+#else
|
|
+ (PixelFormat)pix_fmt, width, height);
|
|
+#endif
|
|
}
|
|
else {
|
|
}
|
|
@@ -713,9 +730,20 @@
|
|
PIX_FMT_BGR24, image->width, image->height);
|
|
|
|
// convert to the color format needed by the codec
|
|
- if( img_convert((AVPicture *)mywriter->picture, c->pix_fmt,
|
|
- (AVPicture *)mywriter->rgb_picture, PIX_FMT_BGR24,
|
|
- image->width, image->height) < 0){
|
|
+ img_convert_ctx = sws_getContext(image->width,
|
|
+ image->height,
|
|
+ PIX_FMT_BGR24,
|
|
+ c->width,
|
|
+ c->height,
|
|
+ c->pix_fmt,
|
|
+ SWS_BICUBIC,
|
|
+ NULL, NULL, NULL);
|
|
+
|
|
+ if ( sws_scale(img_convert_ctx, mywriter->rgb_picture->data,
|
|
+ mywriter->rgb_picture->linesize, 0,
|
|
+ image->height,
|
|
+ mywriter->picture->data, mywriter->picture->linesize) < 0 )
|
|
+ {
|
|
CV_ERROR(CV_StsUnsupportedFormat, "FFMPEG::img_convert pixel format conversion from BGR24 not handled");
|
|
}
|
|
}
|
|
@@ -781,7 +809,11 @@
|
|
|
|
if (!(mywriter->fmt->flags & AVFMT_NOFILE)) {
|
|
/* close the output file */
|
|
+#if LIBAVFORMAT_BUILD > 4628
|
|
+ url_fclose(mywriter->oc->pb);
|
|
+#else
|
|
url_fclose(&mywriter->oc->pb);
|
|
+#endif
|
|
}
|
|
|
|
/* free the stream */
|