clean up for 2.0 beta

diff --git a/src/include/mm_player.h b/src/include/mm_player.h
index 7d3ce63..24a7afd 100755 (executable)
--- a/src/include/mm_player.h
+++ b/src/include/mm_player.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_ahs.h b/src/include/mm_player_ahs.h
index 7caafe7..f220543 100755 (executable)
--- a/src/include/mm_player_ahs.h
+++ b/src/include/mm_player_ahs.h
@@ -4,8 +4,7 @@
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>,
- * naveen cherukuri <naveen.ch@samsung.com>
+ * YoungHwan An <younghwan_.an@samsung.com>, naveen cherukuri <naveen.ch@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_ahs_hls.h b/src/include/mm_player_ahs_hls.h
index 8bea5d5..0c765ad 100755 (executable)
--- a/src/include/mm_player_ahs_hls.h
+++ b/src/include/mm_player_ahs_hls.h
@@ -4,8 +4,7 @@
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>,
- * naveen cherukuri <naveen.ch@samsung.com>
+ * YoungHwan An <younghwan_.an@samsung.com>, naveen cherukuri <naveen.ch@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_asm.h b/src/include/mm_player_asm.h
index dc5f8b2..cd9197f 100755 (executable)
--- a/src/include/mm_player_asm.h
+++ b/src/include/mm_player_asm.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_attrs.h b/src/include/mm_player_attrs.h
index 12d124f..846bbba 100755 (executable)
--- a/src/include/mm_player_attrs.h
+++ b/src/include/mm_player_attrs.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_capture.h b/src/include/mm_player_capture.h
index 81eb123..b4349e8 100755 (executable)
--- a/src/include/mm_player_capture.h
+++ b/src/include/mm_player_capture.h
@@ -3,8 +3,7 @@
  *\r
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
  *\r
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,\r
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>\r
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r

diff --git a/src/include/mm_player_ini.h b/src/include/mm_player_ini.h
index 6fb472f..46e5ad3 100755 (executable)
--- a/src/include/mm_player_ini.h
+++ b/src/include/mm_player_ini.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,72 +99,54 @@ typedef struct __mm_player_ini
        guint rtsp_rebuffering_time;
        gboolean rtsp_do_typefinding;
        gboolean rtsp_error_concealment; /* testing purpose */
-
-       /* hw accelation */
-       gboolean use_video_hw_accel; // @
-       
-       /* priority */
-       gboolean use_priority_setting;
-       gint demux_priority;
-       gint audiosink_priority;
-       gint videosink_priority;
-       gint ringbuffer_priority;
 } mm_player_ini_t;
 
 /* default values if each values are not specified in inifile */
 /* general */
-#define DEFAULT_USE_DECODEBIN                          FALSE
-#define DEFAULT_USE_AUDIO_FILTER_PRESET                        FALSE
-#define DEFAULT_AUDIO_FILTER_PRESET_LIST               ""
-#define DEFAULT_AUDIO_FILTER_PRESET_LIST_EARPHONE_ONLY ""
-#define DEFAULT_USE_AUDIO_FILTER_CUSTOM                        FALSE
-#define DEFAULT_AUDIO_FILTER_CUSTOM_LIST               ""
+#define DEFAULT_USE_DECODEBIN                                                                  FALSE
+#define DEFAULT_USE_AUDIO_FILTER_PRESET                                                FALSE
+#define DEFAULT_AUDIO_FILTER_PRESET_LIST                                               ""
+#define DEFAULT_AUDIO_FILTER_PRESET_LIST_EARPHONE_ONLY         ""
+#define DEFAULT_USE_AUDIO_FILTER_CUSTOM                                                FALSE
+#define DEFAULT_AUDIO_FILTER_CUSTOM_LIST                                               ""
 #define DEFAULT_AUDIO_FILTER_CUSTOM_LIST_EARPHONE_ONLY ""
