Changeset 56481 in webkit


Ignore:
Timestamp:
Mar 24, 2010 9:08:43 PM (14 years ago)
Author:
scherkus@chromium.org
Message:

2010-03-24 Andrew Scherkus <scherkus@chromium.org>

Reviewed by Eric Carlson, Eric Seidel and David Levin.

Update a few more media layout tests to choose test clips based on codec support.

https://bugs.webkit.org/show_bug.cgi?id=30435

  • media/audio-constructor-src.html: Switched to use findMediaFile().
  • media/audio-play-event-expected.txt: Updated results.
  • media/audio-play-event.html: Switched to use findMediaFile().
  • media/video-no-audio.html: Ditto.
  • media/video-source-add-src.html: Ditto.
  • media/video-src-change.html: Closed p tag.
  • platform/mac-leopard/media/video-no-audio-expected.checksum: New results due to changing source video.
  • platform/mac-leopard/media/video-no-audio-expected.png: Ditto.
  • platform/mac-leopard/media/video-no-audio-expected.txt: Ditto.
  • platform/mac/media/video-no-audio-expected.checksum: Ditto.
  • platform/mac/media/video-no-audio-expected.png: Ditto.
  • platform/mac/media/video-no-audio-expected.txt: Ditto.
Location:
trunk/LayoutTests
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r56462 r56481  
     12010-03-24  Andrew Scherkus  <scherkus@chromium.org>
     2
     3        Reviewed by Eric Carlson, Eric Seidel and David Levin.
     4
     5        Update a few more media layout tests to choose test clips based on codec support.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=30435
     8
     9        * media/audio-constructor-src.html: Switched to use findMediaFile().
     10        * media/audio-play-event-expected.txt: Updated results.
     11        * media/audio-play-event.html: Switched to use findMediaFile().
     12        * media/video-no-audio.html: Ditto.
     13        * media/video-source-add-src.html: Ditto.
     14        * media/video-src-change.html: Closed p tag.
     15        * platform/mac-leopard/media/video-no-audio-expected.checksum: New results due to changing source video.
     16        * platform/mac-leopard/media/video-no-audio-expected.png: Ditto.
     17        * platform/mac-leopard/media/video-no-audio-expected.txt: Ditto.
     18        * platform/mac/media/video-no-audio-expected.checksum: Ditto.
     19        * platform/mac/media/video-no-audio-expected.png: Ditto.
     20        * platform/mac/media/video-no-audio-expected.txt: Ditto.
     21
    1222010-03-24  Eric Uhrhane <ericu@chromium.org>
    223
  • trunk/LayoutTests/media/audio-constructor-src.html

    r50063 r56481  
    44<script src=video-test.js></script>
    55<script>
    6     var audio = new Audio(findMediaFile("audio", "content/test"));
     6    var audioFile = findMediaFile("audio", "content/test");
     7    var audio = new Audio(audioFile);
    78    mediaElement = audio;
    89
    910    testExpected("audio instanceof HTMLAudioElement", true);
    1011
    11     waitForEvent("loadstart", function () { testExpected("relativeURL(audio.currentSrc)", "content/test.wav"); });
     12    waitForEvent("loadstart", function () { testExpected("relativeURL(audio.currentSrc)", audioFile); });
    1213
    1314    waitForEventAndEnd("canplaythrough");
  • trunk/LayoutTests/media/audio-play-event-expected.txt

    r47801 r56481  
    11Test that a 'play' event listener is triggered when fired by a new audio element.
    22
    3 RUN(mediaElement.src = 'content/silence.mpg')
     3RUN(mediaElement.src = findMediaFile('audio', 'content/test'))
    44RUN(mediaElement.volume = 1)
    55RUN(mediaElement.play())
  • trunk/LayoutTests/media/audio-play-event.html

    r47801 r56481  
    22    <head>
    33        <title>'play' event</title>
     4        <script src=media-file.js></script>
    45        <script src=video-test.js></script>
    56
     
    1415                waitForEvent('play');
    1516                waitForEvent('playing', function() { endTest(); });
    16                 run("mediaElement.src = 'content/silence.mpg'");
     17                run("mediaElement.src = findMediaFile('audio', 'content/test')");
    1718                run("mediaElement.volume = 1");
    1819                run("mediaElement.play()");
  • trunk/LayoutTests/media/video-no-audio.html

    r47515 r56481  
    11<html>
    22    <head>
     3        <script src=media-file.js></script>
    34        <script>
    45            if (window.layoutTestController)
    56                layoutTestController.waitUntilDone();
    67   
     8            function start()
     9            {
     10                setSrcByTagName("video", findMediaFile("video", "content/counting"));
     11            }
     12
    713            function finish()
    814            {
     
    1218        </script>
    1319    </head>
    14     <body>
     20    <body onload="start()">
    1521        <p>Movie with no audio track. The volume button should not render.</p>
    16         <video src="content/scaled-matrix.mov" controls onload="finish()"></video>
     22        <video controls oncanplaythrough="finish()"></video>
    1723    </body>
    1824</html>
  • trunk/LayoutTests/media/video-source-add-src.html

    r48485 r56481  
    11<html>
    22<body>
     3    <script src=media-file.js></script>
    34    <script src=video-test.js></script>
    45
    56    <video controls>
    67        <source src=content/test.mp4 type="video/mpeg; codecs=&quot;avc1.4D400C&quot;">
     8        <source src=content/test.ogv type="video/ogg; codecs=&quot;theora,vorbis&quot;">
    79    </video>
    810
     
    1416        {
    1517            consoleWrite("");
    16             testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     18            testExpected("relativeURL(video.currentSrc)", findMediaFile("video", "content/test"));
    1719            if (++counter == 2)
    1820                endTest();
  • trunk/LayoutTests/media/video-src-change.html

    r50063 r56481  
    88    2. Test that changing src attribute triggers load after a load fails.<br>
    99    3. Test that changing src does not trigger load once a file is known to be valid.
    10     </p
     10    </p>
    1111    <script src=media-file.js></script>
    1212    <script src=video-test.js></script>
  • trunk/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.checksum

    r52094 r56481  
    1 ff94259493306a136e4509ba2aa98349
     1517e6c0a4bb7194e655c2d26b8103acf
  • trunk/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.txt

    r52094 r56481  
    77        RenderText {#text} at (0,0) size 413x18
    88          text run at (0,0) width 413: "Movie with no audio track. The volume button should not render."
    9       RenderBlock (anonymous) at (0,34) size 784x480
     9      RenderBlock (anonymous) at (0,34) size 784x288
    1010        RenderText {#text} at (0,0) size 0x0
    1111        RenderText {#text} at (0,0) size 0x0
    1212        RenderText {#text} at (0,0) size 0x0
    13 layer at (8,42) size 640x480
    14   RenderVideo {VIDEO} at (0,0) size 640x480
    15 layer at (8,42) size 640x480
    16   RenderBlock (relative positioned) {DIV} at (0,0) size 640x480
    17 layer at (8,497) size 640x25
    18   RenderFlexibleBox (positioned) {DIV} at (0,455) size 640x25
     13layer at (8,42) size 352x288
     14  RenderVideo {VIDEO} at (0,0) size 352x288
     15layer at (8,42) size 352x288
     16  RenderBlock (relative positioned) {DIV} at (0,0) size 352x288
     17layer at (8,305) size 352x25
     18  RenderFlexibleBox (positioned) {DIV} at (0,263) size 352x25
    1919    RenderButton {INPUT} at (6,3) size 18x18
    2020    RenderButton {INPUT} at (32,4) size 16x16
    21     RenderFlexibleBox {DIV} at (49,5) size 591x15
    22       RenderSlider {INPUT} at (45,2) size 501x13
     21    RenderFlexibleBox {DIV} at (49,5) size 303x15
     22      RenderSlider {INPUT} at (45,2) size 213x13
    2323        RenderBlock {DIV} at (0,2) size 10x8
    24 layer at (57,504) size 45x11
     24layer at (57,312) size 45x11
    2525  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
    2626    RenderBlock (anonymous) at (9,0) size 26x11
    2727      RenderText {#text} at (0,0) size 26x11
    2828        text run at (0,0) width 26: "00:00"
    29 layer at (603,504) size 45x11
    30   RenderFlexibleBox {DIV} at (546,2) size 45x11 [color=#FFFFFF]
     29layer at (315,312) size 45x11
     30  RenderFlexibleBox {DIV} at (258,2) size 45x11 [color=#FFFFFF]
    3131    RenderBlock (anonymous) at (6,0) size 32x11
    3232      RenderText {#text} at (0,0) size 32x11
  • trunk/LayoutTests/platform/mac/media/video-no-audio-expected.checksum

    r49150 r56481  
    1 348fe85a8bfb2d5b030e8e3dce4a89b2
     195be42094a9892f2541aa8c86a3d118a
  • trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt

    r52055 r56481  
    77        RenderText {#text} at (0,0) size 413x18
    88          text run at (0,0) width 413: "Movie with no audio track. The volume button should not render."
    9       RenderBlock (anonymous) at (0,34) size 784x480
     9      RenderBlock (anonymous) at (0,34) size 784x288
    1010        RenderText {#text} at (0,0) size 0x0
    1111        RenderText {#text} at (0,0) size 0x0
    1212        RenderText {#text} at (0,0) size 0x0
    13 layer at (8,42) size 640x480
    14   RenderVideo {VIDEO} at (0,0) size 640x480
    15 layer at (8,42) size 640x480
    16   RenderBlock (relative positioned) {DIV} at (0,0) size 640x480
    17 layer at (8,497) size 640x25
    18   RenderFlexibleBox (positioned) {DIV} at (0,455) size 640x25
     13layer at (8,42) size 352x288
     14  RenderVideo {VIDEO} at (0,0) size 352x288
     15layer at (8,42) size 352x288
     16  RenderBlock (relative positioned) {DIV} at (0,0) size 352x288
     17layer at (8,305) size 352x25
     18  RenderFlexibleBox (positioned) {DIV} at (0,263) size 352x25
    1919    RenderButton {INPUT} at (6,3) size 18x18
    2020    RenderButton {INPUT} at (32,4) size 16x16
    21     RenderFlexibleBox {DIV} at (49,5) size 561x15
    22       RenderSlider {INPUT} at (45,2) size 471x13
     21    RenderFlexibleBox {DIV} at (49,5) size 273x15
     22      RenderSlider {INPUT} at (45,2) size 183x13
    2323        RenderBlock {DIV} at (0,2) size 10x8
    24     RenderButton {INPUT} at (617,4) size 16x16
    25 layer at (57,504) size 45x11
     24    RenderButton {INPUT} at (329,4) size 16x16
     25layer at (57,312) size 45x11
    2626  RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
    2727    RenderBlock (anonymous) at (9,0) size 26x11
    2828      RenderText {#text} at (0,0) size 26x11
    2929        text run at (0,0) width 26: "00:00"
    30 layer at (573,504) size 45x11
    31   RenderFlexibleBox {DIV} at (516,2) size 45x11 [color=#FFFFFF]
     30layer at (285,312) size 45x11
     31  RenderFlexibleBox {DIV} at (228,2) size 45x11 [color=#FFFFFF]
    3232    RenderBlock (anonymous) at (6,0) size 32x11
    3333      RenderText {#text} at (0,0) size 32x11
Note: See TracChangeset for help on using the changeset viewer.