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

Unified Diff: media/cast/test/fake_media_source.h

Issue 2534193003: To M56: Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits). (Closed)
Patch Set: Created 4 years, 1 month 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/media_file_checker.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/fake_media_source.h
diff --git a/media/cast/test/fake_media_source.h b/media/cast/test/fake_media_source.h
index f8affbd70f5911cef28624297a6da88f769ed89a..5656ecf829a93c22cd36189c8eb5e7ec0c5c4379 100644
--- a/media/cast/test/fake_media_source.h
+++ b/media/cast/test/fake_media_source.h
@@ -40,6 +40,8 @@ class FFmpegGlue;
class InMemoryUrlProtocol;
class VideoFrame;
+struct ScopedPtrAVFreeContext;
+
namespace cast {
class AudioFrameInput;
@@ -113,8 +115,6 @@ class FakeMediaSource : public media::AudioConverter::InputCallback {
AVStream* av_audio_stream();
AVStream* av_video_stream();
- AVCodecContext* av_audio_context();
- AVCodecContext* av_video_context();
const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
const media::AudioParameters output_audio_params_;
@@ -142,10 +142,12 @@ class FakeMediaSource : public media::AudioConverter::InputCallback {
AVFormatContext* av_format_context_;
int audio_stream_index_;
+ std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> av_audio_context_;
AudioParameters source_audio_params_;
double playback_rate_;
int video_stream_index_;
+ std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> av_video_context_;
int video_frame_rate_numerator_;
int video_frame_rate_denominator_;
« no previous file with comments | « media/base/media_file_checker.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698