-#define DEFAULT_AUDIO_FILTER_CUSTOM_EQ_NUM             0
-#define DEFAULT_AUDIO_FILTER_CUSTOM_EQ_MIN             0
-#define DEFAULT_AUDIO_FILTER_CUSTOM_EQ_MAX             0
-#define DEFAULT_AUDIO_FILTER_CUSTOM_EXT_NUM            0
-#define DEFAULT_USE_SINK_HANDLER                       TRUE
-#define DEFAULT_SKIP_RESCAN                            TRUE
-#define DEFAULT_GENERATE_DOT                           FALSE
-#define DEFAULT_PROVIDE_CLOCK                          TRUE
-#define DEFAULT_DELAY_BEFORE_REPEAT                    50 /* msec */
-#define DEFAULT_EOS_DELAY                              150 /* msec */
-#define DEFAULT_DRMSRC                                 "drmsrc"
-#define DEFAULT_VIDEO_SURFACE                          MM_DISPLAY_SURFACE_X
-#define DEFAULT_VIDEOSINK_X                            "xvimagesink"
-#define DEFAULT_VIDEOSINK_EVAS                         "evasimagesink"
-#define DEFAULT_VIDEOSINK_FAKE                         "fakesink"
-#define DEFAULT_AUDIOSINK                              "avsysaudiosink"
-#define DEFAULT_GST_PARAM                              ""
-#define DEFAULT_EXCLUDE_KEYWORD                                ""
-#define DEFAULT_ASYNC_START                            TRUE
-#define DEFAULT_DISABLE_SEGTRAP                                TRUE
-#define DEFAULT_VIDEO_CONVERTER                                ""
-#define DEFAULT_MULTIPLE_CODEC_SUPPORTED               TRUE
-#define DEFAULT_LIVE_STATE_CHANGE_TIMEOUT              30 /* sec */
-#define DEFAULT_LOCALPLAYBACK_STATE_CHANGE_TIMEOUT     10 /* sec */
+#define DEFAULT_AUDIO_FILTER_CUSTOM_EQ_NUM                                     0
+#define DEFAULT_AUDIO_FILTER_CUSTOM_EQ_MIN                                     0
+#define DEFAULT_AUDIO_FILTER_CUSTOM_EQ_MAX                                     0
+#define DEFAULT_AUDIO_FILTER_CUSTOM_EXT_NUM                            0
+#define DEFAULT_USE_SINK_HANDLER                                                               TRUE
+#define DEFAULT_SKIP_RESCAN                                                                    TRUE
+#define DEFAULT_GENERATE_DOT                                                                   FALSE
+#define DEFAULT_PROVIDE_CLOCK                                                                  TRUE
+#define DEFAULT_DELAY_BEFORE_REPEAT                                                    50 /* msec */
+#define DEFAULT_EOS_DELAY                                                                              150 /* msec */
+#define DEFAULT_DRMSRC                                                                                 "drmsrc"
+#define DEFAULT_VIDEO_SURFACE                                                                  MM_DISPLAY_SURFACE_X
+#define DEFAULT_VIDEOSINK_X                                                                    "xvimagesink"
+#define DEFAULT_VIDEOSINK_EVAS                                                         "evasimagesink"
+#define DEFAULT_VIDEOSINK_FAKE                                                         "fakesink"
+#define DEFAULT_AUDIOSINK                                                                              "avsysaudiosink"
+#define DEFAULT_GST_PARAM                                                                              ""
+#define DEFAULT_EXCLUDE_KEYWORD                                                                ""
+#define DEFAULT_ASYNC_START                                                                    TRUE
+#define DEFAULT_DISABLE_SEGTRAP                                                                TRUE
+#define DEFAULT_VIDEO_CONVERTER                                                                ""
+#define DEFAULT_MULTIPLE_CODEC_SUPPORTED                                       TRUE
+#define DEFAULT_LIVE_STATE_CHANGE_TIMEOUT                                      30 /* sec */
+#define DEFAULT_LOCALPLAYBACK_STATE_CHANGE_TIMEOUT             10 /* sec */
 /* http streaming */
