Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b3fdef0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2 Vts: Remove unused C2AllocatorIon.h dependency" am: c6c7b527 am: 6104767c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1689611

Change-Id: I308f91b5d17ec1fa8a00c6a7c64d5c74b97d7e02
parents ad7404cd 6104767c
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -23,15 +23,12 @@
#include <stdio.h>
#include <algorithm>

#include <C2AllocatorIon.h>
#include <C2Buffer.h>
#include <C2BufferPriv.h>
#include <C2Config.h>
#include <C2Debug.h>
#include <codec2/hidl/client.h>

using android::C2AllocatorIon;

#include "media_c2_hidl_test_common.h"
using DecodeTestParameters = std::tuple<std::string, std::string, uint32_t, bool>;
static std::vector<DecodeTestParameters> gDecodeTestParameters;
+0 −3
Original line number Diff line number Diff line
@@ -24,15 +24,12 @@
#include <algorithm>
#include <fstream>

#include <C2AllocatorIon.h>
#include <C2Buffer.h>
#include <C2BufferPriv.h>
#include <C2Config.h>
#include <C2Debug.h>
#include <codec2/hidl/client.h>

using android::C2AllocatorIon;

#include "media_c2_hidl_test_common.h"

using EncodeTestParameters = std::tuple<std::string, std::string, bool, int32_t>;
+0 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@

#include <openssl/md5.h>

#include <C2AllocatorIon.h>
#include <C2Buffer.h>
#include <C2BufferPriv.h>
#include <C2Config.h>
@@ -35,8 +34,6 @@
#include <gui/IProducerListener.h>
#include <system/window.h>

using android::C2AllocatorIon;

#include "media_c2_hidl_test_common.h"
#include "media_c2_video_hidl_test_common.h"

+0 −3
Original line number Diff line number Diff line
@@ -23,15 +23,12 @@
#include <stdio.h>
#include <fstream>

#include <C2AllocatorIon.h>
#include <C2Buffer.h>
#include <C2BufferPriv.h>
#include <C2Config.h>
#include <C2Debug.h>
#include <codec2/hidl/client.h>

using android::C2AllocatorIon;

#include "media_c2_hidl_test_common.h"
#include "media_c2_video_hidl_test_common.h"