sync with latest
authorgiwoong.kim <giwoong.kim@samsung.com>
Mon, 22 Apr 2013 07:02:55 +0000 (16:02 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Mon, 22 Apr 2013 07:08:27 +0000 (16:08 +0900)
24 files changed:
gl/lib/Linux/x86/pkgconfig/egl.pc [new file with mode: 0644]
gl/lib/Linux/x86/pkgconfig/glesv1_cm.pc [new file with mode: 0644]
gl/lib/Linux/x86/pkgconfig/glesv2.pc [new file with mode: 0644]
gl/lib/Linux/x86/pkgconfig/osmesa.pc [new file with mode: 0644]
gl/lib/Linux/x86_64/pkgconfig/egl.pc [new file with mode: 0644]
gl/lib/Linux/x86_64/pkgconfig/glesv1_cm.pc [new file with mode: 0644]
gl/lib/Linux/x86_64/pkgconfig/glesv2.pc [new file with mode: 0644]
gl/lib/Linux/x86_64/pkgconfig/osmesa.pc [new file with mode: 0644]
package/changelog
package/pkginfo.manifest
tizen/distrib/libav/libavcodec/libavcodec.v [new file with mode: 0644]
tizen/distrib/libav/libavcodec/version.h [new file with mode: 0644]
tizen/distrib/libav/libavdevice/libavdevice.v [new file with mode: 0644]
tizen/distrib/libav/libavfilter/libavfilter.v [new file with mode: 0644]
tizen/distrib/libav/libavformat/libavformat.v [new file with mode: 0644]
tizen/distrib/libav/libavformat/version.h [new file with mode: 0644]
tizen/distrib/libav/libavutil/libavutil.v [new file with mode: 0644]
tizen/distrib/libav/libpostproc/libpostproc.v [new file with mode: 0644]
tizen/distrib/libav/libswscale/libswscale.v [new file with mode: 0644]
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
tizen/src/skin/maruskin_server.c

diff --git a/gl/lib/Linux/x86/pkgconfig/egl.pc b/gl/lib/Linux/x86/pkgconfig/egl.pc
new file mode 100644 (file)
index 0000000..e81e56c
--- /dev/null
@@ -0,0 +1,10 @@
+prefix=/home/stas/Projects/qemu/gl/dgles2/../lib/Linux/x86
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: egl
+Description: DGLES egl library
+Version: 1.4.2
+Libs: -L${libdir} -lEGL
+Cflags: -I${includedir} 
diff --git a/gl/lib/Linux/x86/pkgconfig/glesv1_cm.pc b/gl/lib/Linux/x86/pkgconfig/glesv1_cm.pc
new file mode 100644 (file)
index 0000000..c5c3508
--- /dev/null
@@ -0,0 +1,11 @@
+prefix=/home/stas/Projects/qemu/gl/dgles2/../lib/Linux/x86
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: glesv1_cm
+Description: DGLES OpenGL ES 1.1 CM library
+Requires.private: egl
+Version: 1.4.1
+Libs: -L${libdir} -lGLES_CM
+Cflags: -I${includedir}
diff --git a/gl/lib/Linux/x86/pkgconfig/glesv2.pc b/gl/lib/Linux/x86/pkgconfig/glesv2.pc
new file mode 100644 (file)
index 0000000..1592feb
--- /dev/null
@@ -0,0 +1,12 @@
+prefix=/home/stas/Projects/qemu/gl/dgles2/../lib/Linux/x86
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: glesv2
+Description: DGLES OpenGL ES 2.0 library
+Requires.private: egl
+Version: 2.0.0
+Libs: -L${libdir} -lGLESv2
+Cflags: -I${includedir} 
+
diff --git a/gl/lib/Linux/x86/pkgconfig/osmesa.pc b/gl/lib/Linux/x86/pkgconfig/osmesa.pc
new file mode 100644 (file)
index 0000000..99a69f2
--- /dev/null
@@ -0,0 +1,12 @@
+prefix=/home/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/mesa/../lib/Linux/x86
+exec_prefix=${prefix}
+libdir=/home/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/mesa/../lib/Linux/x86
+includedir=/home/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/mesa/../include
+
+Name: osmesa
+Description: Mesa Off-screen Rendering library
+Requires: 
+Version: 8.0.3
+Libs: -L${libdir} -lOSMesa
+Libs.private: -lm -lpthread  -ldl
+Cflags: -I${includedir}
diff --git a/gl/lib/Linux/x86_64/pkgconfig/egl.pc b/gl/lib/Linux/x86_64/pkgconfig/egl.pc
new file mode 100644 (file)
index 0000000..88255e8
--- /dev/null
@@ -0,0 +1,10 @@
+prefix=/media/afaa385f-d818-4cfe-bec0-31ada40a8d36/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/dgles2/../lib/Linux/x86_64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: egl
+Description: DGLES egl library
+Version: 1.4.2
+Libs: -L${libdir} -lEGL
+Cflags: -I${includedir} 
diff --git a/gl/lib/Linux/x86_64/pkgconfig/glesv1_cm.pc b/gl/lib/Linux/x86_64/pkgconfig/glesv1_cm.pc
new file mode 100644 (file)
index 0000000..682d9d5
--- /dev/null
@@ -0,0 +1,11 @@
+prefix=/media/afaa385f-d818-4cfe-bec0-31ada40a8d36/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/dgles2/../lib/Linux/x86_64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: glesv1_cm
+Description: DGLES OpenGL ES 1.1 CM library
+Requires.private: egl
+Version: 1.4.1
+Libs: -L${libdir} -lGLES_CM
+Cflags: -I${includedir}
diff --git a/gl/lib/Linux/x86_64/pkgconfig/glesv2.pc b/gl/lib/Linux/x86_64/pkgconfig/glesv2.pc
new file mode 100644 (file)
index 0000000..c620a2f
--- /dev/null
@@ -0,0 +1,12 @@
+prefix=/media/afaa385f-d818-4cfe-bec0-31ada40a8d36/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/dgles2/../lib/Linux/x86_64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: glesv2
+Description: DGLES OpenGL ES 2.0 library
+Requires.private: egl
+Version: 2.0.0
+Libs: -L${libdir} -lGLESv2
+Cflags: -I${includedir} 
+
diff --git a/gl/lib/Linux/x86_64/pkgconfig/osmesa.pc b/gl/lib/Linux/x86_64/pkgconfig/osmesa.pc
new file mode 100644 (file)
index 0000000..f2d07ca
--- /dev/null
@@ -0,0 +1,12 @@
+prefix=/media/afaa385f-d818-4cfe-bec0-31ada40a8d36/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/mesa/../lib/Linux/x86_64
+exec_prefix=${prefix}
+libdir=/media/afaa385f-d818-4cfe-bec0-31ada40a8d36/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/mesa/../lib/Linux/x86_64
+includedir=/media/afaa385f-d818-4cfe-bec0-31ada40a8d36/mackross/eclipse_linux_cdt_space/qemu_exynos4_gles/gl/mesa/../include
+
+Name: osmesa
+Description: Mesa Off-screen Rendering library
+Requires: 
+Version: 8.0.3
+Libs: -L${libdir} -lOSMesa
+Libs.private: -lm -lpthread  -ldl
+Cflags: -I${includedir}
index b34c0a4..c1e390b 100644 (file)
@@ -1,3 +1,6 @@
+* 1.5.31
+- rollback 'optimize a framebuffer copying'
+== GiWoong Kim <giwoong.kim@samsung.com> 2013-04-18
 * 1.5.28
 - Fix pBuffer issue for xcomposite.
 == Sangjin Kim <sangjin3.kim@samsung.com> 2013-04-16
index 24c3523..d6e27f6 100644 (file)
@@ -1,4 +1,4 @@
-Version: 1.5.28
+Version: 1.5.31
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 
diff --git a/tizen/distrib/libav/libavcodec/libavcodec.v b/tizen/distrib/libav/libavcodec/libavcodec.v
new file mode 100644 (file)
index 0000000..6569903
--- /dev/null
@@ -0,0 +1,9 @@
+LIBAVCODEC_$MAJOR {
+        global: *;
+        local:
+                ff_*_bsf;
+                ff_*_decoder;
+                ff_*_encoder;
+                ff_*_hwaccel;
+                ff_*_parser;
+};
diff --git a/tizen/distrib/libav/libavcodec/version.h b/tizen/distrib/libav/libavcodec/version.h
new file mode 100644 (file)
index 0000000..aded68e
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VERSION_H
+#define AVCODEC_VERSION_H
+
+#define LIBAVCODEC_VERSION_MAJOR 53
+#define LIBAVCODEC_VERSION_MINOR  5
+#define LIBAVCODEC_VERSION_MICRO  0
+
+#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+                                               LIBAVCODEC_VERSION_MINOR, \
+                                               LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
+                                           LIBAVCODEC_VERSION_MINOR,    \
+                                           LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ */
+#ifndef FF_API_PALETTE_CONTROL
+#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_SAMPLE_FMT
+#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_AUDIOCONVERT
+#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_ANTIALIAS_ALGO
+#define FF_API_ANTIALIAS_ALGO   (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_REQUEST_CHANNELS
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OPT_H
+#define FF_API_OPT_H            (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_THREAD_INIT
+#define FF_API_THREAD_INIT      (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_FF_PICT_TYPES
+#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FLAC_GLOBAL_OPTS
+#define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_GET_PIX_FMT_NAME
+#define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+
+#endif /* AVCODEC_VERSION_H */
diff --git a/tizen/distrib/libav/libavdevice/libavdevice.v b/tizen/distrib/libav/libavdevice/libavdevice.v
new file mode 100644 (file)
index 0000000..663af85
--- /dev/null
@@ -0,0 +1,4 @@
+LIBAVDEVICE_$MAJOR {
+        global: avdevice_*;
+        local: *;
+};
diff --git a/tizen/distrib/libav/libavfilter/libavfilter.v b/tizen/distrib/libav/libavfilter/libavfilter.v
new file mode 100644 (file)
index 0000000..83e8887
--- /dev/null
@@ -0,0 +1,4 @@
+LIBAVFILTER_$MAJOR {
+        global: avfilter_*; av_*;
+        local: *;
+};
diff --git a/tizen/distrib/libav/libavformat/libavformat.v b/tizen/distrib/libav/libavformat/libavformat.v
new file mode 100644 (file)
index 0000000..0ec1c3c
--- /dev/null
@@ -0,0 +1,7 @@
+LIBAVFORMAT_$MAJOR {
+        global: *;
+        local:
+                ff_*_demuxer;
+                ff_*_muxer;
+                ff_*_protocol;
+};
diff --git a/tizen/distrib/libav/libavformat/version.h b/tizen/distrib/libav/libavformat/version.h
new file mode 100644 (file)
index 0000000..3cc1718
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * Version macros.
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_VERSION_H
+#define AVFORMAT_VERSION_H
+
+#include "libavutil/avutil.h"
+
+#define LIBAVFORMAT_VERSION_MAJOR 53
+#define LIBAVFORMAT_VERSION_MINOR  2
+#define LIBAVFORMAT_VERSION_MICRO  0
+
+#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
+                                               LIBAVFORMAT_VERSION_MINOR, \
+                                               LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
+                                           LIBAVFORMAT_VERSION_MINOR,   \
+                                           LIBAVFORMAT_VERSION_MICRO)
+#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
+
+#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+
+/**
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ */
+#ifndef FF_API_OLD_METADATA2
+#define FF_API_OLD_METADATA2           (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_READ_SEEK
+#define FF_API_READ_SEEK               (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_OLD_AVIO
+#define FF_API_OLD_AVIO                (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_DUMP_FORMAT
+#define FF_API_DUMP_FORMAT             (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_PARSE_DATE
+#define FF_API_PARSE_DATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FIND_INFO_TAG
+#define FF_API_FIND_INFO_TAG           (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_PKT_DUMP
+#define FF_API_PKT_DUMP                (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_GUESS_IMG2_CODEC
+#define FF_API_GUESS_IMG2_CODEC        (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_SDP_CREATE
+#define FF_API_SDP_CREATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FORMAT_PARAMETERS
+#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_FLAG_RTP_HINT
+#define FF_API_FLAG_RTP_HINT           (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
+
+#endif /* AVFORMAT_VERSION_H */
diff --git a/tizen/distrib/libav/libavutil/libavutil.v b/tizen/distrib/libav/libavutil/libavutil.v
new file mode 100644 (file)
index 0000000..ec52f2b
--- /dev/null
@@ -0,0 +1,4 @@
+LIBAVUTIL_$MAJOR {
+        global: av_*; ff_*; avutil_*;
+        local: *;
+};
diff --git a/tizen/distrib/libav/libpostproc/libpostproc.v b/tizen/distrib/libav/libpostproc/libpostproc.v
new file mode 100644 (file)
index 0000000..e65d76f
--- /dev/null
@@ -0,0 +1,4 @@
+LIBPOSTPROC_$MAJOR {
+        global: postproc_*; pp_*;
+        local: *;
+};
diff --git a/tizen/distrib/libav/libswscale/libswscale.v b/tizen/distrib/libav/libswscale/libswscale.v
new file mode 100644 (file)
index 0000000..c68f153
--- /dev/null
@@ -0,0 +1,4 @@
+LIBSWSCALE_$MAJOR {
+        global: swscale_*; sws_*; ff_*;
+        local: *;
+};
index 62a8666..7bcccd8 100644 (file)
@@ -184,7 +184,7 @@ public class EmulatorShmSkin extends EmulatorSkin {
                /* initialize shared memory */
                int result = shmget(shmkey,
                                currentState.getCurrentResolutionWidth() *
-                               currentState.getCurrentResolutionHeight());
+                               currentState.getCurrentResolutionHeight() * 4);
                logger.info("shmget native function returned " + result);
 
                /* update lcd thread */
