Index: branches/2016Q4/x11-toolkits/nucleo/Makefile =================================================================== --- branches/2016Q4/x11-toolkits/nucleo/Makefile (revision 425324) +++ branches/2016Q4/x11-toolkits/nucleo/Makefile (revision 425325) @@ -1,71 +1,71 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= nucleo PORTVERSION= 0.7.6 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/ MAINTAINER= ports@FreeBSD.org COMMENT= Toolkit to explore video and human-computer interaction LICENSE= LGPL21 LIB_DEPENDS= libexif.so:graphics/libexif \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 USES= gmake jpeg libtool pathfix pkgconfig shebangfix tar:bzip2 USE_GL= glu GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-opencv USE_LDCONFIG= yes INSTALL_TARGET= install-strip SHEBANG_FILES= docs/MacOSX/nBundle.in CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= FFMPEG GD GNUTLS QT4 OPTIONS_RADIO= DNSSD OPTIONS_RADIO_DNSSD= AVAHI MDNSRESPONDER OPTIONS_SUB= yes DNSSD_DESC= Service discovery AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns AVAHI_CPPFLAGS= -I${LOCALBASE}/include/avahi-compat-libdns_sd FFMPEG_DESC= Build FFmpeg plugin FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg FFMPEG_CONFIGURE_OFF= --without-ffmpeg GD_DESC= Build GD plugin GD_LIB_DEPENDS= libgd.so:graphics/gd QT4_DESC= Build Qt 4 plugin GD_CONFIGURE_OFF= --without-gd GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_OFF= --without-gnutls MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder QT4_USE= QT4=moc_build,corelib QT4_CONFIGURE_OFF= --without-qt QT4_MAKE_ARGS= QT4MOC="${MOC}" .include .if ! ${PORT_OPTIONS:MAVAHI} && ! ${PORT_OPTIONS:MMDNSRESPONDER} CONFIGURE_ARGS+= --without-dns-sd .endif .if ${PORT_OPTIONS:MQT4} QT_NONSTANDARD= yes .endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/nucleo .include Index: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H =================================================================== --- branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H (revision 425324) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H (nonexistent) @@ -1,11 +0,0 @@ ---- nucleo/plugins/ffmpeg/ffmpegImageSink.H.orig 2009-05-25 12:53:15 UTC -+++ nucleo/plugins/ffmpeg/ffmpegImageSink.H -@@ -36,7 +36,7 @@ namespace nucleo { - AVFrame srcPic, convPic, *picture ; - int video_outbuf_size ; - uint8_t *video_outbuf ; -- enum PixelFormat srcEncoding ; -+ enum AVPixelFormat srcEncoding ; - - std::string filename ; // if used as a file sink - Property changes on: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo_plugins_ffmpeg_ffmpegImageSink.H ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx =================================================================== --- branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx (revision 425324) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSink.cxx (revision 425325) @@ -1,183 +1,112 @@ ---- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig 2009-05-25 12:53:15 UTC -+++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx -@@ -118,17 +118,17 @@ namespace nucleo { +--- nucleo/plugins/ffmpeg/ffmpegImageSink.cxx.orig 2009-05-25 14:53:15.000000000 +0200 ++++ nucleo/plugins/ffmpeg/ffmpegImageSink.cxx 2015-07-03 23:24:23.255152399 +0200 +@@ -118,11 +118,11 @@ namespace nucleo { output_format = 0 ; if (uri.scheme=="mpegts-udp") { - output_format = guess_format("mpegts", NULL, NULL) ; + output_format = av_guess_format("mpegts", NULL, NULL) ; } else { filename = uri.opaque!="" ? uri.opaque : uri.path ; - if (guessFormat) output_format = guess_format(NULL, filename.c_str(), NULL) ; - if (!output_format) output_format = guess_format(format.c_str(), NULL, NULL) ; + if (guessFormat) output_format = av_guess_format(NULL, filename.c_str(), NULL) ; + if (!output_format) output_format = av_guess_format(format.c_str(), NULL, NULL) ; } std::string message ; - if (!output_format) - message = "Unable to find the requested format" ; -- else if (output_format->video_codec == CODEC_ID_NONE) { -+ else if (output_format->video_codec == AV_CODEC_ID_NONE) { - output_format = 0 ; - message = "Not a video format" ; - } else if (output_format->flags & AVFMT_NOFILE) { @@ -156,12 +156,13 @@ namespace nucleo { snprintf(format_context->filename, sizeof(format_context->filename), "%s", filename.c_str()) ; - vstream = av_new_stream(format_context, FREEPLAYER_VIDEO_PID) ; + vstream = avformat_new_stream(format_context, NULL) ; if (!vstream) { std::cerr << "ffmpegImageSink: unable to create the AVStream" << std::endl ; stop() ; return false ; } + vstream -> id = FREEPLAYER_VIDEO_PID; // ---------------- -@@ -190,8 +191,8 @@ namespace nucleo { +@@ -190,7 +191,7 @@ namespace nucleo { AVCodecContext *codec_context = vstream->codec ; codec_context->codec_id = output_format->video_codec ; - codec_context->codec_type = CODEC_TYPE_VIDEO ; -- codec_context->pix_fmt = PIX_FMT_YUV420P ; + codec_context->codec_type = AVMEDIA_TYPE_VIDEO ; -+ codec_context->pix_fmt = AV_PIX_FMT_YUV420P ; + codec_context->pix_fmt = PIX_FMT_YUV420P ; codec_context->width = img->getWidth() ; // must be a multiple of two codec_context->height = img->getHeight() ; // must be a multiple of two - codec_context->me_method = ME_EPZS ; // ME_ZERO @@ -210,12 +211,7 @@ namespace nucleo { || !strcmp(format_context->oformat->name, "3gp")) codec_context->flags |= CODEC_FLAG_GLOBAL_HEADER ; - if (av_set_parameters(format_context, NULL) < 0) { - std::cerr << "ffmpegImageSink: invalid output format parameters" << std::endl ; - return false ; - } - - dump_format(format_context, 0, filename.c_str(), 1) ; // FIXME: for debug only + av_dump_format(format_context, 0, filename.c_str(), 1) ; // FIXME: for debug only // ------------------ @@ -225,7 +221,7 @@ namespace nucleo { return false ; } - if (avcodec_open(codec_context, codec) < 0) { + if (avcodec_open2(codec_context, codec, NULL) < 0) { std::cerr << "ffmpegImageSink: could not open codec" << std::endl ; vstream->codec = 0 ; return false ; @@ -235,7 +231,7 @@ namespace nucleo { if (filename!="") { sender = 0 ; - if (url_fopen(&format_context->pb, filename.c_str(), URL_WRONLY) < 0) { + if (avio_open(&format_context->pb, filename.c_str(), AVIO_FLAG_WRITE) < 0) { std::cerr << "ffmpegImageSink: could not open " << filename << std::endl ; return false ; } -@@ -245,37 +241,37 @@ namespace nucleo { +@@ -245,17 +241,17 @@ namespace nucleo { int port = uri.port ; if (!port) port = 1234 ; sender = new UdpSender(uri.host.c_str(), port) ; - if (init_put_byte(format_context->pb, buffer, buffer_size, + if (avio_alloc_context(buffer, buffer_size, 1, (void *)this, 0, udp_callback, 0) < 0) { std::cerr << "ffmpegImageSink: init_put_byte failed" << std::endl ; return false ; } - format_context->pb->is_streamed = 1 ; // no seek + format_context->pb->seekable = 0 ; // no seek format_context->pb->max_packet_size = buffer_size ; } - av_write_header(format_context) ; + avformat_write_header(format_context, NULL) ; video_outbuf_size = 256*1024 ; // FIXME ? video_outbuf = new uint8_t [video_outbuf_size] ; - - switch (img->getEncoding()) { - case Image::ARGB: -- // PIX_FMT_RGBA32 is endian-sensitive... -- // srcEncoding = ByteOrder::isLittleEndian() ? PIX_FMT_RGB24 : PIX_FMT_RGBA32 ; -- srcEncoding = PIX_FMT_RGB24 ; -+ // AV_PIX_FMT_RGBA32 is endian-sensitive... -+ // srcEncoding = ByteOrder::isLittleEndian() ? AV_PIX_FMT_RGB24 : AV_PIX_FMT_RGBA32 ; -+ srcEncoding = AV_PIX_FMT_RGB24 ; - break ; -- case Image::L: srcEncoding = PIX_FMT_GRAY8 ; break ; -- case Image::YpCbCr420: srcEncoding = PIX_FMT_YUV420P ; break ; -- default: srcEncoding = PIX_FMT_RGB24 ; break ; -+ case Image::L: srcEncoding = AV_PIX_FMT_GRAY8 ; break ; -+ case Image::YpCbCr420: srcEncoding = AV_PIX_FMT_YUV420P ; break ; -+ default: srcEncoding = AV_PIX_FMT_RGB24 ; break ; - } - -- avcodec_get_frame_defaults(&srcPic) ; -+ av_frame_unref(&srcPic) ; - if (codec_context->pix_fmt==srcEncoding) - picture = &srcPic ; - else { -- avcodec_get_frame_defaults(&convPic) ; -+ av_frame_unref(&convPic) ; - int size = avpicture_get_size(codec_context->pix_fmt, codec_context->width, codec_context->height) ; - avpicture_fill((AVPicture *)&convPic, - new uint8_t [size], -@@ -304,7 +300,7 @@ namespace nucleo { - // std::cerr << "base: " << vstream->time_base.num << " / " << vstream->time_base.den << std::endl ; - - AVCodecContext *cctx = vstream->codec ; -- if (srcEncoding==PIX_FMT_RGB24) convertImage(img, Image::RGB) ; -+ if (srcEncoding==AV_PIX_FMT_RGB24) convertImage(img, Image::RGB) ; - resizeImage(img, cctx->width, cctx->height) ; - avpicture_fill((AVPicture *)&srcPic, img->getData(), srcEncoding, - cctx->width, cctx->height) ; -@@ -330,23 +326,23 @@ namespace nucleo { - picture->pts = pts ; - // std::cerr << "pts: " << pts << std::endl ; - -- int out_size = avcodec_encode_video(cctx, video_outbuf, video_outbuf_size, picture) ; -- if (!out_size) { -- std::cerr << "ffmpegImageSink: avcodec_encode_video returned 0" << std::endl ; -+ AVPacket pkt ; -+ av_init_packet(&pkt) ; -+ pkt.data = video_outbuf ; -+ pkt.size = video_outbuf_size ; -+ -+ int got_packet = 0 ; -+ int ret = avcodec_encode_video2(cctx, &pkt, picture, &got_packet) ; -+ if (ret) { -+ std::cerr << "ffmpegImageSink: avcodec_encode_video2 failed" << std::endl ; - stop() ; - return false ; - } - -- // std::cerr << "out_size = " << out_size << std::endl ; -- -- AVPacket pkt ; -- av_init_packet(&pkt) ; - pkt.stream_index = vstream->index ; -- pkt.data = video_outbuf ; -- pkt.size = out_size ; +@@ -346,7 +342,7 @@ namespace nucleo { + pkt.size = out_size ; if (cctx->coded_frame) { pkt.pts = pkt.dts = pts ; - if (cctx->coded_frame->key_frame) pkt.flags |= PKT_FLAG_KEY ; + if (cctx->coded_frame->key_frame) pkt.flags |= AV_PKT_FLAG_KEY ; } if (av_write_frame(format_context, &pkt) != 0) { // std::cerr << "ffmpegImageSink: error while writing video frame" << std::endl ; @@ -372,7 +368,7 @@ namespace nucleo { if (vstream->codec) { avcodec_close(vstream->codec) ; av_write_trailer(format_context) ; - if (!sender) url_fclose(format_context->pb) ; + if (!sender) avio_close(format_context->pb) ; } av_freep(&vstream) ; } Index: branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx =================================================================== --- branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx (revision 425324) +++ branches/2016Q4/x11-toolkits/nucleo/files/patch-nucleo__plugins__ffmpeg__ffmpegImageSource.cxx (revision 425325) @@ -1,87 +1,48 @@ ---- nucleo/plugins/ffmpeg/ffmpegImageSource.cxx.orig 2009-05-25 12:53:15 UTC +--- nucleo/plugins/ffmpeg/ffmpegImageSource.cxx.orig +++ nucleo/plugins/ffmpeg/ffmpegImageSource.cxx -@@ -47,23 +47,23 @@ namespace nucleo { +@@ -47,23 +47,23 @@ bool ffmpegImageSource::start(void) { - int ret = av_open_input_file(&fctx, filename.c_str(), 0, 0, 0); + int ret = avformat_open_input(&fctx, filename.c_str(), 0, 0); if (ret<0) { std::cerr << "ffmpegImageSource: failed to open " << filename << " (" << ret << ")" << std::endl ; return false ; } - ret = av_find_stream_info(fctx) ; + ret = avformat_find_stream_info(fctx, NULL) ; if (ret<0) { std::cerr << "ffmpegImageSource: failed to find codec parameters for " << filename << " (" << ret << ")" << std::endl ; return false ; } - dump_format(fctx, 1, filename.c_str(), 0) ; + av_dump_format(fctx, 1, filename.c_str(), 0) ; bool found_video_stream = false ; for (unsigned int i=0; inb_streams; ++i) { - if (fctx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) { + if (fctx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) { video_stream = i ; found_video_stream = true ; } else -@@ -86,7 +86,7 @@ namespace nucleo { +@@ -86,7 +86,7 @@ return false ; } - ret = avcodec_open(cctx, codec); + ret = avcodec_open2(cctx, codec, NULL); if (ret<0) { std::cerr << "ffmpegImageSource: unable to open codec" << std::endl ; return false ; -@@ -123,39 +123,39 @@ namespace nucleo { +@@ -123,7 +123,7 @@ #endif int got_picture = 0 ; - avcodec_decode_video(cctx, &frame, &got_picture, packet.data, packet.size) ; + avcodec_decode_video2(cctx, &frame, &got_picture, &packet) ; av_free_packet(&packet) ; if (!got_picture) continue ; - lastImage.setTimeStamp() ; - switch (cctx->pix_fmt) { -- case PIX_FMT_GRAY8: -+ case AV_PIX_FMT_GRAY8: - lastImage.setDims(cctx->width, cctx->height) ; - lastImage.setEncoding(Image::L) ; - lastImage.setData(frame.data[0], cctx->width*cctx->height, Image::NONE) ; - break ; -- case PIX_FMT_RGB24: -+ case AV_PIX_FMT_RGB24: - lastImage.setDims(cctx->width, cctx->height) ; - lastImage.setEncoding(Image::RGB) ; - lastImage.setData(frame.data[0], (cctx->width*cctx->height)*3, Image::NONE) ; - break ; - default: // Convert everything else to RGB24 -- // PIX_FMT_YUV420P has three separate plans and ffmpeg converts -+ // AV_PIX_FMT_YUV420P has three separate plans and ffmpeg converts - // them to RGB faster than nucleo does... -- // PIX_FMT_RGBA32 and PIX_FMT_RGB565 are stored in cpu endianness -+ // AV_PIX_FMT_RGBA32 and AV_PIX_FMT_RGB565 are stored in cpu endianness - // On OS X (powerpc), they correspond to Image::ARGB and Image::RGB565 - lastImage.prepareFor(cctx->width, cctx->height, Image::RGB) ; - AVFrame tmpframe ; -- avpicture_fill((AVPicture*)&tmpframe, lastImage.getData(), PIX_FMT_RGB24, -+ avpicture_fill((AVPicture*)&tmpframe, lastImage.getData(), AV_PIX_FMT_RGB24, - cctx->width, cctx->height) ; - #if NO_SOFTWARE_SCALER -- img_convert((AVPicture*)&tmpframe, PIX_FMT_RGB24, -+ img_convert((AVPicture*)&tmpframe, AV_PIX_FMT_RGB24, - (AVPicture*)&frame, cctx->pix_fmt, cctx->width, cctx->height) ; - #else - SwsContext *swsc = 0 ; - swsc = sws_getCachedContext(swsc, - cctx->width, cctx->height, cctx->pix_fmt, -- cctx->width, cctx->height, PIX_FMT_RGB24, -+ cctx->width, cctx->height, AV_PIX_FMT_RGB24, - SWS_BICUBIC, NULL, NULL, NULL) ; - if (!swsc) { - std::cerr << "ffmpegImageSource: sws_getCachedContext failed" << std::endl ; Index: branches/2016Q4 =================================================================== --- branches/2016Q4 (revision 425324) +++ branches/2016Q4 (revision 425325) Property changes on: branches/2016Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,1 +0,0 ## Reverse-merged /head:r425305