resolved conflicts for merge of 79a9dacb to lmp-mr1-dev-plus-aosp

Change-Id: I1721b19c8be5debdcfadc99bcf6304ca8077e8cd

1 files changed, 0 insertions, 46 deletions

diff --git a/cpp/ScriptIntrinsics.cpp b/cpp/ScriptIntrinsics.cpp
index 42903ce4..a9a31f81 100644
--- a/cpp/ScriptIntrinsics.cpp
+++ b/cpp/ScriptIntrinsics.cpp
@@ -598,49 +598,3 @@ void ScriptIntrinsicYuvToRGB::forEach(sp<Allocation> out) {
 
     Script::forEach(0, nullptr, out, nullptr, 0);
 }
-
-sp<ScriptIntrinsicVP9LoopFilter> ScriptIntrinsicVP9LoopFilter::create(sp<RS> rs, sp<const Element> e) {
-    if (!(e->isCompatible(Element::U8(rs)))) {
-        rs->throwError(RS_ERROR_INVALID_ELEMENT, "Invalid element for Vp9LoopFilter");
-        return nullptr;
-    }
-    return new ScriptIntrinsicVP9LoopFilter(rs, e);
-}
-
-ScriptIntrinsicVP9LoopFilter::ScriptIntrinsicVP9LoopFilter(sp<RS> rs, sp<const Element> e)
-    : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_LOOP_FILTER, e) {
-    sp<const Type> t_pad = Type::create(rs, e, 1, 0, 0);
-    mPadAlloc = Allocation::createTyped(rs, t_pad, RS_ALLOCATION_MIPMAP_NONE,
-                                        RS_ALLOCATION_USAGE_SCRIPT, nullptr);
-}
-
-void ScriptIntrinsicVP9LoopFilter::setLoopFilterDomain(int start, int stop, int numPlanes, int miRows, int miCols) {
-    FieldPacker fp(20);
-    fp.add(start);
-    fp.add(stop);
-    fp.add(numPlanes);
-    fp.add(miRows);
-    fp.add(miCols);
-    Script::setVar(0, fp.getData(), fp.getLength());
-}
-
-void ScriptIntrinsicVP9LoopFilter::setBufferInfo(const BufferInfo *bufInfo) {
-    Script::setVar(1, bufInfo, sizeof(BufferInfo));
-}
-
-void ScriptIntrinsicVP9LoopFilter::setLoopFilterInfo(sp<Allocation> lfInfo) {
-    Script::setVar(2, lfInfo);
-}
-
-void ScriptIntrinsicVP9LoopFilter::setLoopFilterMasks(sp<Allocation> lfMasks) {
-    Script::setVar(3, lfMasks);
-}
-
-void ScriptIntrinsicVP9LoopFilter::forEach(sp<Allocation> frameBuffer) {
-    if (!(frameBuffer->getType()->getElement()->isCompatible(mElement))) {
-        mRS->throwError(RS_ERROR_INVALID_ELEMENT, "Invalid element for input/output in Vp9LoopFilter");
-        return;
-    }
-    Script::setVar(4, frameBuffer);
-    Script::forEach(0, mPadAlloc, nullptr, nullptr, 0);
-}