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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 363813002: Update to Pipeline Metadata and Decoder Stream for Orientation Data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unneeded variable Created 6 years, 5 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: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index efe40321727638af0c1fce58aecea35a5be6d5db..40cddda42a84ecd3fac83f3c15e7830f8b135afc 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -92,6 +92,7 @@ class FFmpegDemuxerStream : public DemuxerStream {
virtual bool SupportsConfigChanges() OVERRIDE;
virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
+ virtual VideoRotation video_rotation() OVERRIDE;
// Returns the range of buffered data in this stream.
Ranges<base::TimeDelta> GetBufferedRanges() const;
@@ -133,6 +134,7 @@ class FFmpegDemuxerStream : public DemuxerStream {
bool end_of_stream_;
base::TimeDelta last_packet_timestamp_;
Ranges<base::TimeDelta> buffered_ranges_;
+ VideoRotation video_rotation_;
DecoderBufferQueue buffer_queue_;
ReadCB read_cb_;
@@ -277,6 +279,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
// time if the file doesn't have an association to Time.
base::Time timeline_offset_;
+ VideoRotation video_rotation_;
wolenetz 2014/07/16 01:16:50 post-commit drive-by: Is this member unused?
scherkus (not reviewing) 2014/07/16 17:53:46 looks like it isn't! suderman: can you send out a
+
// Liveness of the stream.
Liveness liveness_;

Powered by Google App Engine
This is Rietveld 408576698