August 2014 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg-fateserver] branch master updated. b74b380 Update to new website style
by ffmpeg-cvslog＠ffmpeg.org 02 Jan '15

02 Jan '15

The branch, master has been updated via b74b380bafe68b8df58da153f2fc7be6457e7ab4 (commit) from deb13967dbf06096691ca81af23c3ee985b0488f (commit) - Log ----------------------------------------------------------------- commit b74b380bafe68b8df58da153f2fc7be6457e7ab4 Author: Timothy Gu <timothygu99(a)gmail.com> AuthorDate: Wed Jul 30 15:20:54 2014 -0700 Commit: Michael Niedermayer <michaelni(a)gmx.at> CommitDate: Thu Jul 31 21:40:42 2014 +0200 Update to new website style Signed-off-by: Timothy Gu <timothygu99(a)gmail.com> diff --git a/FATE.pm b/FATE.pm index 806168d..544e80f 100644 --- a/FATE.pm +++ b/FATE.pm @@ -27,7 +27,8 @@ BEGIN { @ISA = qw/Exporter/; @EXPORT = qw/split_header split_config split_rec parse_date agestr split_stats load_summary load_report load_lastpass - doctype start end tag h1 span trow trowa trowh th td anchor navbar + start end tag h1 span trow trowa trowh th td anchor + head1 head2 head3 footer fail $fatedir $recent_age $ancient_age $hidden_age href $gitweb/; } @@ -199,10 +200,6 @@ $block_tags{$_} = 1 for @block_tags; my @tags; -sub doctype { - print q{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">}, "\n"; -} - sub opentag { my ($tag, %attrs) = @_; print qq{<$tag}; @@ -301,35 +298,116 @@ sub href { } } -sub navbar { +sub head1 { + print <<EOF; +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8" /> +EOF +} + +sub head2 { # Copied from ffmpeg-web print <<EOF; -<div id="banner"> -<a href="//ffmpeg.org/index.html"> -<img src="//ffmpeg.org/ffmpeg-logo.png" alt="FFmpeg" /> -</a> -</div> -<div id="navbar"> -<a href="//ffmpeg.org/index.html">News</a> | -<a href="//ffmpeg.org/about.html">About</a> | -<a href="//ffmpeg.org/download.html">Download</a> | -<a href="//ffmpeg.org/documentation.html">Documentation</a> | -<a href="//ffmpeg.org/bugreports.html">Bug Reports</a> | -<a href="//ffmpeg.org/contact.html">Contact</a> | -<a href="//ffmpeg.org/donations.html">Donations</a> | -<a href="//ffmpeg.org/consulting.html">Consulting</a> | -<a href="//ffmpeg.org/projects.html">Projects</a> | -<a href="//ffmpeg.org/legal.html">Legal</a> | -<a href="//ffmpeg.org/security.html">Security</a> | -<a href="http://fate.ffmpeg.org">FATE</a> -</div> + <link rel="stylesheet" href="https://ffmpeg.org/css/font-awesome.min.css" /> + <link rel="stylesheet" href="https://ffmpeg.org/css/bootstrap.min.css" /> + <link rel="stylesheet" href="https://ffmpeg.org/css/simple-sidebar.css" /> + <link rel="stylesheet" href="https://ffmpeg.org/css/style.min.css" /> + <link rel="stylesheet" href="/fate.css" /> + <meta name="viewport" content="width=device-width,initial-scale=1.0"> +  + + <link rel="shortcut icon" href="https://ffmpeg.org/favicon.ico" /> + </head> + <body> + + <div id="wrapper"> + + <nav id="sidebar-wrapper"> + <ul class="sidebar-nav"> + <li class="sidebar-brand"><a href="."> + <img src="https://ffmpeg.org/img/ffmpeg3d_white_20.png" alt="FFmpeg" /> + FFmpeg</a> + </li> + <li><a href="https://ffmpeg.org/about.html">About</a></li> + <li><a href="https://ffmpeg.org/index.html#news">News</a></li> + <li><a href="https://ffmpeg.org/download.html">Download</a></li> + <li><a href="https://ffmpeg.org/documentation.html">Documentation</a></li> + <li><a href="https://ffmpeg.org/contact.html#MailingLists">Community</a> + <ul> + <li><a href="https://ffmpeg.org/contact.html#MailingLists">Mailing Lists</a></li> + <li><a href="https://ffmpeg.org/contact.html#IRCChannels">IRC</a></li> + <li><a href="https://ffmpeg.org/contact.html#Forums">Forums</a></li> + <li><a href="https://ffmpeg.org/bugreports.html">Bug Reports</a></li> + <li><a href="http://trac.ffmpeg.org">Wiki</a></li> + </ul> + </li> + <li><a href="#">Developers</a> + <ul> + <li><a href="https://ffmpeg.org/download.html#get-sources">Source Code</a> + <li><a href="/">FATE</a></li> + <li><a href="http://coverage.ffmpeg.org">Code Coverage</a></li> + </ul> + </li> + <li><a href="#">More</a> + <ul> + <li><a href="https://ffmpeg.org/donations.html"> + Donate<span style="color: #e55; font-size: 0.8em; margin-left: -10px"><i class="fa fa-heart"></i></span></a></li> + <li><a href="https://ffmpeg.org/consulting.html">Hire Developers</a></li> + <li><a href="https://ffmpeg.org/contact.html">Contact</a></li> + <li><a href="https://ffmpeg.org/security.html">Security</a></li> + <li><a href="https://ffmpeg.org/legal.html">Legal</a></li> + </ul> + </li> + </ul> + </nav> + + <div id="page-content-wrapper"> + <header class="content-header"> + <h1> + <a id="menu-toggle" href="#" class="btn btn-success"><i class="fa fa-reorder"></i></a> +EOF +} + +sub head3 { + print <<EOF; + </h1> + </header> + <div class="page-content inset"> +EOF +} + +sub footer { + print <<EOF + </div>  + </div>  + </div>  + + <script src="https://ffmpeg.org/js/jquery.min.js"></script> + <script src="https://ffmpeg.org/js/bootstrap.min.js"></script> + +  + <script> + \$("#menu-toggle").click(function(e) { + e.preventDefault(); + \$("#wrapper").toggleClass("active"); + }); + </script> + + </body> +</html> + EOF } sub fail { my ($msg) = @_; print "Content-type: text/html\r\n\r\n"; - doctype; + print "<!DOCTYPE html>\n"; start 'html', xmlns => "http://www.w3.org/1999/xhtml"; start 'head'; tag 'meta', 'http-equiv' => "Content-Type", diff --git a/fate.css b/fate.css index 3a83511..cd73f6b 100644 --- a/fate.css +++ b/fate.css @@ -1,5 +1,6 @@ /* * Copyright (c) 2011 Mans Rullgard <mans(a)mansr.com> + * Copyright (c) 2014 Tiancheng "Timothy" Gu <timothygu99(a)gmail.com> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,41 +15,38 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -table { - border-collapse: collapse; -} - -th { - background: #ccc; - padding: 0.5em; -} - .recent { font-weight: bold; } .ancient { color: #888; } -.fail { background: #e44; } -.pass { background: #5e5; } -.warn { background: #ff3; } +.fail { + background: #d9534f !important; + color: white; +} +.pass { + background: #5cb85c !important; + color: white; +} +.warn { + background: #ecd046 !important; + color: black; +} -.alert { color: #911; } +.fate-alert { color: #911; } .rejoice { color: #191; } #failometer { padding: 0; } -#failometer span { - display: inline-block; +#failometer .progress { + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + margin-bottom: inherit; } /* index and history listings */ -#index > tbody > tr > td, #history > tbody > tr > td { - height: 1.7em; -} - .replist { - border: solid 1px #eee; width: 100%; } @@ -57,54 +55,8 @@ th { text-decoration: none; } -.replist tr { - border-left: solid 1px #eee; - border-right: solid 1px #eee; -} - -.replist th { - border: solid 1px #eee; -} - -.replist td { - border: solid 1px #eee; - padding: 0 0.5em; -} - -.replist tr.alt:nth-child(odd) { - background: white; -} - -.replist tr.alt:nth-child(even) { - background: #eee; -} - -.replist tr.alt:nth-child(odd) td { - border-color: #eee; -} - -.replist tr.alt:nth-child(even) td { - border-color: white; -} - -.replist tr.alt:nth-child(even) td:first-child { - border-left: solid 1px #eee; -} - -.replist tr:nth-child(n) td:last-child { - border-right: solid 1px #eee; -} - -.replist tr.hilight:hover { - background: #ddf; -} - -.replist tr.hilight:hover td { - border-color: white; -} - th a:link, th a:visited { - color: black; + color: inherit; text-decoration: none; } @@ -114,35 +66,14 @@ th a:hover { #index .comment { max-width: 13em; } -#index .warnleft { border-right: none; } -#index .warnright { border-left: none; } -#index .warnright a { text-decoration: none; } - -#index .resleft { - border-left: solid 1px white; - border-right: none; -} - -#index .resright { - border-left: none; - border-right: solid 1px #eee; - width: 1em; -} - #index .toggle { cursor: pointer; - text-align: center; - color: black; } tr.slotfail { display: none; } -tr.slotfail > td { - padding: 0.5em; -} - table.minirep { width: 100%; } @@ -152,12 +83,6 @@ table.minirep { text-align: left; } -.minilog { - border: solid 1px #eee; - padding: 0.5em; - margin: 0; -} - /* config summary */ #config td:first-child { @@ -169,17 +94,19 @@ table.minirep { /* test listing */ #tests { - border: solid 1px #eee; margin-top: 2em; width: 100%; } -#tests th { - text-align: left; +#tests .fail th { + background: #d9534f; + border-bottom: 2px solid #fcc; } -#tests .fail th { - background: #e44; +#tests .pass th { + background: #5cb85c; + border-bottom: 2px solid #9f9; + border-top: 0; } #tests .toggle { @@ -197,35 +124,26 @@ table.minirep { width: 12em; } -#tests tr:only-child th { - border: solid 1px #eee; -} - .diff { - font-family: monospace; - white-space: pre-wrap; display: none; } -.diff-new { +.diff-new, .diff-old, .diff-hnk { font-weight: bold; - color: #262; } -.diff-old { - font-weight: bold; - color: #622; +.diff-new, .diff-add { + color: #4cae4c; } -.diff-hnk { - font-weight: bold; - color: #226; +.diff-old, .diff-del { + color: #d9534f; } -.diff-add { - color: #262; +.diff-hnk { + color: #226; } -.diff-del { - color: #622; -} +code, pre { + white-space: pre-wrap; +} \ No newline at end of file diff --git a/history.cgi b/history.cgi index b2ed52f..cb6f71c 100755 --- a/history.cgi +++ b/history.cgi @@ -35,30 +35,14 @@ close D; print "Content-type: text/html\r\n\r\n"; -doctype; -start 'html', xmlns => "http://www.w3.org/1999/xhtml"; -start 'head'; -tag 'meta', 'http-equiv' => "Content-Type", - 'content' => "text/html; charset=utf-8"; -tag 'link', rel => 'stylesheet', - type => 'text/css', - href => '//ffmpeg.org/default.css'; -tag 'link', rel => 'stylesheet', - type => 'text/css', - href => '/fate.css'; +head1; print "<title>FATE: $slot</title>\n"; -end 'head'; +head2; +print "Report history for $slot"; +head3; -start 'body'; -start 'div', id => 'container'; - -navbar; - -start 'div', id => 'body'; - -h1 "Report history for $slot"; - -start 'table', id => 'history', class => 'replist'; +start 'div', class => 'table-responsive'; +start 'table', id => 'history', class => 'replist table'; start 'thead'; trowh 'Time', 'Rev', 'Arch', 'OS', 'Compiler', 'Warnings', 'Tests'; end 'thead'; @@ -104,6 +88,4 @@ for my $date ((sort { $b cmp $a } @reps)[0..49]) { end 'tbody'; end 'table'; end 'div'; -end 'div'; -end 'body'; -end 'html'; +footer; diff --git a/index.cgi b/index.cgi index 7204591..105cb86 100755 --- a/index.cgi +++ b/index.cgi @@ -1,6 +1,7 @@ #! /usr/bin/perl # # Copyright (c) 2011 Mans Rullgard <mans(a)mansr.com> +# Copyright (c) 2014 Tiancheng "Timothy" Gu <timothygu99(a)gmail.com> # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -164,6 +165,7 @@ sub category { } print "Content-type: text/html\r\n"; +print "Access-Control-Allow-Origin: https://ffmpeg.org\r\n"; if ($ENV{HTTP_ACCEPT_ENCODING} =~ /gzip/) { print "Content-Encoding: gzip\r\n\r\n"; @@ -172,17 +174,7 @@ if ($ENV{HTTP_ACCEPT_ENCODING} =~ /gzip/) { print "\r\n"; } -doctype; -start 'html', xmlns => "http://www.w3.org/1999/xhtml"; -start 'head'; -tag 'meta', 'http-equiv' => "Content-Type", - 'content' => "text/html; charset=utf-8"; -tag 'link', rel => 'stylesheet', - type => 'text/css', - href => '//ffmpeg.org/default.css'; -tag 'link', rel => 'stylesheet', - type => 'text/css', - href => '/fate.css'; +head1; print "<title>FATE</title>\n"; print <<EOF; <script type="text/javascript"> @@ -190,24 +182,19 @@ print <<EOF; var e = document.getElementById(id); if (e.style.display == 'table-row') { e.style.display = 'none'; - arr.textContent = '\\u25b6' + arr.classList.remove("fa-caret-up"); + arr.classList.add("fa-caret-down"); } else { e.style.display = 'table-row'; - arr.textContent = '\\u25bc' + arr.classList.add("fa-caret-up"); + arr.classList.remove("fa-caret-down"); } } </script> EOF -end 'head'; - -start 'body'; -start 'div', id => 'container'; - -navbar; - -start 'div', id => 'body'; - -h1 'FATE'; +head2; +print "FATE\n"; +head3; if (@queries) { start 'p'; @@ -220,13 +207,34 @@ if (@queries) { end 'p'; } -start 'table', id => 'index', class => 'replist'; +start 'div', class => 'table-responsive'; +start 'table', id => 'index', class => 'replist table'; start 'thead'; start 'tr'; -start 'td', colspan => 10, id => 'failometer'; -span ' ', class => 'pass', style => "width: ${allpass}%" if $allpass; -span ' ', class => 'warn', style => "width: ${warn}%" if $warn; -span ' ', class => 'fail', style => "width: ${allfail}%" if $allfail; +start 'td', colspan => 8, id => 'failometer'; +start 'div', class => 'progress'; +if ($allpass) { + print <<EOF; +<div class="progress-bar pass" role="progressbar" title="${allpass}% tests passed" aria-valuenow="${allpass}" aria-valuemin="0" aria-valuemax="100" style="width: ${allpass}%"> + <span class="sr-only">${allpass}%}</span> +</div> +EOF +} +if ($warn) { + print <<EOF; +<div class="progress-bar warn" role="progressbar" title="${warn}% tests failed" aria-valuenow="${warn}" aria-valuemin="0" aria-valuemax="100" style="width: ${warn}%"> + <span class="sr-only">${warn}%</span> +</div> +EOF +} +if ($allfail) { + print <<EOF; +<div class="progress-bar fail" role="progressbar" title="${allfail}% build failed" aria-valuenow="${allfail}" aria-valuemin="0" aria-valuemax="100" style="width: ${allfail}%"> + <span class="sr-only">${allfail}%</span> +</div> +EOF +} +end 'div'; end 'td'; end 'tr'; start 'tr'; @@ -236,8 +244,8 @@ start 'th'; lsort 'Arch', 'arch'; end 'th'; start 'th'; lsort 'OS', 'os'; end 'th'; start 'th'; lsort 'Compiler', 'cc'; end 'th'; start 'th'; lsort 'Comment', 'comment'; end 'th'; -start 'th', colspan => 2; lsort 'Warnings', 'nwarn'; end 'th'; -start 'th', colspan => 2; lsort 'Tests', 'npass'; end 'th'; +start 'th'; lsort 'Warnings', 'nwarn'; end 'th'; +start 'th'; lsort 'Tests', 'npass'; end 'th'; end 'tr'; end 'thead'; start 'tbody'; @@ -251,8 +259,8 @@ for my $rep (sort repcmp @reps) { my $rtext; my $rclass; my $log; - my $alert = ('rejoice', '', 'alert')[$$rep{alert} + 1]; - my $walert = ('rejoice', '', 'alert')[$$rep{dwarn} + 1]; + my $alert = ('pass', '', 'warn')[$$rep{alert} + 1]; + my $walert = ('pass', '', 'warn')[$$rep{dwarn} + 1]; (my $slotid = $$rep{slot}) =~ s/[^a-z0-9_-]/_/ig; if ($age < $recent_age) { @@ -262,7 +270,7 @@ for my $rep (sort repcmp @reps) { $alert = ''; } - start 'tr', class => "$ageclass $alert alt hilight"; + start 'tr', class => "$ageclass $alert"; start 'td'; anchor $agestr, href => href slot => $$rep{slot}; end 'td'; @@ -295,32 +303,38 @@ for my $rep (sort repcmp @reps) { } } } - start 'td', class => 'warnleft'; - anchor $$rep{nwarn}, class => $walert, - href => href slot => $$rep{slot}, time => $$rep{date}, log => 'compile'; + start 'td', class => "$walert"; + start 'div', class => 'pull-left'; + anchor $$rep{nwarn}, + href => href slot => $$rep{slot}, time => $$rep{date}, log => 'compile'; end; - start 'td', class => 'warnright'; - anchor '±', class => $walert, - href => href slot => $$rep{slot}, time => $$rep{date}, + start 'div', class => 'pull-right'; + anchor '±', + href => href slot => $$rep{slot}, time => $$rep{date}, log => "compile/$$rep{pdate}"; end; - start 'td', class => "$rclass resleft"; + end; + start 'td', class => "$rclass"; + start 'div', class => 'pull-left'; anchor $rtext, href => href slot => $$rep{slot}, time => $$rep{date}; - end 'td'; - start 'td', class => "$rclass resright"; + end; if ($npass < $ntest or $log) { - span '▶', class => 'toggle', onclick => "toggle('$slotid', this)"; + start 'div', class => 'pull-right'; + span '', class => 'toggle fa fa-caret-down', onclick => "toggle('$slotid', this)"; + end; } - end 'td'; + end; end 'tr'; print "\n"; if ($npass < $ntest && $ntest - $npass < 100) { + trowa { style => 'display: none' }, ''; + print "\n"; my $report = load_report $$rep{slot}, $$rep{date}; my @fail = grep $$_{status} ne '0', @{$$report{recs}}; my $lastpass = load_lastpass $$rep{slot}; start 'tr', id => $slotid, class => 'slotfail'; - start 'td', colspan => 10; + start 'td', colspan => 8; start 'table', class => 'minirep'; start 'thead'; start 'tr'; @@ -335,8 +349,8 @@ for my $rep (sort repcmp @reps) { start 'tbody'; for (sort { $$a{name} cmp $$b{name} } @fail) { my $falert = $$rep{pdate} eq $$lastpass{$$_{name}}{date} ? - 'alert' : ''; - start 'tr', class => "alt hilight $falert"; + 'warn' : ''; + start 'tr', class => "$falert"; td $$_{name}; td $$_{status}, class => 'errcode'; end 'tr'; @@ -346,21 +360,18 @@ for my $rep (sort repcmp @reps) { end 'td'; end 'tr'; print "\n"; - trowa { style => 'display: none' }, ''; } elsif ($log) { + trowa { style => 'display: none' }, ''; start 'tr', id => $slotid, class => 'slotfail'; - start 'td', colspan => 10; + start 'td', colspan => 8; start 'pre', class => 'minilog'; print encode_entities($log, '<>&"'); end 'pre'; end 'td'; end 'tr'; - trowa { style => 'display: none' }, ''; } } end 'tbody'; end 'table'; end 'div'; -end 'div'; -end 'body'; -end 'html'; +footer; diff --git a/report.cgi b/report.cgi index 2176dde..92e9fba 100755 --- a/report.cgi +++ b/report.cgi @@ -70,17 +70,7 @@ if ($ENV{HTTP_ACCEPT_ENCODING} =~ /gzip/) { print "\r\n"; } -doctype; -start 'html', xmlns => "http://www.w3.org/1999/xhtml"; -start 'head'; -tag 'meta', 'http-equiv' => "Content-Type", - 'content' => "text/html; charset=utf-8"; -tag 'link', rel => 'stylesheet', - type => 'text/css', - href => '//ffmpeg.org/default.css'; -tag 'link', rel => 'stylesheet', - type => 'text/css', - href => '/fate.css'; +head1; print "<title>FATE: $$hdr{slot} $$hdr{rev}</title>\n"; print <<EOF; <script type="text/javascript"> @@ -102,16 +92,9 @@ print <<EOF; } </script> EOF -end 'head'; - -start 'body'; -start 'div', id => 'container'; - -navbar; - -start 'div', id => 'body'; - -h1 "$$hdr{slot} $$hdr{rev}", id => 'title'; +head2; +print "$$hdr{slot} $$hdr{rev}"; +head3; start 'table', id => 'config'; trow 'Architecture', $$conf{arch}; @@ -120,7 +103,7 @@ trow 'CPU', $$conf{cpu}; trow 'OS', $$conf{os}; trow 'Owner', $owner if $owner; trow 'Compiler', $$conf{cc}; -trow 'Configuration', $$conf{config}; +trow 'Configuration', '<code>' . $$conf{config} . '</code>'; trow 'Comment', $$hdr{comment}; start 'tr'; td 'Revision'; @@ -147,7 +130,8 @@ end 'td'; end 'tr'; end; -start 'table', id => 'tests', class => 'replist'; +start 'div', class => 'table-responsive'; +start 'table', id => 'tests', class => 'table'; if ($nfail) { start 'thead'; start 'tr', class => 'fail'; @@ -197,23 +181,23 @@ if ($nfail) { td $$lastpass{$n}? $$lastpass{$n}{rev} : 'n / a'; } end 'tr'; + trowa { style => 'display: none' }, ''; # nee start 'tr', id => "$test-diff", class => 'diff'; - td $diff, colspan => 5; + td "<pre>$diff</pre>", colspan => 5; end 'tr'; + trowa { style => 'display: none' }, ''; start 'tr', id => "$test-err", class => 'diff'; - td $err, colspan => 5; + td "<pre>$err</pre>", colspan => 5; end 'tr'; } end 'tbody'; } elsif ($ntest) { - start 'tr'; th 'All tests successful', colspan => 3, class => 'pass'; end; + start 'tr', class => 'pass'; th 'All tests successful', colspan => 3; end; } else { my $class = $$hdr{status}? 'fail' : 'pass'; - start 'tr'; th 'No tests were run', colspan => 3, class => $class; end; + start 'tr', class => $class; th 'No tests were run', colspan => 3; end; } end 'table'; - -end 'div'; end 'div'; -end 'body'; -end 'html'; + +footer; ----------------------------------------------------------------------- Summary of changes: FATE.pm | 130 ++++++++++++++++++++++++++++++++++++++++---------- fate.css | 154 ++++++++++++++--------------------------------------------- history.cgi | 32 +++---------- index.cgi | 117 ++++++++++++++++++++++++-------------------- report.cgi | 46 ++++++------------ 5 files changed, 226 insertions(+), 253 deletions(-) hooks/post-receive --

6 7

ffserver: tests, use image2 instead of pgmyuv
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo(a)osg.samsung.com> | Mon Aug 25 12:24:02 2014 -0400| [b627385b4bd26bb45da5999fb12a8171fc224115] | committer: Reynaldo H. Verdejo Pinochet ffserver: tests, use image2 instead of pgmyuv Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo(a)osg.samsung.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b627385b4bd26bb45… --- tests/ffserver.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ffserver.conf b/tests/ffserver.conf index 3612843..1e7a685 100644 --- a/tests/ffserver.conf +++ b/tests/ffserver.conf @@ -57,7 +57,7 @@ FileMaxSize 100M # Fire up ffmpeg pointing at this stream -Launch ./ffmpeg -v 0 -y -f pgmyuv -i tests/vsynth1/%02d.pgm +Launch ./ffmpeg -v 0 -y -f image2 -i tests/vsynth1/%02d.pgm ACL allow localhost </Feed>

1 0

ituh263dec: Optimize new RL_VLC based decoding.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sun Aug 31 15:41:36 2014 +0200| [935453102bb5ccf868369f25049e0c3ae900f6bc] | committer: Reimar Döffinger ituh263dec: Optimize new RL_VLC based decoding. Together with the switch to RL_VLC this results in a speedup of about 30% in this inner loop. Overall speedup only relevant for medium to high bitrate streams. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=935453102bb5ccf86… --- libavcodec/ituh263dec.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index c481621..ad5a3cb 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -418,7 +418,7 @@ static void h263_decode_dquant(MpegEncContext *s){ static int h263_decode_block(MpegEncContext * s, int16_t * block, int n, int coded) { - int level, i, j, last, run; + int level, i, j, run; RLTable *rl = &ff_h263_rl_inter; const uint8_t *scan_table; GetBitContext gb= s->gb; @@ -493,26 +493,22 @@ retry: if (CONFIG_FLV_DECODER && s->h263_flv > 1) { int is11 = SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); - last = SHOW_UBITS(re, &s->gb, 1); - SKIP_CACHE(re, &s->gb, 1); - run = SHOW_UBITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 7) + 1; if (is11) { - SKIP_COUNTER(re, &s->gb, 6); + SKIP_COUNTER(re, &s->gb, 1 + 7); UPDATE_CACHE(re, &s->gb); level = SHOW_SBITS(re, &s->gb, 11); - SKIP_COUNTER(re, &s->gb, 1 + 1 + 6 + 11); + SKIP_COUNTER(re, &s->gb, 11); } else { - SKIP_CACHE(re, &s->gb, 6); + SKIP_CACHE(re, &s->gb, 7); level = SHOW_SBITS(re, &s->gb, 7); - SKIP_COUNTER(re, &s->gb, 1 + 1 + 6 + 7); + SKIP_COUNTER(re, &s->gb, 1 + 7 + 7); } } else { - last = SHOW_UBITS(re, &s->gb, 1); - SKIP_CACHE(re, &s->gb, 1); - run = SHOW_UBITS(re, &s->gb, 6); - SKIP_CACHE(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 7) + 1; + SKIP_CACHE(re, &s->gb, 7); level = (int8_t)SHOW_UBITS(re, &s->gb, 8); - SKIP_COUNTER(re, &s->gb, 1 + 6 + 8); + SKIP_COUNTER(re, &s->gb, 7 + 8); if(level == -128){ UPDATE_CACHE(re, &s->gb); if (s->codec_id == AV_CODEC_ID_RV10) { @@ -528,15 +524,19 @@ retry: } } } else { - run--; - last = run >= 192; - run &= 63; if (SHOW_UBITS(re, &s->gb, 1)) level = -level; SKIP_COUNTER(re, &s->gb, 1); } i += run; - if (i >= 64){ + if (i > 64){ + // redo update without last flag + i = i - run + ((run-1)&63); + if (i < 64) { + // only last marker, no overrun + block[scan_table[i]] = level; + break; + } if(s->alt_inter_vlc && rl == &ff_h263_rl_inter && !s->mb_intra){ CLOSE_READER(re, &s->gb); //Looks like a hack but no, it's the way it is supposed to work ... @@ -549,11 +549,8 @@ retry: av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d i:%d\n", s->mb_x, s->mb_y, s->mb_intra); return -1; } - j = scan_table[i]; + j = scan_table[i-1]; block[j] = level; - if (last) - break; - i++; } CLOSE_READER(re, &s->gb); }

1 0

h261dec: Optimize new RL_VLC based decoding.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sun Aug 31 15:41:13 2014 +0200| [c0d32686ddc1184e57b21802838d4654f2fd5389] | committer: Reimar Döffinger h261dec: Optimize new RL_VLC based decoding. Together with the switch to RL_VLC this results in about 10% speedup for this inner loop. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0d32686ddc1184e5… --- libavcodec/h261dec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 5f0eb59..f286d23 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -318,27 +318,25 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded) /* The remaining combinations of (run, level) are encoded with a * 20-bit word consisting of 6 bits escape, 6 bits run and 8 bits * level. */ - run = SHOW_UBITS(re, &s->gb, 6); + run = SHOW_UBITS(re, &s->gb, 6) + 1; SKIP_CACHE(re, &s->gb, 6); level = SHOW_SBITS(re, &s->gb, 8); SKIP_COUNTER(re, &s->gb, 6 + 8); } else if (level == 0) { break; } else { - run--; if (SHOW_UBITS(re, &s->gb, 1)) level = -level; SKIP_COUNTER(re, &s->gb, 1); } i += run; - if (i >= 64) { + if (i > 64) { av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n", s->mb_x, s->mb_y); return -1; } - j = scan_table[i]; + j = scan_table[i-1]; block[j] = level; - i++; } CLOSE_READER(re, &s->gb); }

1 0

h261, h263 decoders: convert to RL_VLC.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sun Aug 31 14:20:23 2014 +0200| [da0a670b3c3eaa1e700cd54342dc609d7474af26] | committer: Reimar Döffinger h261, h263 decoders: convert to RL_VLC. Some additional optimizations in following patch. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da0a670b3c3eaa1e7… --- libavcodec/flv.h | 1 - libavcodec/flvdec.c | 12 ---------- libavcodec/h261dec.c | 27 ++++++++++++++-------- libavcodec/ituh263dec.c | 58 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 60 insertions(+), 38 deletions(-) diff --git a/libavcodec/flv.h b/libavcodec/flv.h index 16bc88b..df50820 100644 --- a/libavcodec/flv.h +++ b/libavcodec/flv.h @@ -28,6 +28,5 @@ void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number); void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, int last); int ff_flv_decode_picture_header(MpegEncContext *s); -void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last); #endif /* AVCODEC_FLV_H */ diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 3b048f6..db413f2 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -22,18 +22,6 @@ #include "flv.h" #include "libavutil/imgutils.h" -void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last) -{ - int is11 = get_bits1(gb); - *last = get_bits1(gb); - *run = get_bits(gb, 6); - if (is11) { - *level = get_sbits(gb, 11); - } else { - *level = get_sbits(gb, 7); - } -} - int ff_flv_decode_picture_header(MpegEncContext *s) { int format, width, height; diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 301ecc1..5f0eb59 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -258,7 +258,7 @@ static int decode_mv_component(GetBitContext *gb, int v) static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded) { MpegEncContext *const s = &h->s; - int code, level, i, j, run; + int level, i, j, run; RLTable *rl = &ff_h261_rl_tcoeff; const uint8_t *scan_table; @@ -303,27 +303,32 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded) s->block_last_index[n] = i - 1; return 0; } + { + OPEN_READER(re, &s->gb); for (;;) { - code = get_vlc2(&s->gb, rl->vlc.table, TCOEFF_VLC_BITS, 2); - if (code < 0) { + UPDATE_CACHE(re, &s->gb); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TCOEFF_VLC_BITS, 2, 0); + if (run == 66 && level) { av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n", s->mb_x, s->mb_y); return -1; } - if (code == rl->n) { + if (run == 66) { /* escape */ /* The remaining combinations of (run, level) are encoded with a * 20-bit word consisting of 6 bits escape, 6 bits run and 8 bits * level. */ - run = get_bits(&s->gb, 6); - level = get_sbits(&s->gb, 8); - } else if (code == 0) { + run = SHOW_UBITS(re, &s->gb, 6); + SKIP_CACHE(re, &s->gb, 6); + level = SHOW_SBITS(re, &s->gb, 8); + SKIP_COUNTER(re, &s->gb, 6 + 8); + } else if (level == 0) { break; } else { - run = rl->table_run[code]; - level = rl->table_level[code]; - if (get_bits1(&s->gb)) + run--; + if (SHOW_UBITS(re, &s->gb, 1)) level = -level; + SKIP_COUNTER(re, &s->gb, 1); } i += run; if (i >= 64) { @@ -335,6 +340,8 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded) block[j] = level; i++; } + CLOSE_READER(re, &s->gb); + } s->block_last_index[n] = i - 1; return 0; } diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index e64c2bb..c481621 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -418,7 +418,7 @@ static void h263_decode_dquant(MpegEncContext *s){ static int h263_decode_block(MpegEncContext * s, int16_t * block, int n, int coded) { - int code, level, i, j, last, run; + int level, i, j, last, run; RLTable *rl = &ff_h263_rl_inter; const uint8_t *scan_table; GetBitContext gb= s->gb; @@ -479,40 +479,66 @@ static int h263_decode_block(MpegEncContext * s, int16_t * block, return 0; } retry: + { + OPEN_READER(re, &s->gb); for(;;) { - code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2); - if (code < 0){ + UPDATE_CACHE(re, &s->gb); + GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); + if (run == 66 && level){ av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n", s->mb_x, s->mb_y); return -1; } - if (code == rl->n) { + if (run == 66) { /* escape */ if (CONFIG_FLV_DECODER && s->h263_flv > 1) { - ff_flv2_decode_ac_esc(&s->gb, &level, &run, &last); + int is11 = SHOW_UBITS(re, &s->gb, 1); + SKIP_CACHE(re, &s->gb, 1); + last = SHOW_UBITS(re, &s->gb, 1); + SKIP_CACHE(re, &s->gb, 1); + run = SHOW_UBITS(re, &s->gb, 6); + if (is11) { + SKIP_COUNTER(re, &s->gb, 6); + UPDATE_CACHE(re, &s->gb); + level = SHOW_SBITS(re, &s->gb, 11); + SKIP_COUNTER(re, &s->gb, 1 + 1 + 6 + 11); + } else { + SKIP_CACHE(re, &s->gb, 6); + level = SHOW_SBITS(re, &s->gb, 7); + SKIP_COUNTER(re, &s->gb, 1 + 1 + 6 + 7); + } } else { - last = get_bits1(&s->gb); - run = get_bits(&s->gb, 6); - level = (int8_t)get_bits(&s->gb, 8); + last = SHOW_UBITS(re, &s->gb, 1); + SKIP_CACHE(re, &s->gb, 1); + run = SHOW_UBITS(re, &s->gb, 6); + SKIP_CACHE(re, &s->gb, 6); + level = (int8_t)SHOW_UBITS(re, &s->gb, 8); + SKIP_COUNTER(re, &s->gb, 1 + 6 + 8); if(level == -128){ + UPDATE_CACHE(re, &s->gb); if (s->codec_id == AV_CODEC_ID_RV10) { /* XXX: should patch encoder too */ - level = get_sbits(&s->gb, 12); + level = SHOW_SBITS(re, &s->gb, 12); + SKIP_COUNTER(re, &s->gb, 12); }else{ - level = get_bits(&s->gb, 5); - level |= get_sbits(&s->gb, 6)<<5; + level = SHOW_UBITS(re, &s->gb, 5); + SKIP_CACHE(re, &s->gb, 5); + level |= SHOW_SBITS(re, &s->gb, 6)<<5; + SKIP_COUNTER(re, &s->gb, 5 + 6); } } } } else { - run = rl->table_run[code]; - level = rl->table_level[code]; - last = code >= rl->last; - if (get_bits1(&s->gb)) + run--; + last = run >= 192; + run &= 63; + if (SHOW_UBITS(re, &s->gb, 1)) level = -level; + SKIP_COUNTER(re, &s->gb, 1); } i += run; if (i >= 64){ if(s->alt_inter_vlc && rl == &ff_h263_rl_inter && !s->mb_intra){ + CLOSE_READER(re, &s->gb); //Looks like a hack but no, it's the way it is supposed to work ... rl = &ff_rl_intra_aic; i = 0; @@ -529,6 +555,8 @@ retry: break; i++; } + CLOSE_READER(re, &s->gb); + } not_coded: if (s->mb_intra && s->h263_aic) { ff_h263_pred_acdc(s, block, n);

1 0

aacps_tablegen: replace TABLE_CONST by const.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sun Aug 31 12:41:11 2014 +0200| [3efc174fd6f4f5186ed05a307aab58a4ac6db90a] | committer: Reimar Döffinger aacps_tablegen: replace TABLE_CONST by const. Doesn't change generated code, just is more consistent and a bit less error-prone. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3efc174fd6f4f5186… --- libavcodec/aacps_tablegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacps_tablegen.c b/libavcodec/aacps_tablegen.c index 47d4205..f56930b 100644 --- a/libavcodec/aacps_tablegen.c +++ b/libavcodec/aacps_tablegen.c @@ -82,7 +82,7 @@ int main(void) write_float_3d_array(f34_2_4, 4, 8, 2); printf("};\n"); - printf("static TABLE_CONST DECLARE_ALIGNED(16, float, Q_fract_allpass)[2][50][3][2] = {\n"); + printf("static const DECLARE_ALIGNED(16, float, Q_fract_allpass)[2][50][3][2] = {\n"); write_float_4d_array(Q_fract_allpass, 2, 50, 3, 2); printf("};\n"); printf("static const DECLARE_ALIGNED(16, float, phi_fract)[2][50][2] = {\n");

1 0

intmath.h: Remove duplicated ARM include.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sun Aug 31 12:28:45 2014 +0200| [1a558cec64b40c4822975d8e6867df63a19bd057] | committer: Reimar Döffinger intmath.h: Remove duplicated ARM include. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a558cec64b40c482… --- libavutil/intmath.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavutil/intmath.h b/libavutil/intmath.h index e140d82..8f7a69e 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -35,10 +35,6 @@ * @{ */ -#if ARCH_ARM -# include "arm/intmath.h" -#endif - #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4) #ifndef ff_log2

1 0

avcodec/mjpegdec: fix green line at the bottom with upscale v
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Aug 31 15:33:30 2014 +0200| [f0d4f00f24d41441ebd63694df57ab203a764aa5] | committer: Michael Niedermayer avcodec/mjpegdec: fix green line at the bottom with upscale v Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0d4f00f24d41441e… --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index ac898bb..c3a3b86 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2131,7 +2131,7 @@ the_end: for (i = s->height - 1; i; i--) { uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[p])[i / 2 * s->linesize[p]]; uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[p])[(i + 1) / 2 * s->linesize[p]]; - if (src1 == src2) { + if (src1 == src2 || i == s->height - 1) { memcpy(dst, src1, w); } else { for (index = 0; index < w; index++)

1 0

avcodec/mjpegdec: fix green vertical line at the right with upscale h
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Aug 31 14:42:53 2014 +0200| [63a52ca134dc4ee648a547c7c410d547f371b481] | committer: Michael Niedermayer avcodec/mjpegdec: fix green vertical line at the right with upscale h Fixes Ticket3891 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63a52ca134dc4ee64… --- libavcodec/mjpegdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b6e0e68..ac898bb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2097,8 +2097,11 @@ the_end: continue; if (p==1 || p==2) w >>= hshift; + av_assert0(w > 0); for (i = 0; i < s->chroma_height; i++) { - for (index = w - 1; index; index--) { + if (is16bit) ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 2]; + else line[w - 1] = line[(w - 1) / 2]; + for (index = w - 2; index > 0; index--) { if (is16bit) ((uint16_t*)line)[index] = (((uint16_t*)line)[index / 2] + ((uint16_t*)line)[(index + 1) / 2]) >> 1; else

1 0

vf_drawtext: move "static const" before "struct".
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sun Aug 31 10:40:39 2014 +0200| [6d7aa437e1108dd8142ae5b850a00c109f95f07f] | committer: Reimar Döffinger vf_drawtext: move "static const" before "struct". This is consistent with all other occurrences. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d7aa437e1108dd81… --- libavfilter/vf_drawtext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 29cdfbb..4fbb6c0 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -268,11 +268,11 @@ AVFILTER_DEFINE_CLASS(drawtext); #define FT_ERRORDEF(e, v, s) { (e), (s) }, #define FT_ERROR_END_LIST { 0, NULL } }; -struct ft_error +static const struct ft_error { int err; const char *err_msg; -} static const ft_errors[] = +} ft_errors[] = #include FT_ERRORS_H #define FT_ERRMSG(e) ft_errors[e].err_msg

1 0