diff options
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/SimplePlayer.cpp | 3 | ||||
| -rw-r--r-- | cmds/stagefright/audioloop.cpp | 4 | ||||
| -rw-r--r-- | cmds/stagefright/sf2.cpp | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/cmds/stagefright/SimplePlayer.cpp b/cmds/stagefright/SimplePlayer.cpp index fac3a8c..0cfeb3e 100644 --- a/cmds/stagefright/SimplePlayer.cpp +++ b/cmds/stagefright/SimplePlayer.cpp @@ -583,8 +583,7 @@ status_t SimplePlayer::onOutputFormatChanged( AUDIO_STREAM_MUSIC, sampleRate, AUDIO_FORMAT_PCM_16_BIT, - (channelCount == 1) - ? AUDIO_CHANNEL_OUT_MONO : AUDIO_CHANNEL_OUT_STEREO, + audio_channel_out_mask_from_count(channelCount), 0); state->mNumFramesWritten = 0; diff --git a/cmds/stagefright/audioloop.cpp b/cmds/stagefright/audioloop.cpp index a6362a4..ed7d6cb 100644 --- a/cmds/stagefright/audioloop.cpp +++ b/cmds/stagefright/audioloop.cpp @@ -32,9 +32,7 @@ int main() { sp<MediaSource> source = new AudioSource( AUDIO_SOURCE_DEFAULT, kSampleRate, - kNumChannels == 1 - ? AUDIO_CHANNEL_IN_MONO - : AUDIO_CHANNEL_IN_STEREO); + audio_channel_in_mask_from_count(kNumChannels)); #endif sp<MetaData> meta = new MetaData; diff --git a/cmds/stagefright/sf2.cpp b/cmds/stagefright/sf2.cpp index 1d28793..e47cdc0 100644 --- a/cmds/stagefright/sf2.cpp +++ b/cmds/stagefright/sf2.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "sf2" +#include <utils/Log.h> + #include <binder/ProcessState.h> #include <media/stagefright/foundation/hexdump.h> @@ -205,6 +209,12 @@ protected: } looper()->stop(); + } else if (what == ACodec::kWhatError) { + ALOGE("something went wrong, codec reported an error."); + + printf("E\n"); + + (new AMessage(kWhatStop, id()))->post(); } break; } |