Remove FORMAT_RGB from gfx::PngCodec

media/gpu/video_decode_accelerator_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or
 //   Win/EGL.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
@@ skipping 1509 matching lines @@
     LOG(INFO) << "Decoder " << i << " fps: " << client->frames_per_second();
     if (!render_as_thumbnails) {
       int min_fps = suppress_rendering ? video_file->min_fps_no_render
                                        : video_file->min_fps_render;
       if (min_fps > 0 && !test_reuse_delay)
         EXPECT_GT(client->frames_per_second(), min_fps);
     }
   }
 
   if (render_as_thumbnails) {
-    std::vector<unsigned char> rgb;
-    bool alpha_solid;
+    std::vector<unsigned char> rgba;
     base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
     g_env->GetRenderingTaskRunner()->PostTask(
-        FROM_HERE, base::Bind(&RenderingHelper::GetThumbnailsAsRGB,
-                              base::Unretained(&rendering_helper_), &rgb,
-                              &alpha_solid, &done));
+        FROM_HERE,
+        base::Bind(&RenderingHelper::GetThumbnailsAsRGBA,
+                   base::Unretained(&rendering_helper_), &rgba, &done));
     done.Wait();
 
+    size_t num_pixels = rgba.size() / 4;
+    for (size_t i = 0; i < num_pixels; i++) {
+      EXPECT_EQ(rgba[4 * i + 3], 0xff) << "RGBA frame had incorrect alpha";

[Owen Lin, 2017/06/16 01:24:05]

If the values of alpha are wrong, this may leave tons of logs.

[msarett1, 2017/06/16 02:11:03]

FIxed.

+    }
+
     std::vector<std::string> golden_md5s;
     std::string md5_string = base::MD5String(
-        base::StringPiece(reinterpret_cast<char*>(&rgb[0]), rgb.size()));
+        base::StringPiece(reinterpret_cast<char*>(&rgba[0]), rgba.size()));

[Owen Lin, 2017/06/15 07:28:05]

This will changes the md5 checksum. You need update the golden md5s in that
case.

[msarett, 2017/06/15 18:06:44]

Can you help with how to do this?  I am able to build and run the tests from a
Windows checkout of chromium.  But they fail for me at ToT, it looks like I am
missing test resources.

Note: Google Test filter =
ResourceExhaustion/VideoDecodeAcceleratorParamTest.TestSimpleDecode/1
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from ResourceExhaustion/VideoDecodeAcceleratorParamTest
[ RUN      ]
ResourceExhaustion/VideoDecodeAcceleratorParamTest.TestSimpleDecode/1
[432:8612:0615/140309.549:16680359:FATAL:video_decode_accelerator_unittest.cc(1261)]
Assert failed: base::ReadFileToString(GetTestDataFile(filepath),
&video_file->data_str). test_video_file: test-25fps.h264

[Owen Lin, 2017/06/16 01:24:05]

The test data stream and golden md5 golden value are in media/test/data/, for
example test-25fps.h264(.md5). 

But I would really suggest not to change the way of calculating md5s. Please see
test-25fps.h264, we will need to run the test on many different boards again to
get the golden values.

I would suggest to have a function to convert RGBA and RGB here to make sure the
md5 is not changed.

[msarett1, 2017/06/16 02:11:03]

Ahh yes, that's a much better idea.  Done.  I think this should work now!

     ReadGoldenThumbnailMD5s(test_video_files_[0].get(), &golden_md5s);
     std::vector<std::string>::iterator match =
         find(golden_md5s.begin(), golden_md5s.end(), md5_string);
     if (match == golden_md5s.end()) {
-      // Convert raw RGB into PNG for export.
+      // Convert raw RGBA into PNG for export.
       std::vector<unsigned char> png;
-      gfx::PNGCodec::Encode(&rgb[0],
-                            gfx::PNGCodec::FORMAT_RGB,
+      gfx::PNGCodec::Encode(&rgba[0], gfx::PNGCodec::FORMAT_RGBA,
                             kThumbnailsPageSize,
-                            kThumbnailsPageSize.width() * 3,
-                            true,
-                            std::vector<gfx::PNGCodec::Comment>(),
-                            &png);
+                            kThumbnailsPageSize.width() * 4, true,
+                            std::vector<gfx::PNGCodec::Comment>(), &png);
 
       LOG(ERROR) << "Unknown thumbnails MD5: " << md5_string;
 
       base::FilePath filepath(test_video_files_[0]->file_name);
       if (!g_thumbnail_output_dir.empty() &&
           base::DirectoryExists(g_thumbnail_output_dir)) {
         // Write bad thumbnails image to where --thumbnail_output_dir assigned.
         filepath = g_thumbnail_output_dir.Append(filepath.BaseName());
       } else {
         // Fallback to write to test data directory.
         // Note: test data directory is not writable by vda_unittest while
         //       running by autotest. It should assign its resultsdir as output
         //       directory.
         filepath = GetTestDataFile(filepath);
       }
       filepath = filepath.AddExtension(FILE_PATH_LITERAL(".bad_thumbnails"));
       filepath = filepath.AddExtension(FILE_PATH_LITERAL(".png"));
       LOG(INFO) << "Write bad thumbnails image to: "
                 << filepath.value().c_str();
       int num_bytes = base::WriteFile(
           filepath, reinterpret_cast<char*>(&png[0]), png.size());
       EXPECT_EQ(num_bytes, static_cast<int>(png.size()));
     }
     EXPECT_NE(match, golden_md5s.end());
-    EXPECT_EQ(alpha_solid, true) << "RGBA frame had incorrect alpha";
   }
 
   // Output the frame delivery time to file
   // We can only make performance/correctness assertions if the decoder was
   // allowed to finish.
   if (g_output_log != NULL && delete_decoder_state >= CS_FLUSHED) {
     base::File output_file(
         base::FilePath(g_output_log),
         base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);
     for (size_t i = 0; i < num_concurrent_decoders; ++i) {
@@ skipping 327 matching lines @@
       media::g_thumbnail_output_dir = base::FilePath(it->second.c_str());
     }
   }
 
   base::ShadowingAtExitManager at_exit_manager;
 
   return base::LaunchUnitTestsSerially(
       argc, argv,
       base::Bind(&media::VDATestSuite::Run, base::Unretained(&test_suite)));
 }