OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es

Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

external-stagefright-plugins: Commit

external/stagefright-plugins


Commit MetaInfo

Revisión84eca1825c3971489fa21389a565f0cf6a1e2555 (tree)
Tiempo2017-04-28 13:41:46
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Merge branch 'lollipop-x86' into multiwindow-hwaccel

Cambiar Resumen

Diferencia incremental

--- a/data/media_codecs_ffmpeg.xml
+++ b/data/media_codecs_ffmpeg.xml
@@ -38,7 +38,9 @@
3838 <Limit name="channel-count" max="8" />
3939 <Limit name="sample-rate" ranges="8000-192000" />
4040 </MediaCodec>
41- <MediaCodec name="OMX.ffmpeg.dts.decoder" type="audio/dts" >
41+ <MediaCodec name="OMX.ffmpeg.dts.decoder">
42+ <Type name="audio/vnd.dts" />
43+ <Type name="audio/dts" />
4244 <Limit name="channel-count" max="8" />
4345 <Limit name="sample-rate" ranges="8000-192000" />
4446 </MediaCodec>
--- a/extractor/FFmpegExtractor.cpp
+++ b/extractor/FFmpegExtractor.cpp
@@ -15,7 +15,6 @@
1515 * limitations under the License.
1616 */
1717
18-//#define LOG_NDEBUG 0
1918 #define LOG_TAG "FFmpegExtractor"
2019 #include <utils/Log.h>
2120
@@ -61,6 +60,7 @@
6160 #define DEBUG_DISABLE_VIDEO 0
6261 #define DEBUG_DISABLE_AUDIO 0
6362 #define DEBUG_PKT 0
63+#define DEBUG_EXTRADATA 0
6464 #define DEBUG_FORMATS 0
6565
6666 enum {
@@ -657,14 +657,14 @@ int FFmpegExtractor::stream_component_open(int stream_index)
657657 }
658658 return ret;
659659 }
660-
660+#if DEBUG_EXTRADATA
661661 if (avctx->extradata) {
662662 ALOGV("video stream extradata:");
663663 hexdump(avctx->extradata, avctx->extradata_size);
664664 } else {
665665 ALOGV("video stream no extradata, but we can ignore it.");
666666 }
667-
667+#endif
668668 meta = setVideoFormat(mVideoStream);
669669 if (meta == NULL) {
670670 ALOGE("setVideoFormat failed");
@@ -699,14 +699,14 @@ int FFmpegExtractor::stream_component_open(int stream_index)
699699 }
700700 return ret;
701701 }
702-
702+#if DEBUG_EXTRADATA
703703 if (avctx->extradata) {
704704 ALOGV("audio stream extradata(%d):", avctx->extradata_size);
705705 hexdump(avctx->extradata, avctx->extradata_size);
706706 } else {
707707 ALOGV("audio stream no extradata, but we can ignore it.");
708708 }
709-
709+#endif
710710 meta = setAudioFormat(mAudioStream);
711711 if (meta == NULL) {
712712 ALOGE("setAudioFormat failed");
--- a/omx/SoftFFmpegAudio.cpp
+++ b/omx/SoftFFmpegAudio.cpp
@@ -15,7 +15,6 @@
1515 * limitations under the License.
1616 */
1717
18-//#define LOG_NDEBUG 0
1918 #define LOG_TAG "SoftFFmpegAudio"
2019 #include <utils/Log.h>
2120 #include <cutils/properties.h>
@@ -33,11 +32,13 @@
3332
3433 #define DEBUG_PKT 0
3534 #define DEBUG_FRM 0
35+#define DEBUG_EXTRADATA 0
3636
3737 namespace android {
3838
3939 template<class T>
4040 static void InitOMXParams(T *params) {
41+ memset(params, 0, sizeof(T));
4142 params->nSize = sizeof(T);
4243 params->nVersion.s.nVersionMajor = 1;
4344 params->nVersion.s.nVersionMinor = 0;
@@ -980,9 +981,11 @@ int32_t SoftFFmpegAudio::handleExtradata() {
980981 BufferInfo *inInfo = *inQueue.begin();
981982 OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
982983
984+#if DEBUG_EXTRADATA
983985 ALOGI("got extradata, ignore: %d, size: %u",
984986 mIgnoreExtradata, inHeader->nFilledLen);
985987 hexdump(inHeader->pBuffer + inHeader->nOffset, inHeader->nFilledLen);
988+#endif
986989
987990 if (mIgnoreExtradata) {
988991 ALOGI("got extradata, size: %u, but ignore it", inHeader->nFilledLen);
@@ -1035,8 +1038,10 @@ int32_t SoftFFmpegAudio::openDecoder() {
10351038 }
10361039 deinitVorbisHdr();
10371040 }
1041+#if DEBUG_EXTRADATA
10381042 ALOGI("extradata is ready, size: %d", mCtx->extradata_size);
10391043 hexdump(mCtx->extradata, mCtx->extradata_size);
1044+#endif
10401045 mExtradataReady = true;
10411046 }
10421047
--- a/omx/SoftFFmpegVideo.cpp
+++ b/omx/SoftFFmpegVideo.cpp
@@ -15,7 +15,6 @@
1515 * limitations under the License.
1616 */
1717
18-//#define LOG_NDEBUG 0
1918 #define LOG_TAG "SoftFFmpegVideo"
2019 #include <utils/Log.h>
2120
@@ -29,6 +28,7 @@
2928
3029 #define DEBUG_PKT 0
3130 #define DEBUG_FRM 0
31+#define DEBUG_EXTRADATA 0
3232
3333 static int decoder_reorder_pts = -1;
3434
@@ -347,9 +347,11 @@ int32_t SoftFFmpegVideo::handleExtradata() {
347347 BufferInfo *inInfo = *inQueue.begin();
348348 OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
349349
350+#if DEBUG_EXTRADATA
350351 ALOGI("got extradata, ignore: %d, size: %u",
351352 mIgnoreExtradata, inHeader->nFilledLen);
352353 hexdump(inHeader->pBuffer + inHeader->nOffset, inHeader->nFilledLen);
354+#endif
353355
354356 if (mIgnoreExtradata) {
355357 ALOGI("got extradata, size: %u, but ignore it", inHeader->nFilledLen);
@@ -388,8 +390,10 @@ int32_t SoftFFmpegVideo::openDecoder() {
388390 }
389391
390392 if (!mExtradataReady) {
393+#if DEBUG_EXTRADATA
391394 ALOGI("extradata is ready, size: %d", mCtx->extradata_size);
392395 hexdump(mCtx->extradata, mCtx->extradata_size);
396+#endif
393397 mExtradataReady = true;
394398 }
395399
--- a/utils/codec_utils.cpp
+++ b/utils/codec_utils.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-//#define LOG_NDEBUG 0
1817 #define LOG_TAG "codec_utils"
1918 #include <utils/Log.h>
2019
--- a/utils/ffmpeg_source.cpp
+++ b/utils/ffmpeg_source.cpp
@@ -14,7 +14,6 @@
1414 * limitations under the License.
1515 */
1616
17-//#define LOG_NDEBUG 0
1817 #define LOG_TAG "FFMPEG"
1918 #include <utils/Log.h>
2019
--- a/utils/ffmpeg_utils.cpp
+++ b/utils/ffmpeg_utils.cpp
@@ -15,7 +15,6 @@
1515 * limitations under the License.
1616 */
1717
18-//#define LOG_NDEBUG 0
1918 #define LOG_TAG "FFMPEG"
2019 #include <utils/Log.h>
2120
Show on old repository browser