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

Unified Diff: services/media/framework_create/demux.cc

Issue 1686363002: Motown: ffmpeg implementations of framework 'parts' (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Changed the way AVBuffer allocation/deallocation is done in the ffmpeg audio decoder. 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
Index: services/media/framework_create/demux.cc
diff --git a/services/media/framework_create/demux.cc b/services/media/framework_create/demux.cc
index c763c1b5f49a9c8bf423f62d1699677540bb382b..5285b8b5c13f9ef7d9eac4e86242fdc41d776594 100644
--- a/services/media/framework_create/demux.cc
+++ b/services/media/framework_create/demux.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "services/media/framework/parts/demux.h"
+#include "services/media/framework_ffmpeg/ffmpeg_demux.h"
namespace mojo {
namespace media {
@@ -10,7 +11,14 @@ namespace media {
Result Demux::Create(
std::shared_ptr<Reader> reader,
std::shared_ptr<Demux>* demux_out) {
- return Result::kUnsupportedOperation;
+ std::shared_ptr<Demux> demux = FfmpegDemux::Create();
+
+ Result result = demux->Init(reader);
+ if (result == Result::kOk) {
+ *demux_out = demux;
+ }
+
+ return result;
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698