external/stagefright-plugins
修订版 | 6227c85ff014b42b020033920fe0296287169742 (tree) |
---|---|
时间 | 2017-08-24 01:03:28 |
作者 | Chih-Wei Huang <cwhuang@linu...> |
Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'los/cm-14.1' into nougat-x86
@@ -349,7 +349,7 @@ bool FFmpegExtractor::is_codec_supported(enum AVCodecID codec_id) | ||
349 | 349 | supported = true; |
350 | 350 | break; |
351 | 351 | default: |
352 | - ALOGD("unsuppoted codec(%s), but give it a chance", | |
352 | + ALOGD("unsupported codec (%s), but give it a chance", | |
353 | 353 | avcodec_get_name(codec_id)); |
354 | 354 | //Won't promise that the following codec id can be supported. |
355 | 355 | //Just give these codecs a chance. |
@@ -422,7 +422,7 @@ sp<MetaData> FFmpegExtractor::setVideoFormat(AVStream *stream) | ||
422 | 422 | meta = setVP9Format(avctx); |
423 | 423 | break; |
424 | 424 | 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", | |
426 | 426 | avctx->codec_id, avcodec_get_name(avctx->codec_id)); |
427 | 427 | meta = new MetaData; |
428 | 428 | meta->setInt32(kKeyCodecId, avctx->codec_id); |
@@ -541,7 +541,7 @@ sp<MetaData> FFmpegExtractor::setAudioFormat(AVStream *stream) | ||
541 | 541 | meta = setALACFormat(avctx); |
542 | 542 | break; |
543 | 543 | 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", | |
545 | 545 | avctx->codec_id, avcodec_get_name(avctx->codec_id)); |
546 | 546 | meta = new MetaData; |
547 | 547 | meta->setInt32(kKeyCodecId, avctx->codec_id); |
@@ -1704,6 +1704,7 @@ static bool isCodecSupportedByStagefright(enum AVCodecID codec_id) | ||
1704 | 1704 | case AV_CODEC_ID_PCM_U8: |
1705 | 1705 | case AV_CODEC_ID_PCM_S16LE: |
1706 | 1706 | case AV_CODEC_ID_PCM_S24LE: |
1707 | + case AV_CODEC_ID_OPUS: | |
1707 | 1708 | supported = true; |
1708 | 1709 | break; |
1709 | 1710 |
@@ -1711,7 +1712,7 @@ static bool isCodecSupportedByStagefright(enum AVCodecID codec_id) | ||
1711 | 1712 | break; |
1712 | 1713 | } |
1713 | 1714 | |
1714 | - ALOGD("%ssuppoted codec(%s) by official Stagefright", | |
1715 | + ALOGD("%ssupported codec (%s) by official Stagefright", | |
1715 | 1716 | (supported ? "" : "un"), |
1716 | 1717 | avcodec_get_name(codec_id)); |
1717 | 1718 |
@@ -1860,6 +1861,7 @@ static void adjustMKVConfidence(AVFormatContext *ic, float *confidence) | ||
1860 | 1861 | if (codec_id != AV_CODEC_ID_NONE |
1861 | 1862 | && codec_id != AV_CODEC_ID_AAC |
1862 | 1863 | && codec_id != AV_CODEC_ID_MP3 |
1864 | + && codec_id != AV_CODEC_ID_OPUS | |
1863 | 1865 | && codec_id != AV_CODEC_ID_VORBIS) { |
1864 | 1866 | ALOGI("[mkv]audio codec(%s), confidence should be larger than MatroskaExtractor", |
1865 | 1867 | avcodec_get_name(codec_id)); |