stagefright-plugins: Improvements and updates for CM14

[android-x86/external-stagefright-plugins.git] / extractor / FFmpegExtractor.cpp

diff --git a/extractor/FFmpegExtractor.cpp b/extractor/FFmpegExtractor.cpp
index 75ae293..beb437d 100644 (file)
--- a/extractor/FFmpegExtractor.cpp
+++ b/extractor/FFmpegExtractor.cpp
@@ -160,7 +160,7 @@ size_t FFmpegExtractor::countTracks() {
     return mInitCheck == OK ? mTracks.size() : 0;
 }
 
-sp<MediaSource> FFmpegExtractor::getTrack(size_t index) {
+sp<IMediaSource> FFmpegExtractor::getTrack(size_t index) {
     ALOGV("FFmpegExtractor::getTrack[%zu]", index);
 
     if (mInitCheck != OK) {
@@ -566,12 +566,12 @@ sp<MetaData> FFmpegExtractor::setAudioFormat(AVStream *stream)
         int32_t bits = avctx->bits_per_raw_sample > 0 ?
                 avctx->bits_per_raw_sample :
                 av_get_bytes_per_sample(avctx->sample_fmt) * 8;
-        meta->setInt32(kKeyBitsPerSample, bits > 0 ? bits : 16);
+        meta->setInt32(kKeyBitsPerRawSample, bits);
         meta->setInt32(kKeySampleRate, avctx->sample_rate);
         meta->setInt32(kKeyBlockAlign, avctx->block_align);
         meta->setInt32(kKeySampleFormat, avctx->sample_fmt);
-        meta->setInt32('pfmt', to_android_audio_format(avctx->sample_fmt));
-        meta->setCString('ffmt', findMatchingContainer(mFormatCtx->iformat->name));
+        meta->setInt32(kKeyPcmEncoding, sampleFormatToEncoding(avctx->sample_fmt));
+        meta->setCString(kKeyFileFormat, findMatchingContainer(mFormatCtx->iformat->name));
         setDurationMetaData(stream, meta);
     }
 
@@ -2157,6 +2157,8 @@ static const char *LegacySniffFFMPEG(const sp<DataSource> &source,
     return ret;
 }
 
+extern "C" {
+
 bool SniffFFMPEG(
         const sp<DataSource> &source, String8 *mimeType, float *confidence,
         sp<AMessage> *meta) {
@@ -2222,7 +2224,7 @@ bool SniffFFMPEG(
     return true;
 }
 
-MediaExtractor *CreateFFmpegExtractor(const sp<DataSource> &source, const char *mime, const sp<AMessage> &meta) {
+MediaExtractor *CreateFFMPEGExtractor(const sp<DataSource> &source, const char *mime, const sp<AMessage> &meta) {
     MediaExtractor *ret = NULL;
     AString notuse;
     if (meta.get() && meta->findString("extended-extractor", &notuse) && (
@@ -2269,10 +2271,6 @@ MediaExtractor *CreateFFmpegExtractor(const sp<DataSource> &source, const char *
     return ret;
 }
 
-}  // namespace android
-
-extern "C" void getExtractorPlugin(android::MediaExtractor::Plugin *plugin)
-{
-    plugin->sniff = android::SniffFFMPEG;
-    plugin->create = android::CreateFFmpegExtractor;
 }
+
+};  // namespace android