Change log level to show real errors in release mode

content/common/gpu/media/tegra_v4l2_video_device.cc

 // Copyright 2014 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 <dlfcn.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
@@ skipping 37 matching lines @@
 TEGRAV4L2_SYM(Munmap);
 TEGRAV4L2_SYM(UseEglImage);
 
 #undef TEGRAV4L2_SYM
 
 class TegraFunctionSymbolFinder {
  public:
   TegraFunctionSymbolFinder() : initialized_(false) {
     if (!dlopen("/usr/lib/libtegrav4l2.so",
                 RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE)) {
-      DLOG(ERROR) << "Failed to load libtegrav4l2.so ";
+      LOG(ERROR) << "Failed to load libtegrav4l2.so ";

[Pawel Osciak, 2014/10/03 00:07:39]

Actually, sorry, I'm changing my mind here, but we should not LOG(ERROR)
failures to load libraries and open Tegra device. This is because we expect this
to fail on non-Tegra as the part of detection which device to use in
V4L2Device::Create.

So here let's keep DLOG please.

[henryhsu, 2014/10/03 03:01:30]

Done.

       return;
     }
 #define TEGRAV4L2_DLSYM_OR_RETURN_ON_ERROR(name)          \
   do {                                                    \
     TegraV4L2_##name = reinterpret_cast<TegraV4L2##name>( \
         dlsym(RTLD_DEFAULT, "TegraV4L2_" #name));         \
     if (TegraV4L2_##name == NULL) {                       \
       LOG(ERROR) << "Failed to dlsym TegraV4L2_" #name;   \
       return;                                             \
     }                                                     \
@@ skipping 33 matching lines @@
   }
 }
 
 int TegraV4L2Device::Ioctl(int flags, void* arg) {
   return HANDLE_EINTR(TegraV4L2_Ioctl(device_fd_, flags, arg));
 }
 
 bool TegraV4L2Device::Poll(bool poll_device, bool* event_pending) {
   if (HANDLE_EINTR(TegraV4L2_Poll(device_fd_, poll_device, event_pending)) ==
       -1) {
-    DLOG(ERROR) << "TegraV4L2Poll returned -1 ";
+    LOG(ERROR) << "TegraV4L2Poll returned -1 ";
     return false;
   }
   return true;
 }
 
 void* TegraV4L2Device::Mmap(void* addr,
                             unsigned int len,
                             int prot,
                             int flags,
                             unsigned int offset) {
   return TegraV4L2_Mmap(addr, len, prot, flags, device_fd_, offset);
 }
 
 void TegraV4L2Device::Munmap(void* addr, unsigned int len) {
   TegraV4L2_Munmap(addr, len);
 }
 
 bool TegraV4L2Device::SetDevicePollInterrupt() {
   if (HANDLE_EINTR(TegraV4L2_SetDevicePollInterrupt(device_fd_)) == -1) {
-    DLOG(ERROR) << "Error in calling TegraV4L2SetDevicePollInterrupt";
+    LOG(ERROR) << "Error in calling TegraV4L2SetDevicePollInterrupt";
     return false;
   }
   return true;
 }
 
 bool TegraV4L2Device::ClearDevicePollInterrupt() {
   if (HANDLE_EINTR(TegraV4L2_ClearDevicePollInterrupt(device_fd_)) == -1) {
-    DLOG(ERROR) << "Error in calling TegraV4L2ClearDevicePollInterrupt";
+    LOG(ERROR) << "Error in calling TegraV4L2ClearDevicePollInterrupt";
     return false;
   }
   return true;
 }
 
 bool TegraV4L2Device::Initialize() {
   const char* device_path = NULL;
   switch (type_) {
     case kDecoder:
       device_path = kDecoderDevice;
       break;
     case kEncoder:
       device_path = kEncoderDevice;
       break;
     case kImageProcessor:
       DVLOG(1) << "Device type " << type_ << " not supported on this platform";
       return false;
   }
 
   if (!g_tegra_function_symbol_finder_.Get().initialized()) {
-    DLOG(ERROR) << "Unable to initialize functions ";
+    LOG(ERROR) << "Unable to initialize functions";

[Pawel Osciak, 2014/10/03 00:07:39]

Here as well.

[henryhsu, 2014/10/03 03:01:30]

Done.

     return false;
   }
   device_fd_ = HANDLE_EINTR(
       TegraV4L2_Open(device_path, O_RDWR | O_NONBLOCK | O_CLOEXEC));
   if (device_fd_ == -1) {
-    DLOG(ERROR) << "Unable to open device " << device_path;
+    LOG(ERROR) << "Unable to open device " << device_path;

[Pawel Osciak, 2014/10/03 00:07:39]

And here.

[henryhsu, 2014/10/03 03:01:30]

Done.

     return false;
   }
   return true;
 }
 
 EGLImageKHR TegraV4L2Device::CreateEGLImage(EGLDisplay egl_display,
                                             EGLContext egl_context,
                                             GLuint texture_id,
                                             gfx::Size /* frame_buffer_size */,
                                             unsigned int buffer_index,
                                             size_t /* planes_count */) {
   DVLOG(3) << "CreateEGLImage()";
   EGLint attr = EGL_NONE;
   EGLImageKHR egl_image =
       eglCreateImageKHR(egl_display,
                         egl_context,
                         EGL_GL_TEXTURE_2D_KHR,
                         reinterpret_cast<EGLClientBuffer>(texture_id),
                         &attr);
   if (egl_image == EGL_NO_IMAGE_KHR) {
+    LOG(ERROR) << "Unable to create EGL image";
     return egl_image;
   }
   if (TegraV4L2_UseEglImage(device_fd_, buffer_index, egl_image) != 0) {
+    LOG(ERROR) << "Unable to use EGL image";
     eglDestroyImageKHR(egl_display, egl_image);
     egl_image = EGL_NO_IMAGE_KHR;
   }
   return egl_image;
 }
 
 EGLBoolean TegraV4L2Device::DestroyEGLImage(EGLDisplay egl_display,
                                             EGLImageKHR egl_image) {
   return eglDestroyImageKHR(egl_display, egl_image);
 }
 
 GLenum TegraV4L2Device::GetTextureTarget() { return GL_TEXTURE_2D; }
 
 uint32 TegraV4L2Device::PreferredInputFormat() {
   // TODO(posciak): We should support "dontcare" returns here once we
   // implement proper handling (fallback, negotiation) for this in users.
   CHECK_EQ(type_, kEncoder);
   return V4L2_PIX_FMT_YUV420M;
 }
 
 uint32 TegraV4L2Device::PreferredOutputFormat() {
   // TODO(posciak): We should support "dontcare" returns here once we
   // implement proper handling (fallback, negotiation) for this in users.
   CHECK_EQ(type_, kDecoder);
   return V4L2_PIX_FMT_NV12M;
 }
 
 }  //  namespace content