WFD: WfdSinkLib initial commit

This library provides high-level API for WfdSinkPlayer
application. Also it is used by WfdSinkService.

Change-Id: I9391e91301f8a519394e7579d3aa4ed205d5aae4
Signed-off-by: Andrii Kulian <andrii.kulian@ti.com>

11 files changed, 774 insertions, 0 deletions

diff --git a/wfd/Android.mk b/wfd/Android.mk
new file mode 100644
index 0000000..5053e7d
--- /dev/null
+++ b/wfd/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)
diff --git a/wfd/WfdSinkLib/Android.mk b/wfd/WfdSinkLib/Android.mk
new file mode 100644
index 0000000..cbd9f35
--- /dev/null
+++ b/wfd/WfdSinkLib/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := WfdSinkLib
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_REQUIRED_MODULES := librtspsink_jni
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/wfd/WfdSinkLib/AndroidManifest.xml b/wfd/WfdSinkLib/AndroidManifest.xml
new file mode 100644
index 0000000..f02a264
--- /dev/null
+++ b/wfd/WfdSinkLib/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) Texas Instruments - http://www.ti.com/
+
+     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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.ti.omap.android.wfd.sink.manager"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="17"
+        android:targetSdkVersion="17" />
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name" >
+    </application>
+
+</manifest>
diff --git a/wfd/WfdSinkLib/jni/Android.mk b/wfd/WfdSinkLib/jni/Android.mk
new file mode 100644
index 0000000..8a72e8c
--- /dev/null
+++ b/wfd/WfdSinkLib/jni/Android.mk
@@ -0,0 +1,26 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_C_INCLUDES := . \
+        $(JNI_H_INCLUDE) \
+        $(TOP)/frameworks/native/include \
+        $(TOP)/frameworks/native/include/media/openmax \
+        $(TOP)/frameworks/base/include \
+        $(TOP)/frameworks/av/include/media/stagefright/foundation \
+        $(TOP)/frameworks/av/media/libstagefright/wifi-display
+
+LOCAL_SRC_FILES  := rtsp_sink_jni.cpp \
+
+LOCAL_SHARED_LIBRARIES := libcutils \
+                          libutils \
+                          libnativehelper \
+                          libgui \
+                          libstagefright \
+                          libstagefright_foundation \
+                          libstagefright_wfd
+
+LOCAL_MODULE     := librtspsink_jni
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/wfd/WfdSinkLib/jni/rtsp_sink_jni.cpp b/wfd/WfdSinkLib/jni/rtsp_sink_jni.cpp
new file mode 100644
index 0000000..15bf69d
--- /dev/null
+++ b/wfd/WfdSinkLib/jni/rtsp_sink_jni.cpp
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * 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.
+ */
+#include <jni.h>
+#include <JNIHelp.h>
+
+#include <utils/StrongPointer.h>
+#include <utils/Log.h>
+
+#include <gui/ISurfaceTexture.h>
+#include <gui/Surface.h>
+
+#include <pthread.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#include <unistd.h>
+
+#include <sink/WifiDisplaySink.h>
+
+#define LOG_TAG "rtsp_sink_jni"
+
+using namespace android;
+
+static sp<ALooper> looper = NULL;
+static sp<WifiDisplaySink> sink = NULL;
+
+static sp<ISurfaceTexture> getSurface(JNIEnv *e, jobject thisObj,
+        jobject jSurface) {
+    sp<ISurfaceTexture> new_st = NULL;
+
+    if (!jSurface) {
+        ALOGE("NULL Surface got as argument");
+        return new_st;
+    }
+
+    jclass surfaceClass = e->FindClass("android/view/Surface");
+
+    if (surfaceClass == NULL) {
+        ALOGE("Error getting Surface class");
+        return new_st;
+    }
+
+    jfieldID surfaceId = e->GetFieldID(surfaceClass, "mNativeSurface", "I");
+
+    if (surfaceId == NULL) {
+        ALOGE("Error getting Surface field");
+        return new_st;
+    }
+
+    jint surfaceValue = e->GetIntField(jSurface, surfaceId);
+
+    sp<Surface> surface((Surface*) surfaceValue);
+    if (surface != NULL) {
+        new_st = surface->getSurfaceTexture();
+        new_st->incStrong(thisObj);
+    } else {
+        jniThrowException(e, "java/lang/IllegalArgumentException",
+                "The surface has been released");
+        return new_st;
+    }
+
+    return new_st;
+}
+
+jboolean Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_connect(JNIEnv *e,
+        jobject thisObj, jobject jSurface, jstring url) {
+    char *utfUrl = (char*) e->GetStringUTFChars(url, JNI_FALSE);
+
+    int port;
+    char * ip = new char[strlen(utfUrl) + 1];
+    strcpy(ip, utfUrl);
+    char *colonPos = strchr(ip, ':');
+    if (colonPos != NULL) {
+        char *end;
+        unsigned long x = strtoul(colonPos + 1, &end, 10);
+
+        if (end == colonPos + 1 || *end != '\0' || x >= 65536) {
+            return JNI_FALSE;
+        }
+
+        *colonPos = '\0';
+        port = x;
+    } else {
+        port = 7236;
+    }
+    ALOGI("Sink. Connecting ... URL: %s:%d", ip, port);
+    if (sink == NULL) {
+        sp<ANetworkSession> netSession = new ANetworkSession();
+        netSession->start();
+
+        looper = new ALooper();
+
+        sink = new WifiDisplaySink(netSession,
+                getSurface(e, thisObj, jSurface));
+        looper->setName("wfd_sink_looper");
+        looper->registerHandler(sink);
+        looper->start();
+
+        sink->start(ip, port);
+    } else {
+        sink->start(ip, port);
+    }
+    delete[] ip;
+    e->ReleaseStringUTFChars(url, utfUrl);
+
+    return JNI_TRUE;
+}
+
+jboolean Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_disconnect(JNIEnv *e,
+        jobject thisObj) {
+    // TODO implement rtsp disconnect
+    jboolean result = JNI_TRUE;
+    ALOGI("Sink. Disconnecting ...");
+    return result;
+}
+
+jboolean Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_play(JNIEnv *e,
+        jobject thisObj) {
+    jboolean result = JNI_TRUE;
+    ALOGI("Sink. play");
+    if (sink != NULL) {
+        sink->play();
+    }
+    return result;
+}
+
+jboolean Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_pause(JNIEnv *e,
+        jobject thisObj) {
+    jboolean result = JNI_TRUE;
+    ALOGI("Sink. pause");
+    if (sink != NULL) {
+        sink->pause();
+    }
+    return result;
+}
+
+jboolean Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_teardown(JNIEnv *e,
+        jobject thisObj) {
+    jboolean result = JNI_TRUE;
+    ALOGI("Sink. teardown");
+    if (sink != NULL) {
+        sink->teardown();
+    }
+    return result;
+}
+
+jstring Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_getMediaInfo(JNIEnv *e,
+        jobject thisObj) {
+    AString mediaInfo("dummy media info");
+    jstring result = e->NewStringUTF(mediaInfo.c_str());
+    return result;
+}
+
+static JNINativeMethod rtspSinkMethods[] = { { "connect",
+        "(Landroid/view/Surface;Ljava/lang/String;)Z",
+        (void*) Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_connect }, {
+        "disconnect", "()Z",
+        (void*) Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_disconnect }, {
+        "play", "()Z",
+        (void*) Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_play }, {
+        "pause", "()Z",
+        (void*) Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_pause }, {
+        "teardown", "()Z",
+        (void*) Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_teardown }, {
+        "getMediaInfo", "()Ljava/lang/String;",
+        (void*) Java_com_ti_omap_android_wfd_sink_rtsp_RtspSink_getMediaInfo }
+        };
+
+extern "C" jint JNI_OnLoad(JavaVM *jvm, void *reserved) {
+    JNIEnv *e;
+
+    if (jvm->GetEnv((void**) &e, JNI_VERSION_1_4) != JNI_OK) {
+        ALOGE("Error getting Env var");
+        return JNI_ERR;
+    }
+
+    jniRegisterNativeMethods(e, "com/ti/omap/android/wfd/sink/rtsp/RtspSink",
+            rtspSinkMethods, NELEM(rtspSinkMethods));
+
+    return JNI_VERSION_1_4;
+}
diff --git a/wfd/WfdSinkLib/res/values/strings.xml b/wfd/WfdSinkLib/res/values/strings.xml
new file mode 100644
index 0000000..5c94036
--- /dev/null
+++ b/wfd/WfdSinkLib/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) Texas Instruments - http://www.ti.com/
+
+     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.
+-->
+<resources>
+
+    <string name="app_name">WfdSinkLib</string>
+
+</resources>
diff --git a/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkActivity.java b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkActivity.java
new file mode 100644
index 0000000..7b97e5f
--- /dev/null
+++ b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkActivity.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * 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.
+ */
+package com.ti.omap.android.wfd.sink.manager;
+
+import com.ti.omap.android.wfd.sink.rtsp.RtspSink;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.SurfaceHolder;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+public class WfdSinkActivity extends Activity {
+
+    private static final String LOG_TAG = "WfdSinkActivity";
+
+    // Messenger for communicating with the service.
+    private Messenger mService = null;
+
+    // Messenger for receiving responses from service.
+    private Messenger mMessenger;
+
+    // Flag indicating whether we have called bind on the service.
+    private boolean mBound;
+
+    private int mRtspPort;
+    private String mUrl;
+    private String mIpAddress;
+
+    private boolean mIsSigmaActive;
+    private boolean mIsAutoStart = true;
+
+    private WfdSinkSurfaceView mSinkSurfaceView;
+    private RtspSink mRtspSink;
+
+    private static final Boolean D = true;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mMessenger = new Messenger(new IncomingHandler());
+
+        mSinkSurfaceView = new WfdSinkSurfaceView(getApplicationContext());
+
+        mRtspSink = new RtspSink(false);
+
+        mBound = false;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        connectService();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        // Unbind from the service
+        if (mBound) {
+            Message msg = Message.obtain(null, WfdSinkTools.COMMAND_UNREGISTER,
+                    0, 0, null);
+            try {
+                mService.send(msg);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+            unbindService(mConnection);
+            mBound = false;
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        pause();
+    }
+
+    public boolean placeView(int resouceId) {
+        if (mSinkSurfaceView == null) {
+            Log.e(LOG_TAG, "Cannot place null surface view");
+            return false;
+        }
+        try {
+            ViewGroup parent = (ViewGroup) findViewById(resouceId);
+            parent.addView(mSinkSurfaceView);
+        } catch (ClassCastException ex) {
+            Log.e(LOG_TAG, "Cannot cast provided view to viewgroup");
+            return false;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
+    }
+
+    private void connectService() {
+        if (D) Log.v(LOG_TAG, "connectService() called");
+
+        // Bind to the service
+        Intent startIntent = new Intent();
+        startIntent.setClassName("com.ti.omap.android.wfd.sink.service",
+                "com.ti.omap.android.wfd.sink.service.WfdSinkService");
+        startService(startIntent);
+
+        boolean bindResult = bindService(startIntent, mConnection, 0);
+        if (D) Log.v(LOG_TAG, "bind to service result : " + bindResult);
+    }
+
+    // Currently not needed. For future use.
+    private void stopService() {
+        if (D) Log.v(LOG_TAG, "disconnectService() called");
+        if (!isServiceBound()) {
+            Log.e(LOG_TAG, "Service not bound");
+            return;
+        }
+
+        Message msg = Message.obtain(null, WfdSinkTools.COMMAND_UNREGISTER, 0,
+                0, null);
+        msg.replyTo = mMessenger;
+        try {
+            mService.send(msg);
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+
+        mRtspSink.disconnect();
+
+        Intent stopIntent = new Intent();
+        stopIntent.setClassName("com.ti.omap.android.wfd.sink.service",
+                "com.ti.omap.android.wfd.sink.service.WfdSinkService");
+        stopService(stopIntent);
+    }
+
+    private boolean isServiceBound() {
+        return mBound;
+    }
+
+    private void setAutoStart(boolean autoStart) {
+        mIsAutoStart = autoStart;
+    }
+
+    private void autoConnect() {
+        if (D) Log.v(LOG_TAG, "autoConnnect() called");
+        if (!isServiceBound()) {
+            Log.e(LOG_TAG, "Service not bound.");
+            return;
+        }
+        if (!mIsAutoStart) {
+            Log.e(LOG_TAG, "autoStart is not set.");
+            return;
+        }
+
+        connect();
+    }
+
+    public void find() {
+        if (D) Log.v(LOG_TAG, "find() called");
+        if (!isServiceBound()) {
+            connectService();
+        } else {
+            Message msg = Message.obtain(null, WfdSinkTools.COMMAND_FIND, 0, 0,
+                    null);
+            msg.replyTo = mMessenger;
+            try {
+                mService.send(msg);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void connect() {
+        if (D) Log.v(LOG_TAG, "connect() called");
+        if (mUrl == null || mUrl.isEmpty()) {
+            Log.e(LOG_TAG, "Service has not provided URL to connect");
+            return;
+        }
+        if (mSinkSurfaceView == null || mSinkSurfaceView.getSurface() == null) {
+            Log.e(LOG_TAG, "Surface is not available.");
+            return;
+        }
+
+        mRtspSink.connect(mSinkSurfaceView.getSurface(), mUrl);
+    }
+
+    public void disconnect() {
+        if (D) Log.v(LOG_TAG, "disconnect() called");
+        if (!isServiceBound()) {
+            Log.e(LOG_TAG, "Service not bound. Continue anyway.");
+        }
+
+        mRtspSink.disconnect();
+    }
+
+    public void play() {
+        if (D) Log.v(LOG_TAG, "play() called");
+        if (!isServiceBound()) {
+            Log.e(LOG_TAG, "Service not bound. Continue anyway.");
+        }
+
+        mRtspSink.play();
+    }
+
+    public void pause() {
+        if (D) Log.v(LOG_TAG, "pause() called");
+        if (!isServiceBound()) {
+            Log.e(LOG_TAG, "Service not bound. Continue anyway.");
+        }
+
+        mRtspSink.pause();
+    }
+
+    public void tearDown() {
+        if (D) Log.v(LOG_TAG, "tearDown() called");
+        if (!isServiceBound()) {
+            Log.e(LOG_TAG, "Service not bound. Continue anyway.");
+        }
+
+        mRtspSink.teardown();
+    }
+
+    public String getMediaInfo() {
+        if (D) Log.v(LOG_TAG, "getMediaInfo() called");
+        if (!isServiceBound()) {
+            Log.e(LOG_TAG, "Service not bound. Continue anyway.");
+        }
+
+        return mRtspSink.getMediaInfo();
+    }
+
+    private class IncomingHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+            case WfdSinkTools.COMMAND_INVOKE_SINK:
+                mIpAddress = msg.getData()
+                        .getString(WfdSinkTools.EXTRA_ADDRESS);
+                if (mIpAddress == null || mIpAddress.isEmpty()) {
+                    if (D) Log.v(LOG_TAG, "No ip address received");
+                    mIpAddress = "127.0.0.1";
+                }
+                mRtspPort = msg.getData().getInt(WfdSinkTools.EXTRA_PORT);
+                mUrl = mIpAddress + ":" + mRtspPort;
+                autoConnect();
+                break;
+            default:
+                super.handleMessage(msg);
+            }
+        }
+    }
+
+    // Class for interacting with the main interface of the service.
+    private ServiceConnection mConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            Log.d(LOG_TAG, "Connected to service");
+            mService = new Messenger(service);
+            mBound = true;
+
+            Message msg = Message.obtain(null, WfdSinkTools.COMMAND_REGISTER,
+                    0, 0, null);
+            msg.replyTo = mMessenger;
+            try {
+                mService.send(msg);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+            msg = Message.obtain(null, WfdSinkTools.COMMAND_FIND, 0, 0, null);
+            try {
+                mService.send(msg);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            Log.d(LOG_TAG, "Disconnected from service");
+            mService = null;
+            mBound = false;
+        }
+    };
+
+}
diff --git a/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkSurfaceView.java b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkSurfaceView.java
new file mode 100644
index 0000000..5500267
--- /dev/null
+++ b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkSurfaceView.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * 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.
+ */
+package com.ti.omap.android.wfd.sink.manager;
+
+import android.content.Context;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceView;
+
+public class WfdSinkSurfaceView extends SurfaceView {
+    private Surface mSurface;
+    private boolean mPreserveSurface;
+
+    public WfdSinkSurfaceView(Context context) {
+        super(context);
+        mSurface = getHolder().getSurface();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent ke) {
+        return true;
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent ke) {
+        return true;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent me) {
+        return true;
+    }
+
+    @Override
+    public boolean onTrackballEvent(MotionEvent me) {
+        return true;
+    }
+
+    @Override
+    public boolean onGenericMotionEvent(MotionEvent me) {
+        return true;
+    }
+
+    public Surface getSurface() {
+        if (mSurface == null) {
+            mSurface = getHolder().getSurface();
+        }
+        return mSurface;
+    }
+
+    @Override
+    protected void onWindowVisibilityChanged(int visibility) {
+        if (mPreserveSurface) {
+            super.onWindowVisibilityChanged(VISIBLE);
+        } else {
+            super.onWindowVisibilityChanged(visibility);
+        }
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        if (mPreserveSurface) {
+            super.setVisibility(VISIBLE);
+        } else {
+            super.setVisibility(visibility);
+        }
+    }
+
+}
diff --git a/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkTools.java b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkTools.java
new file mode 100644
index 0000000..7ff16fc
--- /dev/null
+++ b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/manager/WfdSinkTools.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * 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.
+ */
+package com.ti.omap.android.wfd.sink.manager;
+
+public class WfdSinkTools {
+    public static final int STATE_IDLE                            =  0;
+    public static final int STATE_CONNECTING                      =  1;
+    public static final int STATE_CONNECTED                       =  2;
+    public static final int STATE_PLAYING                         =  3;
+    public static final int STATE_PAUSED                          =  4;
+    public static final int STATE_DISCONNECTING                   =  5;
+
+    public static final int RTSP_COMMAND_PLAY                     =  6;
+    public static final int RTSP_COMMAND_PAUSE                    =  7;
+    public static final int RTSP_COMMAND_CONNECT                  =  8;
+    public static final int RTSP_COMMAND_DISCONNECT               =  9;
+
+    public static final int COMMAND_REGISTER                      = 10;
+    public static final int COMMAND_UNREGISTER                    = 11;
+
+    public static final int COMMAND_PLAY                          = 12;
+    public static final int COMMAND_PAUSE                         = 13;
+    public static final int COMMAND_CONNECT                       = 14;
+    public static final int COMMAND_DISCONNECT                    = 15;
+    public static final int COMMAND_INVOKE_SINK                   = 16;
+
+    public static final int COMMAND_FIND                          = 17;
+
+    public static final String EXTRA_AUTOSTART                    = "EXTRA_AUTOSTART";
+    public static final String EXTRA_ADDRESS                      = "EXTRA_ADDRESS";
+    public static final String EXTRA_PORT                         = "EXTRA_PORT";
+}
diff --git a/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/rtsp/RtspSink.java b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/rtsp/RtspSink.java
new file mode 100644
index 0000000..f8763ab
--- /dev/null
+++ b/wfd/WfdSinkLib/src/com/ti/omap/android/wfd/sink/rtsp/RtspSink.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) Texas Instruments - http://www.ti.com/
+ *
+ * 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.
+ */
+package com.ti.omap.android.wfd.sink.rtsp;
+
+import android.view.Surface;
+
+public class RtspSink {
+
+    boolean mSigmaActivate;
+
+    public RtspSink(boolean sigmaActivate) {
+        mSigmaActivate = sigmaActivate;
+    }
+
+    static {
+        System.loadLibrary("rtspsink_jni");
+    }
+
+    public native boolean connect(Surface surface, String url);
+
+    public native boolean disconnect();
+
+    public native boolean play();
+
+    public native boolean pause();
+
+    public native boolean teardown();
+
+    public native String getMediaInfo();
+}
diff --git a/wfd/wfd-products.mk b/wfd/wfd-products.mk
index e4281c5..9047e29 100644
--- a/wfd/wfd-products.mk
+++ b/wfd/wfd-products.mk
@@ -3,3 +3,7 @@
 PRODUCT_COPY_FILES += \
         device/ti/common-open/wfd/configs/wfd_source_cfg.xml:system/etc/wfd/wfd_source_cfg.xml \
         device/ti/common-open/wfd/configs/wfd_sink_cfg.xml:system/etc/wfd/wfd_sink_cfg.xml
+
+PRODUCT_PACKAGES += \
+        librtspsink_jni \
+        WfdSinkLib