<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146293] trunk/dports/kde/ffmpegthumbs</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146293">146293</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2016-03-03 08:27:16 -0800 (Thu, 03 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ffmpegthumbs: add variant to comply with changes in ffmpeg > 2.8 (ticket #50694)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdeffmpegthumbsPortfile">trunk/dports/kde/ffmpegthumbs/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/kde/ffmpegthumbs/files/</li>
<li><a href="#trunkdportskdeffmpegthumbsfilespatchdeprecateddiff">trunk/dports/kde/ffmpegthumbs/files/patch-deprecated.diff</a></li>
<li><a href="#trunkdportskdeffmpegthumbsfilespatchnodeinterlacediff">trunk/dports/kde/ffmpegthumbs/files/patch-nodeinterlace.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdeffmpegthumbsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/ffmpegthumbs/Portfile (146292 => 146293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/ffmpegthumbs/Portfile 2016-03-03 16:15:19 UTC (rev 146292)
+++ trunk/dports/kde/ffmpegthumbs/Portfile 2016-03-03 16:27:16 UTC (rev 146293)
</span><span class="lines">@@ -25,6 +25,15 @@
</span><span class="cx"> depends_lib-append port:kdelibs4 \
</span><span class="cx"> path:lib/libavcodec.dylib:ffmpeg
</span><span class="cx">
</span><ins>+#The support for ffmpeg3 is kept is a variant, as it implies some
+#regressions (no deinterlace).
+#See https://git.reviewboard.kde.org/r/126992/ for an attempt to port the code,
+#but it is based on later git code, and for Qt5.
+variant ffmpeg3 description "Update code to comply with functions of ffmpeg > 2.8" {
+ patchfiles-append patch-deprecated.diff \
+ patch-nodeinterlace.diff
+}
+
</ins><span class="cx"> pre-activate {
</span><span class="cx"> #Deactivate hack for when kdemultimedia4 port has been fragmented into small ports
</span><span class="cx"> if {[file exists ${prefix}/lib/kde4/ffmpegthumbs.so]
</span></span></pre></div>
<a id="trunkdportskdeffmpegthumbsfilespatchdeprecateddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/ffmpegthumbs/files/patch-deprecated.diff (0 => 146293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/ffmpegthumbs/files/patch-deprecated.diff (rev 0)
+++ trunk/dports/kde/ffmpegthumbs/files/patch-deprecated.diff 2016-03-03 16:27:16 UTC (rev 146293)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+diff -ur ../ffmpegthumbs-4.14.3-orig/ffmpegthumbnailer/moviedecoder.cpp ./ffmpegthumbnailer/moviedecoder.cpp
+--- ../ffmpegthumbs-4.14.3-orig/ffmpegthumbnailer/moviedecoder.cpp 2014-08-16 06:04:31.000000000 +0900
++++ ./ffmpegthumbnailer/moviedecoder.cpp 2016-03-03 01:30:47.000000000 +0900
+@@ -67,7 +67,7 @@
+ }
+
+ initializeVideo();
+- m_pFrame = avcodec_alloc_frame();
++ m_pFrame = av_frame_alloc();
+
+ if (m_pFrame) {
+ m_initialized=true;
+@@ -239,7 +239,7 @@
+ return false;
+ }
+
+- avcodec_get_frame_defaults(m_pFrame);
++ av_frame_unref(m_pFrame);
+
+ int frameFinished = 0;
+
+@@ -291,7 +291,7 @@
+ }
+
+ int scaledWidth, scaledHeight;
+- convertAndScaleFrame(PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
++ convertAndScaleFrame(AV_PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
+
+ videoFrame.width = scaledWidth;
+ videoFrame.height = scaledHeight;
+@@ -302,7 +302,7 @@
+ memcpy((&(videoFrame.frameData.front())), m_pFrame->data[0], videoFrame.lineSize * videoFrame.height);
+ }
+
+-void MovieDecoder::convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight)
++void MovieDecoder::convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight)
+ {
+ calculateDimensions(scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
+ SwsContext* scaleContext = sws_getContext(m_pVideoCodecContext->width, m_pVideoCodecContext->height,
+@@ -355,9 +355,9 @@
+ }
+ }
+
+-void MovieDecoder::createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, PixelFormat format)
++void MovieDecoder::createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, AVPixelFormat format)
+ {
+- *avFrame = avcodec_alloc_frame();
++ *avFrame = av_frame_alloc();
+
+ int numBytes = avpicture_get_size(format, width, height);
+ *frameBuffer = reinterpret_cast<quint8*>(av_malloc(numBytes));
+diff -ur ../ffmpegthumbs-4.14.3-orig/ffmpegthumbnailer/moviedecoder.h ./ffmpegthumbnailer/moviedecoder.h
+--- ../ffmpegthumbs-4.14.3-orig/ffmpegthumbnailer/moviedecoder.h 2014-08-16 06:04:31.000000000 +0900
++++ ./ffmpegthumbnailer/moviedecoder.h 2016-03-03 01:24:37.000000000 +0900
+@@ -52,8 +52,8 @@
+
+ bool decodeVideoPacket();
+ bool getVideoPacket();
+- void convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight);
+- void createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, PixelFormat format);
++ void convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight);
++ void createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, AVPixelFormat format);
+ void calculateDimensions(int squareSize, bool maintainAspectRatio, int& destWidth, int& destHeight);
+
+ private:
</ins></span></pre></div>
<a id="trunkdportskdeffmpegthumbsfilespatchnodeinterlacediff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/ffmpegthumbs/files/patch-nodeinterlace.diff (0 => 146293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/ffmpegthumbs/files/patch-nodeinterlace.diff (rev 0)
+++ trunk/dports/kde/ffmpegthumbs/files/patch-nodeinterlace.diff 2016-03-03 16:27:16 UTC (rev 146293)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- ffmpegthumbnailer/moviedecoder.cpp.orig 2014-08-16 06:04:31.000000000 +0900
++++ ffmpegthumbnailer/moviedecoder.cpp 2016-03-03 01:37:23.000000000 +0900
+@@ -285,10 +285,10 @@
+
+ void MovieDecoder::getScaledVideoFrame(int scaledSize, bool maintainAspectRatio, VideoFrame& videoFrame)
+ {
+- if (m_pFrame->interlaced_frame) {
+- avpicture_deinterlace((AVPicture*) m_pFrame, (AVPicture*) m_pFrame, m_pVideoCodecContext->pix_fmt,
+- m_pVideoCodecContext->width, m_pVideoCodecContext->height);
+- }
++// if (m_pFrame->interlaced_frame) {
++// avpicture_deinterlace((AVPicture*) m_pFrame, (AVPicture*) m_pFrame, m_pVideoCodecContext->pix_fmt,
++// m_pVideoCodecContext->width, m_pVideoCodecContext->height);
++// }
+
+ int scaledWidth, scaledHeight;
+ convertAndScaleFrame(PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
</ins></span></pre>
</div>
</div>
</body>
</html>