Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1079)

Unified Diff: media/base/android/media_codec_audio_decoder.cc

Issue 1472943002: Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crazy linker issue Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/android/media_codec_audio_decoder.cc
diff --git a/media/base/android/media_codec_audio_decoder.cc b/media/base/android/media_codec_audio_decoder.cc
index 4b8a0768b82db34e51aeea8654c2585fd55c2da5..f68a07e4fc3ba4c52b91dcaf82856ed3e419b792 100644
--- a/media/base/android/media_codec_audio_decoder.cc
+++ b/media/base/android/media_codec_audio_decoder.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "media/base/android/media_codec_bridge.h"
#include "media/base/android/media_statistics.h"
+#include "media/base/android/sdk_media_codec_bridge.h"
#include "media/base/audio_timestamp_helper.h"
#include "media/base/demuxer_stream.h"
@@ -144,16 +144,11 @@ MediaCodecDecoder::ConfigStatus MediaCodecAudioDecoder::ConfigureInternal(
return kConfigFailure;
if (!(static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))
- ->Start(
- configs_.audio_codec,
- configs_.audio_sampling_rate,
- configs_.audio_channels,
- &configs_.audio_extra_data[0],
- configs_.audio_extra_data.size(),
- configs_.audio_codec_delay_ns,
- configs_.audio_seek_preroll_ns,
- true,
- media_crypto)) {
+ ->ConfigureAndStart(
+ configs_.audio_codec, configs_.audio_sampling_rate,
+ configs_.audio_channels, &configs_.audio_extra_data[0],
+ configs_.audio_extra_data.size(), configs_.audio_codec_delay_ns,
+ configs_.audio_seek_preroll_ns, true, media_crypto)) {
DVLOG(0) << class_name() << "::" << __FUNCTION__
<< " failed: cannot start audio codec";
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaCodecUtil.java ('k') | media/base/android/media_codec_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698