Revert hardware decoder changes causing ChromeOS HW test crash.

media/filters/skcanvas_video_renderer.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.
 
 #include "media/filters/skcanvas_video_renderer.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "third_party/libyuv/include/libyuv.h"
@@ skipping 34 matching lines @@
     case VideoFrame::YV12A:
     case VideoFrame::YV12J:
     case VideoFrame::YV24:
     case VideoFrame::NV12:
       return true;
     case VideoFrame::UNKNOWN:
     case VideoFrame::NATIVE_TEXTURE:
 #if defined(VIDEO_HOLE)
     case VideoFrame::HOLE:
 #endif  // defined(VIDEO_HOLE)
-    case VideoFrame::ARGB:
       return false;
   }
   NOTREACHED() << "Invalid videoframe format provided: " << format;
   return false;
 }
 
 bool IsJPEGColorSpace(media::VideoFrame::Format format) {
   switch (format) {
     case VideoFrame::YV12J:
       return true;
     case VideoFrame::YV12:
     case VideoFrame::YV16:
     case VideoFrame::I420:
     case VideoFrame::YV12A:
     case VideoFrame::YV24:
     case VideoFrame::NV12:
     case VideoFrame::UNKNOWN:
     case VideoFrame::NATIVE_TEXTURE:
 #if defined(VIDEO_HOLE)
     case VideoFrame::HOLE:
 #endif  // defined(VIDEO_HOLE)
-    case VideoFrame::ARGB:
       return false;
   }
   NOTREACHED() << "Invalid videoframe format provided: " << format;
   return false;
 }
 
 bool IsYUVOrNative(media::VideoFrame::Format format) {
   return IsYUV(format) || format == media::VideoFrame::NATIVE_TEXTURE;
 }
 
@@ skipping 105 matching lines @@
       libyuv::ARGBToABGR(static_cast<uint8*>(rgb_pixels),
                          row_bytes,
                          static_cast<uint8*>(rgb_pixels),
                          row_bytes,
                          video_frame->visible_rect().width(),
                          video_frame->visible_rect().height());
 #endif
       break;
 
     case media::VideoFrame::NATIVE_TEXTURE: {
+      DCHECK_EQ(video_frame->format(), media::VideoFrame::NATIVE_TEXTURE);
       SkBitmap tmp;
       tmp.installPixels(
           SkImageInfo::MakeN32Premul(video_frame->visible_rect().width(),
                                      video_frame->visible_rect().height()),
           rgb_pixels,
           row_bytes);
       video_frame->ReadPixelsFromNativeTexture(tmp);
       break;
     }
-
-    case media::VideoFrame::ARGB:
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // anonymous namespace
 
 // Generates an RGB image from a VideoFrame. Convert YUV to RGB plain on GPU.
 class VideoImageGenerator : public SkImageGenerator {
@@ skipping 232 matching lines @@
   last_frame_timestamp_ = media::kNoTimestamp();
 }
 
 void SkCanvasVideoRenderer::ResetAcceleratedLastFrame() {
   accelerated_last_frame_.reset();
   accelerated_generator_ = nullptr;
   accelerated_last_frame_timestamp_ = media::kNoTimestamp();
 }
 
 }  // namespace media