Merge "Fix cert-dcl16-c clang-tidy warnings in media/extractors."
am: cd4c042fdd
Change-Id: I61e548c944a76d06caa983c6dfe7fdc31a956511
diff --git a/media/libmediaplayer2/nuplayer2/Android.bp b/media/libmediaplayer2/nuplayer2/Android.bp
index 18e0380..9b3aad2 100644
--- a/media/libmediaplayer2/nuplayer2/Android.bp
+++ b/media/libmediaplayer2/nuplayer2/Android.bp
@@ -33,8 +33,6 @@
cflags: [
"-Werror",
"-Wall",
- // Allow implicit fallthroughs in NuPlayer2Driver.cpp until they are fixed.
- "-Wno-error=implicit-fallthrough",
],
product_variables: {
diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index 947214b..70f52c3 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -25,8 +25,6 @@
#include <media/stagefright/MediaErrors.h>
#include "libyuv/convert_from.h"
-#include "libyuv/convert_argb.h"
-#include "libyuv/planar_functions.h"
#include "libyuv/video_common.h"
#include <functional>
#include <sys/time.h>
@@ -73,17 +71,10 @@
case OMX_COLOR_FormatCbYCrY:
case OMX_QCOM_COLOR_FormatYVU420SemiPlanar:
+ case OMX_COLOR_FormatYUV420SemiPlanar:
case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
return mDstFormat == OMX_COLOR_Format16bitRGB565;
- case OMX_COLOR_FormatYUV420SemiPlanar:
-#ifdef USE_LIBYUV
- return mDstFormat == OMX_COLOR_Format16bitRGB565
- || mDstFormat == OMX_COLOR_Format32BitRGBA8888;
-#else
- return mDstFormat == OMX_COLOR_Format16bitRGB565;
-#endif
-
default:
return false;
}
@@ -210,11 +201,7 @@
break;
case OMX_COLOR_FormatYUV420SemiPlanar:
-#ifdef USE_LIBYUV
- err = convertYUV420SemiPlanarUseLibYUV(src, dst);
-#else
err = convertYUV420SemiPlanar(src, dst);
-#endif
break;
case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
@@ -327,36 +314,6 @@
return OK;
}
-status_t ColorConverter::convertYUV420SemiPlanarUseLibYUV(
- const BitmapParams &src, const BitmapParams &dst) {
- uint8_t *dst_ptr = (uint8_t *)dst.mBits
- + dst.mCropTop * dst.mStride + dst.mCropLeft * dst.mBpp;
-
- const uint8_t *src_y =
- (const uint8_t *)src.mBits + src.mCropTop * src.mStride + src.mCropLeft;
-
- const uint8_t *src_u =
- (const uint8_t *)src.mBits + src.mStride * src.mHeight
- + src.mCropTop * src.mStride + src.mCropLeft;
-
- switch (mDstFormat) {
- case OMX_COLOR_Format16bitRGB565:
- libyuv::NV12ToRGB565(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,
- dst.mStride, src.cropWidth(), src.cropHeight());
- break;
-
- case OMX_COLOR_Format32BitRGBA8888:
- libyuv::NV12ToARGB(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,
- dst.mStride, src.cropWidth(), src.cropHeight());
- break;
-
- default:
- return ERROR_UNSUPPORTED;
- }
-
- return OK;
-}
-
std::function<void (void *, void *, void *, size_t,
signed *, signed *, signed *, signed *)>
getReadFromSrc(OMX_COLOR_FORMATTYPE srcFormat) {
diff --git a/media/libstagefright/include/media/stagefright/ColorConverter.h b/media/libstagefright/include/media/stagefright/ColorConverter.h
index 2d06111..5b3543d 100644
--- a/media/libstagefright/include/media/stagefright/ColorConverter.h
+++ b/media/libstagefright/include/media/stagefright/ColorConverter.h
@@ -78,9 +78,6 @@
status_t convertYUV420PlanarUseLibYUV(
const BitmapParams &src, const BitmapParams &dst);
- status_t convertYUV420SemiPlanarUseLibYUV(
- const BitmapParams &src, const BitmapParams &dst);
-
status_t convertYUV420Planar16(
const BitmapParams &src, const BitmapParams &dst);