mm-video : remove divx/xvid support from swcodecs
- Remove divx/divx4 enteries from XML files.
- Remove divx/divx4 MimeType to component name mapping
from registry files.
- Removes divx specific code.
Change-Id: I155a1d43bad0d93479755a255c09690d4484a7d6
diff --git a/conf_files/bengal/media_codecs.xml b/conf_files/bengal/media_codecs.xml
index 2cc2e5f..bba0ed2 100644
--- a/conf_files/bengal/media_codecs.xml
+++ b/conf_files/bengal/media_codecs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012-2019 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2020 The Linux Foundation. All rights reserved.
Not a contribution.
Copyright (C) 2012-2013 The Android Open Source Project
@@ -90,7 +90,6 @@
| hevc | 1920 1080 60 60 489600 |
| vp9 | 1920 1088 60 60 489600 |
| mpeg4-sw | 1920 1088 30 40 244800 |
- | div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
|_____________|_________________________________________|
@@ -291,28 +290,6 @@
<Limit name="frame-rate" range="1-30" />
<Limit name="concurrent-instances" max="16" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
- </MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/conf_files/bengal/media_codecs_vendor.xml b/conf_files/bengal/media_codecs_vendor.xml
index 204a1e3..6212b93 100644
--- a/conf_files/bengal/media_codecs_vendor.xml
+++ b/conf_files/bengal/media_codecs_vendor.xml
@@ -90,7 +90,6 @@
| hevc | 1920 1080 60 60 489600 |
| vp9 | 1920 1088 60 60 489600 |
| mpeg4-sw | 1920 1088 30 40 244800 |
- | div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
|_____________|_________________________________________|
@@ -292,28 +291,6 @@
<Limit name="frame-rate" range="1-30" />
<Limit name="concurrent-instances" max="16" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
- </MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/conf_files/bengal/media_codecs_vendor_v1.xml b/conf_files/bengal/media_codecs_vendor_v1.xml
index 71a615f..759f1de 100644
--- a/conf_files/bengal/media_codecs_vendor_v1.xml
+++ b/conf_files/bengal/media_codecs_vendor_v1.xml
@@ -90,7 +90,6 @@
| hevc | 1920 1080 30 60 244800 |
| vp9 | 1920 1088 30 60 244800 |
| mpeg4-sw | 1920 1088 30 40 244800 |
- | div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
|_____________|_________________________________________|
@@ -304,28 +303,6 @@
<Limit name="frame-rate" range="1-30" />
<Limit name="concurrent-instances" max="16" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
- </MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/conf_files/kona/media_codecs.xml b/conf_files/kona/media_codecs.xml
index 430f644..fa3cb5c 100644
--- a/conf_files/kona/media_codecs.xml
+++ b/conf_files/kona/media_codecs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012-2019 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2020 The Linux Foundation. All rights reserved.
Not a contribution.
Copyright (C) 2012-2013 The Android Open Source Project
@@ -128,7 +128,6 @@
| | 3820 2160 240 220 7735500 |
| | 4096 2160 120 220 4147200 |
| | 7680 4320 60 220 7776000 |
- | div4/5/6-sw | 1920 1088 30 10 244800 244800 |
| h263-sw | 864 480 30 16 48600 48600 |
| mpeg2 | 1020 1088 60i 40 130050 244800 |
| | 1920 1088 30 40 244800 |
@@ -486,32 +485,6 @@
<Limit name="concurrent-instances" max="4" />
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1920" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="block-count" range="36-8160" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1920" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="block-count" range="36-8160" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
<MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
</Decoders>
<Include href="media_codecs_google_video.xml" />
diff --git a/conf_files/kona/media_codecs_vendor.xml b/conf_files/kona/media_codecs_vendor.xml
index f945c21..850b4d9 100644
--- a/conf_files/kona/media_codecs_vendor.xml
+++ b/conf_files/kona/media_codecs_vendor.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012-2019 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2020 The Linux Foundation. All rights reserved.
Not a contribution.
Copyright (C) 2012-2013 The Android Open Source Project
@@ -128,7 +128,6 @@
| | 3820 2160 240 220 7735500 |
| | 4096 2160 120 220 4147200 |
| | 7680 4320 60 220 7776000 |
- | div4/5/6-sw | 1920 1088 30 10 244800 244800 |
| h263-sw | 864 480 30 16 48600 48600 |
| mpeg2 | 1020 1088 60i 40 130050 244800 |
| | 1920 1088 30 40 244800 |
@@ -487,32 +486,6 @@
<Limit name="concurrent-instances" max="4" />
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1920" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="block-count" range="36-8160" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1920" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="block-count" range="36-8160" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/conf_files/lito/media_codecs.xml b/conf_files/lito/media_codecs.xml
index c2eeb96..67111bc 100644
--- a/conf_files/lito/media_codecs.xml
+++ b/conf_files/lito/media_codecs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012-2019 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2020 The Linux Foundation. All rights reserved.
Not a contribution.
Copyright (C) 2012-2013 The Android Open Source Project
@@ -96,7 +96,6 @@
| vp9 | 3840 2176 60 100 1958400 |
| | 4096 2176 48 100 |
| vc1 | 1920 1088 30 20 244800 |
- | div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
| mpeg2 | 1920 1088 30 40 244800 |
|_____________|_______________________________________|
@@ -396,30 +395,6 @@
<Limit name="concurrent-instances" max="4" />
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/conf_files/lito/media_codecs_vendor.xml b/conf_files/lito/media_codecs_vendor.xml
index 531a84b..f9a5cc3 100644
--- a/conf_files/lito/media_codecs_vendor.xml
+++ b/conf_files/lito/media_codecs_vendor.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012-2019 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2020 The Linux Foundation. All rights reserved.
Not a contribution.
Copyright (C) 2012-2013 The Android Open Source Project
@@ -96,7 +96,6 @@
| vp9 | 3840 2176 60 100 1958400 |
| | 4096 2176 48 100 |
| vc1 | 1920 1088 30 20 244800 |
- | div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
| mpeg2 | 1920 1088 30 40 244800 |
|_____________|_______________________________________|
@@ -410,30 +409,6 @@
<Limit name="concurrent-instances" max="4" />
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/conf_files/lito/media_codecs_vendor_v1.xml b/conf_files/lito/media_codecs_vendor_v1.xml
index 7a49364..ba73584 100644
--- a/conf_files/lito/media_codecs_vendor_v1.xml
+++ b/conf_files/lito/media_codecs_vendor_v1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012-2019 The Linux Foundation. All rights reserved.
+<!-- Copyright (C) 2012-2020 The Linux Foundation. All rights reserved.
Not a contribution.
Copyright (C) 2012-2013 The Android Open Source Project
@@ -95,7 +95,6 @@
| vp9 | 3840 2176 30 100 979200 |
| | 4096 2176 24 100 |
| vc1 | 1920 1088 30 20 244800 |
- | div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
| mpeg2 | 1920 1088 30 40 244800 |
|_____________|______________________________________|
@@ -406,30 +405,6 @@
<Limit name="concurrent-instances" max="4" />
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
- <MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports" />
- <Limit name="size" min="96x96" max="1920x1088" />
- <Limit name="alignment" value="2x2" />
- <Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="36" max="244800" />
- <Limit name="frame-rate" range="1-30" />
- <Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="4" />
- <Limit name="performance-point-1920x1080" value="30" />
- </MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/mm-core/src/common/qc_omx_core.h b/mm-core/src/common/qc_omx_core.h
index 1f5cd0b..c636d5d 100644
--- a/mm-core/src/common/qc_omx_core.h
+++ b/mm-core/src/common/qc_omx_core.h
@@ -39,11 +39,6 @@
#include "qc_omx_common.h" // OMX API
#include <string.h>
-#ifdef _ANDROID_O_MR1_DIVX_CHANGES
-#define DIVX4_MIME "video_decoder.divx4"
-#else
-#define DIVX4_MIME "video_decoder.divx"
-#endif
#define OMX_REGISTRY_ENTRY(name, lib_name, role) \
{ \
diff --git a/mm-core/src/registry_table.c b/mm-core/src/registry_table.c
index 494d14e..6e7eaa8 100644
--- a/mm-core/src/registry_table.c
+++ b/mm-core/src/registry_table.c
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
-Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -47,8 +47,6 @@
OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.vp8", "libOmxVdec.so", "video_decoder.vp8"),
OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.vp9", "libOmxVdec.so", "video_decoder.vp9"),
OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.mpeg4sw", "libOmxSwVdec.so", "video_decoder.mpeg4"),
- OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.divxsw", "libOmxSwVdec.so", "video_decoder.divx"),
- OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.divx4sw", "libOmxSwVdec.so", DIVX4_MIME),
OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.h263sw", "libOmxSwVdec.so", "video_decoder.h263"),
OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.mpeg4sw", "libOmxSwVencMpeg4.so", "video_encoder.mpeg4"),
OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.h263sw", "libOmxSwVencMpeg4.so", "video_encoder.h263"),
diff --git a/mm-core/src/registry_table_android.c b/mm-core/src/registry_table_android.c
index 6146d3a..a52fb38 100644
--- a/mm-core/src/registry_table_android.c
+++ b/mm-core/src/registry_table_android.c
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------------
-Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -51,8 +51,6 @@
OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.vp9", "libOmxVdec.so", "video_decoder.vp9"),
OMX_REGISTRY_ENTRY("OMX.qcom.video.decoder.vp9.secure", "libOmxVdec.so", "video_decoder.vp9"),
OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.mpeg4sw", "libOmxSwVdec.so", "video_decoder.mpeg4"),
- OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.divxsw", "libOmxSwVdec.so", "video_decoder.divx"),
- OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.divx4sw", "libOmxSwVdec.so", DIVX4_MIME),
OMX_REGISTRY_ENTRY("OMX.qti.video.decoder.h263sw", "libOmxSwVdec.so", "video_decoder.h263"),
OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.mpeg4sw", "libOmxSwVencMpeg4.so", "video_encoder.mpeg4"),
OMX_REGISTRY_ENTRY("OMX.qcom.video.encoder.h263sw", "libOmxSwVencMpeg4.so", "video_encoder.h263"),
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp b/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
index 9c04ae1..8af50ad 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_swvdec.cpp
@@ -192,28 +192,6 @@
m_omx_video_codingtype = OMX_VIDEO_CodingH263;
}
else if (((!strncmp(cmp_name,
- "OMX.qti.video.decoder.divxsw",
- OMX_MAX_STRINGNAME_SIZE))) ||
- ((!strncmp(cmp_name,
- "OMX.qti.video.decoder.divx4sw",
- OMX_MAX_STRINGNAME_SIZE))))
- {
- OMX_SWVDEC_LOG_LOW("video_decoder.divx");
-
- strlcpy(m_cmp_name, cmp_name, OMX_MAX_STRINGNAME_SIZE);
-#ifndef _ANDROID_O_MR1_DIVX_CHANGES
- strlcpy(m_role_name, "video_decoder.divx", OMX_MAX_STRINGNAME_SIZE);
-#else
- if(!strncmp(cmp_name,"OMX.qti.video.decoder.divx4sw", OMX_MAX_STRINGNAME_SIZE))
- strlcpy(m_role_name, "video_decoder.divx4", OMX_MAX_STRINGNAME_SIZE);
- else
- strlcpy(m_role_name, "video_decoder.divx", OMX_MAX_STRINGNAME_SIZE);
-#endif
-
- m_swvdec_codec = SWVDEC_CODEC_MPEG4;
- m_omx_video_codingtype = ((OMX_VIDEO_CODINGTYPE) QOMX_VIDEO_CodingDivx);
- }
- else if (((!strncmp(cmp_name,
"OMX.qti.video.decoder.vc1sw",
OMX_MAX_STRINGNAME_SIZE)))||
((!strncmp(cmp_name,
