July 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

doc/indevs: mention required configure options
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Lou Logan <lou(a)lrcd.com> | Thu Jul 31 14:44:59 2014 -0800| [d76675d9c015eb0203400d3e00c485467a9943d8] | committer: Lou Logan doc/indevs: mention required configure options For x11grab, libcdio, and libdc1394 input devices. Signed-off-by: Lou Logan <lou(a)lrcd.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d76675d9c015eb020… --- doc/indevs.texi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index e0e7e67..ce409b9 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -488,7 +488,8 @@ ffplay -f lavfi "movie=test.avi[out0];amovie=test.wav[out1]" Audio-CD input device based on cdio. To enable this input device during configuration you need libcdio -installed on your system. +installed on your system. Requires the configure option +@code{--enable-libcdio}. This device allows playing and grabbing from an Audio-CD. @@ -502,6 +503,8 @@ ffmpeg -f libcdio -i /dev/sr0 cd.wav IIDC1394 input device, based on libdc1394 and libraw1394. +Requires the configure option @code{--enable-libdc1394}. + @section openal The OpenAL input device provides audio capture on all systems with a @@ -830,6 +833,9 @@ other filename will be interpreted as device number 0. X11 video input device. +Depends on X11, Xext, and Xfixes. Requires the configure option +@code{--enable-x11grab}. + This device allows one to capture a region of an X11 display. The filename passed as input has the syntax:

1 0

x86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12}
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Jul 29 18:07:27 2014 -0300| [62baf5b8530dcda2afb29d697da2d700ccedf6ae] | committer: Michael Niedermayer x86/hevc_deblock: use existing x86util transpose macro in chroma_{10, 12} Cosmetic change. No measurable difference in speed. Signed-off-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62baf5b8530dcda2a… --- libavcodec/x86/hevc_deblock.asm | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm index 2d4353a..5951e86 100644 --- a/libavcodec/x86/hevc_deblock.asm +++ b/libavcodec/x86/hevc_deblock.asm @@ -138,31 +138,22 @@ INIT_XMM sse2 ; in: 4 rows of 8 words in m0..m3 ; out: 8 rows of 4 words in %1..%8 %macro TRANSPOSE8x4W_STORE 9 + TRANSPOSE4x4W 0, 1, 2, 3, 4 + pxor m5, m5; zeros reg CLIPW m0, m5, %9 CLIPW m1, m5, %9 CLIPW m2, m5, %9 CLIPW m3, m5, %9 - punpckhwd m4, m0, m1 - punpcklwd m0, m1 - punpckhwd m5, m2, m3 - punpcklwd m2, m3 - punpckhdq m6, m0, m2 - punpckldq m0, m2 - movq %1, m0 movhps %2, m0 - movq %3, m6 - movhps %4, m6 - - punpckhdq m6, m4, m5 - punpckldq m4, m5 - - movq %5, m4 - movhps %6, m4 - movq %7, m6 - movhps %8, m6 + movq %3, m1 + movhps %4, m1 + movq %5, m2 + movhps %6, m2 + movq %7, m3 + movhps %8, m3 %endmacro ; in: 8 rows of 8 bytes in %1..%8

1 0

avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jul 31 21:01:07 2014 +0200| [39133efc1b991d91683f7cc36d2ef32896556aa1] | committer: Michael Niedermayer avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue Found-by: CSA and Timothy Gu <timothygu99(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39133efc1b991d916… --- libavdevice/oss_audio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index d27da85..951acbc 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -83,6 +83,9 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output, * usable. If OSS is not usable the SNDCTL_DSP_SETFMTS later is going to * fail anyway. `err =` kept to eliminate compiler warning. */ err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp); + if (err < 0) { + av_log(s1, AV_LOG_WARNING, "SNDCTL_DSP_GETFMTS: %s\n", strerror(errno)); + } #if HAVE_BIGENDIAN if (tmp & AFMT_S16_BE) {

1 0

