Skip to content

Commit

Permalink
Fix duplicated OMX.qcom.audio.decoder.aac entry
Browse files Browse the repository at this point in the history 
There are duplcated aac audio decoder entry in the OMX table.
This fixes:
E OMXMaster: A component of name 'OMX.qcom.audio.decoder.aac' already exists, ignoring this one.

Change-Id: I6a6cab63c8bec54528c862c05b22dbb4dace6330
  • Loading branch information
@alviteri
Keith Mok authored and alviteri committed Dec 21, 2016
1 parent 2fb47ed commit 38aa763
Show file tree
Hide file tree
Showing 21 changed files with 0 additions and 300 deletions.
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/8084/qc_registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,22 +440,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/8084/qc_registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,22 +487,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/8226/qc_registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,19 +391,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/8226/qc_registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,19 +430,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/8610/qc_registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,19 +404,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/8610/qc_registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,19 +404,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/8960/qc_registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,22 +424,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/8974/qc_registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,19 +404,6 @@ omx_core_cb_type core[] =
"audio_decoder.awbplus"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/8974/qc_registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,19 +455,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/msm8952/registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,19 +495,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8974/mm-core/src/msm8952/registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,19 +534,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/msm8992/registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,22 +456,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/msm8992/registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,22 +567,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/msm8994/registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,22 +440,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/msm8994/registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,22 +583,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/plutonium/registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,22 +440,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
16 changes: 0 additions & 16 deletions msm8974/mm-core/src/plutonium/registry_table_android.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,22 +503,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL,
NULL,
NULL,
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
13 changes: 0 additions & 13 deletions msm8996/mm-core/src/8952/registry_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,19 +495,6 @@ omx_core_cb_type core[] =
"audio_encoder.amrnb"
}
},
{
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle
{
NULL
},
NULL, // Shared object library handle
"libOmxAacDec.so",
{
"audio_decoder.aac"
}
},
{
"OMX.qcom.audio.decoder.multiaac",
NULL, // Create instance function
Expand Down
Loading

0 comments on commit 38aa763

Please sign in to comment.