-#define DEFAULT_HTTPSRC                                "souphttpsrc"
-#define DEFAULT_HTTP_FILE_BUFFER_PATH          ""
-#define DEFAULT_HTTP_BUFFERING_LIMIT   99.0            /* percent */
-#define DEFAULT_HTTP_MAX_SIZE_BYTES            1048576         /* bytes : 1 MBytes  */
-#define DEFAULT_HTTP_BUFFERING_TIME            3.0             /* sec */
-#define DEFAULT_HTTP_TIMEOUT                 30              /* sec */
+#define DEFAULT_HTTPSRC                                                                                "souphttpsrc"
+#define DEFAULT_HTTP_FILE_BUFFER_PATH                                          ""
+#define DEFAULT_HTTP_BUFFERING_LIMIT                                                   99.0            /* percent */
+#define DEFAULT_HTTP_MAX_SIZE_BYTES                                                    1048576         /* bytes : 1 MBytes  */
+#define DEFAULT_HTTP_BUFFERING_TIME                                                    3.0             /* sec */
+#define DEFAULT_HTTP_TIMEOUT                                                           30              /* sec */
 /* rtsp streaming */
-#define DEFAULT_RTSPSRC                                "secrtspsrc"
-#define DEFAULT_RTSP_BUFFERING                 5000    /* msec */
-#define DEFAULT_RTSP_REBUFFERING               15000   /* msec */
-#define DEFAULT_RTSP_DO_TYPEFINDING            FALSE
-#define DEFAULT_RTSP_ERROR_CONCEALMENT         TRUE
-/* hw accel */
-#define DEFAULT_USE_VIDEO_HW_ACCEL     FALSE
-/* priority */
-#define DEFAULT_USE_PRIORITY_SETTING   FALSE
-#define DEFAULT_PRIORITY_DEMUX         96
-#define DEFAULT_PRIORITY_VIDEO_SINK    97
-#define DEFAULT_PRIORITY_AUDIO_SINK    98
-#define DEFAULT_PRIORITY_RINGBUFFER    99
+#define DEFAULT_RTSPSRC                                                                                "secrtspsrc"
+#define DEFAULT_RTSP_BUFFERING                                                         5000    /* msec */
+#define DEFAULT_RTSP_REBUFFERING                                                               15000   /* msec */
+#define DEFAULT_RTSP_DO_TYPEFINDING                                                    FALSE
+#define DEFAULT_RTSP_ERROR_CONCEALMENT                                         TRUE
 
 /* NOTE : following content should be same with above default values */
 /* FIXIT : need smarter way to generate default ini file. */
@@ -253,27 +234,6 @@ rtsp do typefinding = no; if no, caps on rtspsrc:src pad will be used for autopl
 rtsp error concealment = yes \n\
 \n\
 \n\
-[hw accelation] \n\
-use video hw accel = yes \n\
-\n\
-\n\
-[features] \n\
-\n\
-audio filter = no \n\
-\n\
-\n\
-[priority] \n\
-\n\
-use priority setting = no \n\
-\n\
-demux = 95 \n\
-\n\
-videosink = 96 \n\
-\n\
-audiosink = 97\n\
-\n\
-ringbuffer = 98 \n\
-\n\
 "
 
 int

