summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbok Lee <gilbok.lee@samsung.com>2017-01-02 17:04:41 +0900
committerGilbok Lee <gilbok.lee@samsung.com>2017-01-04 18:00:40 +0900
commit637e1342fe78a70a7bc7b8777d4ce51b30b8ddd6 (patch)
treea2617ee3ada4cd2d6535a4771d39f4af1050ab48
parentc1960be2b37bbd3d5c1582918f4ff9fa762c9609 (diff)
downloadlibmm-player-637e1342fe78a70a7bc7b8777d4ce51b30b8ddd6.tar.gz
libmm-player-637e1342fe78a70a7bc7b8777d4ce51b30b8ddd6.tar.bz2
libmm-player-637e1342fe78a70a7bc7b8777d4ce51b30b8ddd6.zip
[v0.6.21] Disable webm media format
Change-Id: I214b9013662ddbcb6dc84dc93e9be7c2b8fb59fe
-rw-r--r--packaging/libmm-player.spec2
-rw-r--r--src/mm_player_priv.c11
2 files changed, 11 insertions, 2 deletions
diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index d2d2c92..242160d 100644
--- a/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@ -1,6 +1,6 @@
Name: libmm-player
Summary: Multimedia Framework Player Library
-Version: 0.6.20
+Version: 0.6.21
Release: 0
Group: Multimedia/Libraries
License: Apache-2.0
diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index e94848c..e3e2eaf 100644
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -10270,7 +10270,9 @@ GstCaps *caps, gpointer data)
if ((!MMPLAYER_IS_WFD_STREAMING(player)) &&
(!MMPLAYER_IS_RTSP_STREAMING(player)) &&
- (g_strrstr(player->type, "audio/x-raw-int"))) {
+ (g_strrstr(player->type, "audio/x-raw-int") ||
+ g_strrstr(player->type, "audio/webm") ||
+ g_strrstr(player->type, "video/webm"))) {
LOGE("not support media format\n");
if (player->msg_posted == FALSE) {
@@ -11792,7 +11794,14 @@ GstCaps * caps, gpointer data)
/* set it directly because not sent by TAG */
if (g_strrstr(caps_str, "mobile-xmf"))
mm_attrs_set_string_by_name(player->attrs, "content_audio_codec", "mobile-xmf");
+ if (g_strrstr(caps_str, "audio/webm")) {
+ LOGD("webm is not supported");
+ ret = FALSE;
+ }
MMPLAYER_FREEIF(caps_str);
+ } else if (g_str_has_prefix(mime, "video/webm")) {
+ LOGD("webm is not supported");
+ ret = FALSE;
} else if (g_str_has_prefix(mime, "video") && !player->ini.video_playback_supported) {
MMMessageParamType msg_param;
memset(&msg_param, 0, sizeof(MMMessageParamType));