avfilter/trim: remove duplicate assignment
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jul 31 20:53:15 2014 +0200| [fc19edd8f50051aad44ff85b736aecc57cb3abee] | committer: Michael Niedermayer avfilter/trim: remove duplicate assignment Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc19edd8f50051aad… --- libavfilter/trim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 04e82da..468dc03 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -244,7 +244,7 @@ static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; TrimContext *s = ctx->priv; - int64_t start_sample, end_sample = frame->nb_samples; + int64_t start_sample, end_sample; int64_t pts; int drop;

1 0

avutil/pixdesc: remove unneeded assignment
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jul 31 20:44:46 2014 +0200| [a75a60f68610c87ca4f2eab081f946d01da506d8] | committer: Michael Niedermayer avutil/pixdesc: remove unneeded assignment Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a75a60f68610c87ca… --- libavutil/pixdesc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index f00907d..9792056 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2263,7 +2263,6 @@ enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, en if(!has_alpha) loss_mask &= ~FF_LOSS_ALPHA; - dst_pix_fmt = AV_PIX_FMT_NONE; score1 = get_pix_fmt_score(dst_pix_fmt1, src_pix_fmt, &loss1, loss_mask); score2 = get_pix_fmt_score(dst_pix_fmt2, src_pix_fmt, &loss2, loss_mask);

1 0

avcodec/diracdec: remove unneeded assignment
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jul 31 20:40:10 2014 +0200| [5bedbc3da281b6ee53593de1d4ff5cd3976da199] | committer: Michael Niedermayer avcodec/diracdec: remove unneeded assignment Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bedbc3da281b6ee5… --- libavcodec/diracdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 30e6138..f673397 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1959,7 +1959,6 @@ static int dirac_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int min_num = s->delay_frames[0]->avframe->display_picture_number; /* Too many delayed frames, so we display the frame with the lowest pts */ av_log(avctx, AV_LOG_ERROR, "Delay frame overflow\n"); - delayed_frame = s->delay_frames[0]; for (i = 1; s->delay_frames[i]; i++) if (s->delay_frames[i]->avframe->display_picture_number < min_num)

1 0

avcodec/flac_parser: remove duplicate assignent
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jul 31 20:35:32 2014 +0200| [590c2996ee115a185d99433937c5d51945780d3c] | committer: Michael Niedermayer avcodec/flac_parser: remove duplicate assignent Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=590c2996ee115a185… --- libavcodec/flac_parser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 68c915e..a031dbf 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -667,7 +667,6 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx, } } - curr = fpc->headers; for (curr = fpc->headers; curr; curr = curr->next) { if (curr->max_score > 0 && (!fpc->best_header || curr->max_score > fpc->best_header->max_score)) {

1 0

avcodec/ratecontrol: remove unneeded statement
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Jul 31 20:27:19 2014 +0200| [1af563b5dfeaf1e0d0a5ef8397dee59c81643132] | committer: Michael Niedermayer avcodec/ratecontrol: remove unneeded statement Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1af563b5dfeaf1e0d… --- libavcodec/ratecontrol.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index a621f8f..72b3f44 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -848,7 +848,6 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) rcc->mv_bits_sum[pict_type] += rce->mv_bits; rcc->frame_count[pict_type]++; - bits = rce->i_tex_bits + rce->p_tex_bits; rate_factor = rcc->pass1_wanted_bits / rcc->pass1_rc_eq_output_sum * br_compensation;

1 0

dict.c: minor simplification.
by git＠videolan.org 31 Jul '14

31 Jul '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Tue Jul 29 21:23:14 2014 +0200| [f0de01856fde4a104254569f9d5c80a80cac49cc] | committer: Reimar Döffinger dict.c: minor simplification. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0de01856fde4a104… --- libavutil/dict.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavutil/dict.c b/libavutil/dict.c index 358958c..aea8910 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -90,10 +90,9 @@ int av_dict_set(AVDictionary **pm, const char *key, const char *value, } else { AVDictionaryEntry *tmp = av_realloc(m->elems, (m->count + 1) * sizeof(*m->elems)); - if (tmp) - m->elems = tmp; - else + if (!tmp) return AVERROR(ENOMEM); + m->elems = tmp; } if (value) { if (flags & AV_DICT_DONT_STRDUP_KEY)

1 0