diff --git a/src/include/mm_player_internal.h b/src/include/mm_player_internal.h
index 9dd378b..520a41c 100755 (executable)
--- a/src/include/mm_player_internal.h
+++ b/src/include/mm_player_internal.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_priv.h b/src/include/mm_player_priv.h
index 35ada0a..2892dc3 100755 (executable)
--- a/src/include/mm_player_priv.h
+++ b/src/include/mm_player_priv.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_sndeffect.h b/src/include/mm_player_sndeffect.h
index b09ecda..acac600 100755 (executable)
--- a/src/include/mm_player_sndeffect.h
+++ b/src/include/mm_player_sndeffect.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_streaming.h b/src/include/mm_player_streaming.h
index 7889d84..8766bb3 100755 (executable)
--- a/src/include/mm_player_streaming.h
+++ b/src/include/mm_player_streaming.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/include/mm_player_utils.h b/src/include/mm_player_utils.h
index 81214bd..d46cd26 100755 (executable)
--- a/src/include/mm_player_utils.h
+++ b/src/include/mm_player_utils.h
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player.c b/src/mm_player.c
index 33f848f..ed39087 100755 (executable)
--- a/src/mm_player.c
+++ b/src/mm_player.c
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player_ahs.c b/src/mm_player_ahs.c
index 12f4d90..207ce3b 100755 (executable)
--- a/src/mm_player_ahs.c
+++ b/src/mm_player_ahs.c
@@ -4,8 +4,7 @@
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>,
- * naveen cherukuri <naveen.ch@samsung.com>
+ * YoungHwan An <younghwan_.an@samsung.com>, naveen cherukuri <naveen.ch@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player_ahs_hls.c b/src/mm_player_ahs_hls.c
index 78f173e..feb9da3 100755 (executable)
--- a/src/mm_player_ahs_hls.c
+++ b/src/mm_player_ahs_hls.c
@@ -4,8 +4,7 @@
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>,
- * naveen cherukuri <naveen.ch@samsung.com>
+ * YoungHwan An <younghwan_.an@samsung.com>, naveen cherukuri <naveen.ch@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player_asm.c b/src/mm_player_asm.c
index 57628c0..7e3a838 100755 (executable)
--- a/src/mm_player_asm.c
+++ b/src/mm_player_asm.c
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c
index 444066c..1edd098 100755 (executable)
--- a/src/mm_player_attrs.c
+++ b/src/mm_player_attrs.c
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player_capture.c b/src/mm_player_capture.c
index 68ac43b..1d8dc51 100755 (executable)
--- a/src/mm_player_capture.c
+++ b/src/mm_player_capture.c
@@ -3,8 +3,7 @@
  *\r
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
  *\r
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,\r
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>\r
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -19,7 +18,7 @@
  * limitations under the License.\r
  *\r
  */\r
-\r
+ \r
 /*===========================================================================================\r
 |                                                                                                                                                                                      |\r
 |  INCLUDE FILES                                                                                                                                                       |\r

diff --git a/src/mm_player_ini.c b/src/mm_player_ini.c
index 919c0e3..d6518b9 100755 (executable)
--- a/src/mm_player_ini.c
+++ b/src/mm_player_ini.c
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +37,8 @@ static mm_player_ini_t g_player_ini;
 /* internal functions, macros here */
 static gboolean        __generate_default_ini(void);
 static void    __get_string_list(gchar** out_list, gchar* str);
-
-static void __mm_player_ini_force_setting(void);
 static void __mm_player_ini_check_ini_status(void);
+//static void __mm_player_ini_force_setting(void);
 
 /* macro */
 #define MMPLAYER_INI_GET_STRING( x_item, x_ini, x_default ) \
@@ -267,16 +265,6 @@ mm_player_ini_load(void)
                g_player_ini.rtsp_rebuffering_time = iniparser_getint(dict, "rtsp streaming:rtsp rebuffering time", DEFAULT_RTSP_REBUFFERING);
                g_player_ini.rtsp_do_typefinding = iniparser_getboolean(dict, "rtsp streaming:rtsp do typefinding", DEFAULT_RTSP_DO_TYPEFINDING);
                g_player_ini.rtsp_error_concealment = iniparser_getboolean(dict, "rtsp streaming:rtsp error concealment", DEFAULT_RTSP_ERROR_CONCEALMENT);
