Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo

Browse Source 
Merge commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c' into kraken

* commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c':
  Properly fill in the component name for the software decoders.
This commit is contained in:
Andreas Huber
2010-03-30 15:49:38 -07:00
committed by Android Git Automerger
parent 0e19e2b265 9cfc52d9f9
commit 8fdebd35e5
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/codecs/aacdec/AACDecoder.cpp
View File

@@ -144,6 +144,8 @@ sp<MetaData> AACDecoder::getFormat() {
meta->setInt64(kKeyDuration, durationUs);
}
meta->setCString(kKeyDecoderComponent, "AACDecoder");
return meta;
}

2
media/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
View File

@@ -105,6 +105,8 @@ sp<MetaData> AMRNBDecoder::getFormat() {
meta->setInt64(kKeyDuration, durationUs);
}
meta->setCString(kKeyDecoderComponent, "AMRNBDecoder");
return meta;
}

2
media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
View File

@@ -138,6 +138,8 @@ sp<MetaData> AMRNBEncoder::getFormat() {
meta->setInt64(kKeyDuration, durationUs);
}
meta->setCString(kKeyDecoderComponent, "AMRNBEncoder");
return meta;
}

2
media/libstagefright/codecs/amrwb/AMRWBDecoder.cpp
View File

@@ -110,6 +110,8 @@ sp<MetaData> AMRWBDecoder::getFormat() {
meta->setInt64(kKeyDuration, durationUs);
}
meta->setCString(kKeyDecoderComponent, "AMRWBDecoder");
return meta;
}

2
media/libstagefright/codecs/mp3dec/MP3Decoder.cpp
View File

@@ -107,6 +107,8 @@ sp<MetaData> MP3Decoder::getFormat() {
meta->setInt64(kKeyDuration, durationUs);
}
meta->setCString(kKeyDecoderComponent, "MP3Decoder");
return meta;
}