From: Younghwan Ahn Date: Thu, 20 Sep 2012 06:22:41 +0000 (+0900) Subject: clean up for 2.0 beta X-Git-Tag: submit/tizen_2.1/20130424.232047~6^2~42^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12e16bfca07af4ff128564d3e156c97c6eb481b1;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git clean up for 2.0 beta Change-Id: I3cc7e7584652a82e7a9be32e7be5925bb66cc39e --- diff --git a/src/include/mm_player.h b/src/include/mm_player.h index 7d3ce63..24a7afd 100755 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An , - * naveen cherukuri + * YoungHwan An , naveen cherukuri * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An , - * naveen cherukuri + * YoungHwan An , naveen cherukuri * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- 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 , YeJin Cho , - * YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- a/src/include/mm_player_capture.h +++ b/src/include/mm_player_capture.h @@ -3,8 +3,7 @@ * * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: JongHyuk Choi , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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_ini.h b/src/include/mm_player_ini.h index 6fb472f..46e5ad3 100755 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * 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 --- 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 , YeJin Cho , - * Seungbae Shin , YoungHwan An + * Contact: JongHyuk Choi , YeJin Cho , YoungHwan An * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.