index 5f3e734..d9a14bb 100644 (file)
@@ -645,7 +645,7 @@ public class SocketCommunicator implements ICommunicator {
        private void increaseHeartbeatCount() {
                int count = heartbeatCount.incrementAndGet();
 
-               if (logger.isLoggable(Level.FINE)) {
+               if (count > 1) {
                        logger.info("HB count : " + count);
                }
        }
index 08e75c4..8a86922 100644 (file)
@@ -369,11 +369,14 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                                if (currentState.isNeedToUpdateDisplay() == true) {
                                        currentState.setNeedToUpdateDisplay(false);
 
-                                       /* Let's do one more update for sdl display surface
-                                       while skipping of framebuffer drawing */
-                                       DisplayStateData lcdStateData = new DisplayStateData(
-                                                       currentState.getCurrentScale(), currentState.getCurrentRotationId());
-                                       skin.communicator.sendToQEMU(SendCommand.CHANGE_LCD_STATE, lcdStateData);
+                                       if (skin.communicator.isSensorDaemonStarted() == true) {
+                                               /* Let's do one more update for sdl display surface
+                                               while skipping of framebuffer drawing */
+                                               DisplayStateData lcdStateData = new DisplayStateData(
+                                                               currentState.getCurrentScale(), currentState.getCurrentRotationId());
+                                               skin.communicator.sendToQEMU(
+                                                               SendCommand.CHANGE_LCD_STATE, lcdStateData, false);
+                                       }
                                }
 
                                /* general shell does not support native transparency,
index 349d35c..9b59b73 100644 (file)
@@ -275,11 +275,14 @@ public class PhoneShapeSkinComposer implements ISkinComposer {
                                        currentState.setNeedToUpdateDisplay(false);
                                        lcdCanvas.setBounds(currentState.getDisplayBounds());
 
-                                       /* Let's do one more update for sdl display surface
-                                       while skipping of framebuffer drawing */
-                                       DisplayStateData lcdStateData = new DisplayStateData(
-                                                       currentState.getCurrentScale(), currentState.getCurrentRotationId());
-                                       skin.communicator.sendToQEMU(SendCommand.CHANGE_LCD_STATE, lcdStateData);
+                                       if (skin.communicator.isSensorDaemonStarted() == true) {
+                                               /* Let's do one more update for sdl display surface
+                                               while skipping of framebuffer drawing */
+                                               DisplayStateData lcdStateData = new DisplayStateData(
+                                                               currentState.getCurrentScale(), currentState.getCurrentRotationId());
+                                               skin.communicator.sendToQEMU(
+                                                               SendCommand.CHANGE_LCD_STATE, lcdStateData, false);
+                                       }
                                }
 
                                /* general shell does not support native transparency,
index 17458a8..30b7430 100644 (file)
@@ -1216,8 +1216,8 @@ static void* do_heart_beat(void* args)
 
         pthread_mutex_lock( &mutex_recv_heartbeat_count );
         recv_heartbeat_count++;
-        if ( 1 < recv_heartbeat_count ) {
-            TRACE( "[HB] recv_heartbeat_count:%d\n", recv_heartbeat_count );
+        if (1 < recv_heartbeat_count) {
+            INFO("[HB] recv_heartbeat_count:%d\n", recv_heartbeat_count);
         }
         pthread_mutex_unlock( &mutex_recv_heartbeat_count );