diff options
| author | David Staessens <dstaessens@google.com> | 2021-05-12 05:54:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 05:54:46 +0000 |
| commit | 5984083965a42f1dfdb3798701adb3792fe08555 (patch) | |
| tree | a00e35e15f01d303819e007140df736459e94e1b | |
| parent | 90d79c67eaa655f0bb69ccb854219f2c51b1cb6f (diff) | |
| parent | 22e83fd3138d5e79aa1b9dcc46e8f1f8b2ff4a9e (diff) | |
| download | v4l2_codec2-5984083965a42f1dfdb3798701adb3792fe08555.tar.gz | |
v4l2_codec2: Remove Chrome macros. am: 22e83fd313
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/14511924
Change-Id: I61b2b0c9ac83f87bd18a373b3b006d1db7fd0270
| -rw-r--r-- | accel/Android.bp | 2 | ||||
| -rw-r--r-- | accel/fourcc.cc | 8 | ||||
| -rw-r--r-- | accel/macros.h | 14 |
3 files changed, 5 insertions, 19 deletions
diff --git a/accel/Android.bp b/accel/Android.bp index 7739f20..f0b27ff 100644 --- a/accel/Android.bp +++ b/accel/Android.bp @@ -20,7 +20,7 @@ cc_library { "video_pixel_format.cc", ], - shared_libs: ["libchrome"], + shared_libs: ["libchrome", "liblog"], // -Wno-unused-parameter is needed for libchrome/base codes cflags: [ "-Wall", diff --git a/accel/fourcc.cc b/accel/fourcc.cc index 5d0aa2c..bfca19c 100644 --- a/accel/fourcc.cc +++ b/accel/fourcc.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "macros.h" +#include <utils/Log.h> namespace media { @@ -40,7 +40,7 @@ std::optional<Fourcc> Fourcc::FromUint32(uint32_t fourcc) { case MM21: return Fourcc(static_cast<Value>(fourcc)); } - DVLOGF(3) << "Unmapped fourcc: " << FourccToString(fourcc); + ALOGE("Unmapped fourcc: %s", FourccToString(fourcc).c_str()); return std::nullopt; } @@ -130,8 +130,8 @@ base::Optional<Fourcc> Fourcc::FromVideoPixelFormat( break; } } - DVLOGF(3) << "Unmapped " << VideoPixelFormatToString(pixel_format) << " for " - << (single_planar ? "single-planar" : "multi-planar"); + ALOGE("Unmapped %s for %s", VideoPixelFormatToString(pixel_format).c_str(), + single_planar ? "single-planar" : "multi-planar"); return base::nullopt; } diff --git a/accel/macros.h b/accel/macros.h deleted file mode 100644 index 22c3ad6..0000000 --- a/accel/macros.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2020 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. - -#ifndef MACROS_H_ -#define MACROS_H_ - -#include "base/logging.h" - -#define DVLOGF(level) DVLOG(level) << __func__ << "(): " -#define VLOGF(level) VLOG(level) << __func__ << "(): " -#define VPLOGF(level) VPLOG(level) << __func__ << "(): " - -#endif // MACROS_H_ |