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

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 2643743002: Mojify demuxers and allow running {Chunk/FFmpeg}Demuxer in a Utility Process (Closed)
Patch Set: Rebase and make sure to unbind mojom::DemuxerPtr on the bound thread during termination Created 3 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/filters/default_demuxer_factory.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 249f97a0c731cb5a627696d2df6f1b886ae76a6a..30149438c8001be72673291feba9eeee894d2216 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -47,6 +47,8 @@
namespace media {
+namespace {
+
static base::Time ExtractTimelineOffset(AVFormatContext* format_context) {
if (strstr(format_context->iformat->name, "webm") ||
strstr(format_context->iformat->name, "matroska")) {
@@ -198,6 +200,12 @@ static void SetTimeProperty(MediaLogEvent* event,
event->params.SetDouble(key, value.InSecondsF());
}
+static void UnmarkEndOfStream(AVFormatContext* format_context) {
+ format_context->pb->eof_reached = 0;
+}
+
+} // namespace
+
std::unique_ptr<FFmpegDemuxerStream> FFmpegDemuxerStream::Create(
FFmpegDemuxer* demuxer,
AVStream* stream,
@@ -249,10 +257,6 @@ std::unique_ptr<FFmpegDemuxerStream> FFmpegDemuxerStream::Create(
demuxer, stream, std::move(audio_config), std::move(video_config)));
}
-static void UnmarkEndOfStream(AVFormatContext* format_context) {
- format_context->pb->eof_reached = 0;
-}
-
//
// FFmpegDemuxerStream
//
« no previous file with comments | « media/filters/default_demuxer_factory.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698