diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-30 18:18:34 -0700 | 
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-04-30 18:53:52 -0700 | 
| commit | 1de1e25cba872bd4c077c2e394f8ca9c70b65856 (patch) | |
| tree | 7f01e01b5a3731a9c345684e38755d97e6a67f19 /include | |
| parent | 31de88566257d5546cf4eee9064d96926a4b0c24 (diff) | |
| download | frameworks_av-1de1e25cba872bd4c077c2e394f8ca9c70b65856.zip frameworks_av-1de1e25cba872bd4c077c2e394f8ca9c70b65856.tar.gz frameworks_av-1de1e25cba872bd4c077c2e394f8ca9c70b65856.tar.bz2  | |
stagefright: remove NativeWindowWrapper
Now that Surface and SurfaceTextureClient are the same and Surface,
it does not add value.
Bug: 19489395
Change-Id: I016ecd1cf5cc51ce6244b6fa34ecd75f84e3db01
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/NativeWindowWrapper.h | 50 | 
1 files changed, 0 insertions, 50 deletions
diff --git a/include/media/stagefright/NativeWindowWrapper.h b/include/media/stagefright/NativeWindowWrapper.h deleted file mode 100644 index cfeec22..0000000 --- a/include/media/stagefright/NativeWindowWrapper.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2011 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 NATIVE_WINDOW_WRAPPER_H_ - -#define NATIVE_WINDOW_WRAPPER_H_ - -#include <gui/Surface.h> - -namespace android { - -// Surface derives from ANativeWindow which derives from multiple -// base classes, in order to carry it in AMessages, we'll temporarily wrap it -// into a NativeWindowWrapper. - -struct NativeWindowWrapper : RefBase { -    NativeWindowWrapper( -            const sp<Surface> &surfaceTextureClient) : -        mSurfaceTextureClient(surfaceTextureClient) { } - -    sp<ANativeWindow> getNativeWindow() const { -        return mSurfaceTextureClient; -    } - -    sp<Surface> getSurfaceTextureClient() const { -        return mSurfaceTextureClient; -    } - -private: -    const sp<Surface> mSurfaceTextureClient; - -    DISALLOW_EVIL_CONSTRUCTORS(NativeWindowWrapper); -}; - -}  // namespace android - -#endif  // NATIVE_WINDOW_WRAPPER_H_  | 
