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

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

Issue 1651673002: Add MediaCodecAudioDecoder implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: A better linking issue fix Created 4 years, 10 months 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
« no previous file with comments | « media/base/android/sdk_media_codec_bridge.h ('k') | media/base/audio_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/sdk_media_codec_bridge.cc
diff --git a/media/base/android/sdk_media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
index c736a1ab1fa3a3ae9bf543504ba5d7f78373e697..1e767c82f869a666c3bba527aeaf91d172e7d505 100644
--- a/media/base/android/sdk_media_codec_bridge.cc
+++ b/media/base/android/sdk_media_codec_bridge.cc
@@ -334,6 +334,23 @@ AudioCodecBridge::AudioCodecBridge(const std::string& mime)
// audio encoding yet.
: SdkMediaCodecBridge(mime, false, MEDIA_CODEC_DECODER) {}
+bool AudioCodecBridge::ConfigureAndStart(const AudioDecoderConfig& config,
+ bool play_audio,
+ jobject media_crypto) {
+ const int channel_count =
+ ChannelLayoutToChannelCount(config.channel_layout());
+ const int64_t codec_delay_ns = base::Time::kNanosecondsPerSecond *
+ config.codec_delay() /
+ config.samples_per_second();
+ const int64_t seek_preroll_ns =
+ 1000LL * config.seek_preroll().InMicroseconds();
+
+ return ConfigureAndStart(config.codec(), config.samples_per_second(),
+ channel_count, config.extra_data().data(),
+ config.extra_data().size(), codec_delay_ns,
+ seek_preroll_ns, play_audio, media_crypto);
+}
+
bool AudioCodecBridge::ConfigureAndStart(const AudioCodec& codec,
int sample_rate,
int channel_count,
@@ -343,7 +360,14 @@ bool AudioCodecBridge::ConfigureAndStart(const AudioCodec& codec,
int64_t seek_preroll_ns,
bool play_audio,
jobject media_crypto) {
- JNIEnv* env = AttachCurrentThread();
+ DVLOG(2) << __FUNCTION__ << ": "
+ << " codec:" << GetCodecName(codec)
+ << " samples_per_second:" << sample_rate
+ << " channel_count:" << channel_count
+ << " codec_delay_ns:" << codec_delay_ns
+ << " seek_preroll_ns:" << seek_preroll_ns
+ << " extra data size:" << extra_data_size
+ << " play audio:" << play_audio << " media_crypto:" << media_crypto;
if (!media_codec())
return false;
@@ -352,6 +376,8 @@ bool AudioCodecBridge::ConfigureAndStart(const AudioCodec& codec,
if (codec_string.empty())
return false;
+ JNIEnv* env = AttachCurrentThread();
+
ScopedJavaLocalRef<jstring> j_mime =
ConvertUTF8ToJavaString(env, codec_string);
ScopedJavaLocalRef<jobject> j_format(Java_MediaCodecBridge_createAudioFormat(
« no previous file with comments | « media/base/android/sdk_media_codec_bridge.h ('k') | media/base/audio_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698