Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-stagefright-plugins: 提交

external/stagefright-plugins


Commit MetaInfo

修订版6227c85ff014b42b020033920fe0296287169742 (tree)
时间2017-08-24 01:03:28
作者Chih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Merge remote-tracking branch 'los/cm-14.1' into nougat-x86

更改概述

差异

--- a/extractor/FFmpegExtractor.cpp
+++ b/extractor/FFmpegExtractor.cpp
@@ -349,7 +349,7 @@ bool FFmpegExtractor::is_codec_supported(enum AVCodecID codec_id)
349349 supported = true;
350350 break;
351351 default:
352- ALOGD("unsuppoted codec(%s), but give it a chance",
352+ ALOGD("unsupported codec (%s), but give it a chance",
353353 avcodec_get_name(codec_id));
354354 //Won't promise that the following codec id can be supported.
355355 //Just give these codecs a chance.
@@ -422,7 +422,7 @@ sp<MetaData> FFmpegExtractor::setVideoFormat(AVStream *stream)
422422 meta = setVP9Format(avctx);
423423 break;
424424 default:
425- ALOGD("unsuppoted video codec(id:%d, name:%s), but give it a chance",
425+ ALOGD("unsupported video codec (id: %d, name: %s), but give it a chance",
426426 avctx->codec_id, avcodec_get_name(avctx->codec_id));
427427 meta = new MetaData;
428428 meta->setInt32(kKeyCodecId, avctx->codec_id);
@@ -541,7 +541,7 @@ sp<MetaData> FFmpegExtractor::setAudioFormat(AVStream *stream)
541541 meta = setALACFormat(avctx);
542542 break;
543543 default:
544- ALOGD("unsuppoted audio codec(id:%d, name:%s), but give it a chance",
544+ ALOGD("unsupported audio codec (id: %d, name: %s), but give it a chance",
545545 avctx->codec_id, avcodec_get_name(avctx->codec_id));
546546 meta = new MetaData;
547547 meta->setInt32(kKeyCodecId, avctx->codec_id);
@@ -1704,6 +1704,7 @@ static bool isCodecSupportedByStagefright(enum AVCodecID codec_id)
17041704 case AV_CODEC_ID_PCM_U8:
17051705 case AV_CODEC_ID_PCM_S16LE:
17061706 case AV_CODEC_ID_PCM_S24LE:
1707+ case AV_CODEC_ID_OPUS:
17071708 supported = true;
17081709 break;
17091710
@@ -1711,7 +1712,7 @@ static bool isCodecSupportedByStagefright(enum AVCodecID codec_id)
17111712 break;
17121713 }
17131714
1714- ALOGD("%ssuppoted codec(%s) by official Stagefright",
1715+ ALOGD("%ssupported codec (%s) by official Stagefright",
17151716 (supported ? "" : "un"),
17161717 avcodec_get_name(codec_id));
17171718
@@ -1860,6 +1861,7 @@ static void adjustMKVConfidence(AVFormatContext *ic, float *confidence)
18601861 if (codec_id != AV_CODEC_ID_NONE
18611862 && codec_id != AV_CODEC_ID_AAC
18621863 && codec_id != AV_CODEC_ID_MP3
1864+ && codec_id != AV_CODEC_ID_OPUS
18631865 && codec_id != AV_CODEC_ID_VORBIS) {
18641866 ALOGI("[mkv]audio codec(%s), confidence should be larger than MatroskaExtractor",
18651867 avcodec_get_name(codec_id));
Show on old repository browser