services/media/framework_ffmpeg/ffmpeg_decoder_base.cc - Issue 1814583002: Motown: New wrapper classes for ffmpeg format context and io context

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: services/media/framework_ffmpeg/ffmpeg_decoder_base.cc

Issue 1814583002: Motown: New wrapper classes for ffmpeg format context and io context (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 9 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

« services/media/framework_ffmpeg/av_io_context.cc ('K') | « services/media/framework_ffmpeg/ffmpeg_decoder_base.h ('k') | services/media/framework_ffmpeg/ffmpeg_demux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: services/media/framework_ffmpeg/ffmpeg_decoder_base.cc

diff --git a/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc b/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc

index 8af9730e6457bd4ac2fa0092c5627c05fbaf3e36..913dcd10b17c2c352dc4a6908928fb22acbd6a14 100644

--- a/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc

+++ b/services/media/framework_ffmpeg/ffmpeg_decoder_base.cc

@@ -3,8 +3,8 @@

// found in the LICENSE file.

#include "base/logging.h"

+#include "services/media/framework_ffmpeg/av_codec_context.h"

#include "services/media/framework_ffmpeg/ffmpeg_decoder_base.h"

-#include "services/media/framework_ffmpeg/ffmpeg_type_converters.h"

namespace mojo {

namespace media {

@@ -18,7 +18,7 @@ FfmpegDecoderBase::FfmpegDecoderBase(AvCodecContextPtr av_codec_context) :

FfmpegDecoderBase::~FfmpegDecoderBase() {}

std::unique_ptr<StreamType> FfmpegDecoderBase::output_stream_type() {

- return StreamTypeFromAVCodecContext(*av_codec_context_);

+ return AvCodecContext::GetStreamType(*av_codec_context_);

}

void FfmpegDecoderBase::Flush() {