Merge Android RHEADmaster

Bug: 168057903
Merged-In: Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a
Change-Id: I469b04b384b08d932931b74fdc929f7603eb6fcb

1 files changed, 0 insertions, 65 deletions

diff --git a/media/codecs/gsm/C2SoftGsmDec.h b/media/codecs/gsm/C2SoftGsmDec.h
deleted file mode 100644
index 2b209fe..0000000
--- a/media/codecs/gsm/C2SoftGsmDec.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_C2_SOFT_GSM_DEC_H_
-#define ANDROID_C2_SOFT_GSM_DEC_H_
-
-#include <SimpleC2Component.h>
-
-
-extern "C" {
-    #include "gsm.h"
-}
-
-namespace android {
-
-#define FRGSM_IN_FRM_SZ             33
-#define FRGSM_IN_FRM_SZ_MINUS_1     32
-#define FRGSM_OUT_FRM_SZ            160
-#define MSGSM_IN_FRM_SZ             (FRGSM_IN_FRM_SZ + FRGSM_IN_FRM_SZ_MINUS_1)
-#define MSGSM_OUT_FRM_SZ            (FRGSM_OUT_FRM_SZ * 2)
-
-struct C2SoftGsmDec : public SimpleC2Component {
-    class IntfImpl;
-
-    C2SoftGsmDec(const char *name, c2_node_id_t id,
-              const std::shared_ptr<IntfImpl> &intfImpl);
-    virtual ~C2SoftGsmDec();
-
-    // From SimpleC2Component
-    c2_status_t onInit() override;
-    c2_status_t onStop() override;
-    void onReset() override;
-    void onRelease() override;
-    c2_status_t onFlush_sm() override;
-    void process(
-            const std::unique_ptr<C2Work> &work,
-            const std::shared_ptr<C2BlockPool> &pool) override;
-    c2_status_t drain(
-            uint32_t drainMode,
-            const std::shared_ptr<C2BlockPool> &pool) override;
- private:
-    std::shared_ptr<IntfImpl> mIntf;
-    gsm mGsm;
-    bool mSignalledError;
-    bool mSignalledEos;
-
-    C2_DO_NOT_COPY(C2SoftGsmDec);
-};
-
-}  // namespace android
-
-#endif  // ANDROID_C2_SOFT_GSM_DEC_H_