-
-               /* hw accelation */
-               g_player_ini.use_video_hw_accel = iniparser_getboolean(dict, "hw accelation:use video hw accel", DEFAULT_USE_VIDEO_HW_ACCEL);
-               
-               /* priority */
-               g_player_ini.use_priority_setting = iniparser_getboolean(dict, "priority:use priority setting", DEFAULT_USE_PRIORITY_SETTING);
-               g_player_ini.demux_priority = iniparser_getint(dict, "priority:demux", DEFAULT_PRIORITY_DEMUX);
-               g_player_ini.videosink_priority = iniparser_getint(dict, "priority:videosink", DEFAULT_PRIORITY_VIDEO_SINK);
-               g_player_ini.audiosink_priority = iniparser_getint(dict, "priority:audiosink", DEFAULT_PRIORITY_AUDIO_SINK);
-               g_player_ini.ringbuffer_priority = iniparser_getint(dict, "priority:ringbuffer", DEFAULT_PRIORITY_RINGBUFFER);
        }       
        else /* if dict is not available just fill the structure with default value */
        {
@@ -331,16 +319,6 @@ mm_player_ini_load(void)
                g_player_ini.rtsp_rebuffering_time = DEFAULT_RTSP_REBUFFERING;
                g_player_ini.rtsp_do_typefinding = DEFAULT_RTSP_DO_TYPEFINDING;
                g_player_ini.rtsp_error_concealment = DEFAULT_RTSP_ERROR_CONCEALMENT;
-
-               /* hw accelation */
-               g_player_ini.use_video_hw_accel = DEFAULT_USE_VIDEO_HW_ACCEL;
-
-               /* priority  */
-               g_player_ini.use_priority_setting = DEFAULT_USE_PRIORITY_SETTING;
-               g_player_ini.demux_priority = DEFAULT_PRIORITY_DEMUX;
-               g_player_ini.videosink_priority = DEFAULT_PRIORITY_VIDEO_SINK;
-               g_player_ini.audiosink_priority = DEFAULT_PRIORITY_AUDIO_SINK;
-               g_player_ini.ringbuffer_priority = DEFAULT_PRIORITY_RINGBUFFER;
        }
 
        /* free dict as we got our own structure */
@@ -403,16 +381,6 @@ mm_player_ini_load(void)
        debug_log("rtsp_do_typefinding : %d \n", g_player_ini.rtsp_do_typefinding);
        debug_log("rtsp_error_concealment : %d \n", g_player_ini.rtsp_error_concealment);
 
-       /* hw accel */
-       debug_log("use_video_hw_accel : %d\n", g_player_ini.use_video_hw_accel);
-
-       /* priority */
-       debug_log("use_priority_setting : %d\n", g_player_ini.use_priority_setting);
-       debug_log("demux_priority : %d\n", g_player_ini.demux_priority);
-       debug_log("audiosink_priority : %d\n", g_player_ini.audiosink_priority);
-       debug_log("videosink_priority : %d\n", g_player_ini.videosink_priority);
-       debug_log("ringbuffer_priority : %d\n", g_player_ini.ringbuffer_priority);
-
        debug_log("---------------------------------------------------\n");     
 
        return MM_ERROR_NONE;
@@ -439,60 +407,13 @@ void __mm_player_ini_check_ini_status(void)
        }
 }
 
+#if 0
 static 
 void __mm_player_ini_force_setting(void)
 {
-       /* FIXIT : remove it when all other elements are available on simulator, SDK */
-       
-       #if ! defined(__arm__)
-               debug_warning("player is running on simulator. force to use ximagesink\n");
-               //g_player_ini.videosink_element = PLAYER_INI_VSINK_XIMAGESINK;
-               g_player_ini.use_audio_filter_preset = FALSE;
-               g_player_ini.use_audio_filter_custom = FALSE;
-
-               strcpy( g_player_ini.name_of_drmsrc, "filesrc" );
-
-               // Force setting for simulator :+:091218 
-               strcpy( g_player_ini.name_of_audiosink, "alsasink" );
-
-               
-//             __get_string_list( (gchar**) g_player_ini.exclude_element_keyword, "");
-               
-       #endif
-
-       #if defined(VDF_SDK) || defined (SEC_SDK)
-               debug_warning("player is running on SDK.\n");
-               debug_warning("So, it seems like that some plugin values are not same with those\n");
-               debug_warning("which are written in default ini file.\n");
-
-               //g_player_ini.videosink_element = PLAYER_INI_VSINK_XIMAGESINK;
-               g_player_ini.use_audio_filter_preset = FALSE;
-               g_player_ini.use_audio_filter_custom = FALSE;
-
-               strcpy( g_player_ini.name_of_drmsrc, "filesrc" );
-       #endif
-
-       #if defined(NEW_SOUND) 
-               strcpy (g_player_ini.name_of_audiosink, "soundsink"); // :+:090707
-       #endif
-
-       /* FIXIT : The HW quality of volans is not better than protector.
-        * So, it can't use same timeout value because state change(resume) is sometimes failed in volans.
-        * Thus, it should be set more than 10sec. 
-        */
-       #if defined(_MM_PROJECT_VOLANS)
-               g_player_ini.localplayback_state_change_timeout = 10;
-               debug_log("localplayback_state_change_timeout is set as 30sec by force\n");
-       #endif
-
-       #if 0
-       #if defined(_MM_PROJECT_VOLANS)
-               debug_warning("player is running on VOLANS\n");
-               g_player_ini.use_audio_filter = FALSE;          // (+)090702, disabled temporally
-       #endif
-       #endif
-       
+       //TODO:IF NEEDED
 }
