wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 714408 Part 3 - Fix audio sample rate - r=edwin

Browse Source 
--HG--
extra : rebase_source : 6f62016fff4d4547e5d0adc8de513fa917af39ba
This commit is contained in:
Chris Double 2012-06-01 12:54:48 +12:00
parent 1518859a5b
commit a6190f56c2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
media/omx-plugin/OmxPlugin.cpp
View File

@ -231,7 +231,7 @@ bool OmxDecoder::Init() {
sp<MediaSource> videoTrack;
sp<MediaSource> audioTrack;
const char *audioMime = NULL;
int32_t audioChannels = 0, audioSampleRate = 0;
bool audioMetaFound = false;
for (size_t i = 0; i < extractor->countTracks(); ++i) {
sp<MetaData> meta = extractor->getTrackMetaData(i);
@ -250,10 +250,13 @@ bool OmxDecoder::Init() {
} else if (audioTrack == NULL && !strncasecmp(mime, "audio/", 6)) {
audioTrack = extractor->getTrack(i);
audioMime = mime;
if (!meta->findInt32(kKeyChannelCount, &audioChannels) ||
!meta->findInt32(kKeySampleRate, &audioSampleRate)) {
if (!meta->findInt32(kKeyChannelCount, &mAudioChannels) ||
!meta->findInt32(kKeySampleRate, &mAudioSampleRate)) {
return false;
}
audioMetaFound = true;
LOG("channelCount: %d sampleRate: %d",
mAudioChannels, mAudioSampleRate);
}
}
@ -322,7 +325,7 @@ bool OmxDecoder::Init() {
if (mVideoSource.get() && !SetVideoFormat())
return false;
if (mAudioSource.get() && !SetAudioFormat())
if (!audioMetaFound && mAudioSource.get() && !SetAudioFormat())
return false;
return true;