+#endif
 
 mm_player_ini_t* 
 mm_player_ini_get_structure(void)

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index 30a7256..c40283f 100755 (executable)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -3347,18 +3346,17 @@ __mmplayer_gst_create_video_pipeline(mm_player_t* player, GstCaps* caps)
                if (strlen(PLAYER_INI()->name_of_video_converter) > 0)
                {
                        vconv_factory = PLAYER_INI()->name_of_video_converter;
-                       gboolean nv12t_hw_enabled = FALSE;
-
-                       if (player->is_nv12_tiled && PLAYER_INI()->use_video_hw_accel)
-                               nv12t_hw_enabled = TRUE;
-               
-                       if ( (nv12t_hw_enabled && (PLAYER_INI()->video_surface == MM_DISPLAY_SURFACE_EVAS) && !strcmp(PLAYER_INI()->videosink_element_evas, "evasimagesink")) )
-                       {
-                               vconv_factory = "fimcconvert";
-                       }
-                       else if (nv12t_hw_enabled)
+                       
+                       if (player->is_nv12_tiled)
                        {
-                               vconv_factory = NULL;
+                               if ( ((PLAYER_INI()->video_surface == MM_DISPLAY_SURFACE_EVAS) && !strcmp(PLAYER_INI()->videosink_element_evas, "evasimagesink")) )
+                               {
+                                       vconv_factory = "fimcconvert";
+                               }
+                               else
+                               {
+                                       vconv_factory = NULL;
+                               }
                        }
 
                        if (vconv_factory)
@@ -8031,9 +8029,6 @@ __mmplayer_try_to_plug(mm_player_t* player, GstPad *pad, const GstCaps *caps) //
                                                /* clean */
                                                MMPLAYER_FREEIF( caps_type );
                                                gst_object_unref (src_pad);
-
-                                               g_object_set( G_OBJECT (new_element), "hw-accel", PLAYER_INI()->use_video_hw_accel, NULL);
-                                               g_object_set( G_OBJECT (new_element), "err-conceal", TRUE, NULL);
                                        }
                                        else if (g_str_has_prefix(mime, "audio"))
                                        {

diff --git a/src/mm_player_sndeffect.c b/src/mm_player_sndeffect.c
index 09bd66b..9f2e88c 100755 (executable)
--- a/src/mm_player_sndeffect.c
+++ b/src/mm_player_sndeffect.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>,YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player_streaming.c b/src/mm_player_streaming.c
index adcb763..c0e9799 100755 (executable)
--- a/src/mm_player_streaming.c
+++ b/src/mm_player_streaming.c
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/mm_player_utils.c b/src/mm_player_utils.c
index 6ededf3..87438a4 100755 (executable)
--- a/src/mm_player_utils.c
+++ b/src/mm_player_utils.c
@@ -3,8 +3,7 @@
  *
  * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
  *
- * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>,
- * Seungbae Shin <seungbae.shin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, YeJin Cho <cho.yejin@samsung.com>, YoungHwan An <younghwan_.an@samsung.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.